diff --git a/src/App.tsx b/src/App.tsx
index 7f7112a2d..ed5230b4f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,28 +1,29 @@
-import React, {Suspense, useContext, useEffect, useMemo, useState} from 'react';
+import {FC, Suspense, useContext, useEffect, useMemo, useState} from 'react';
 import {Navigate, Route, Routes, useLocation} from 'react-router-dom';
 import {useUpdate} from 'react-use';
 
 import {config} from '@constants/config';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {EndpointModal, MessagePanel, notificationCall} from '@molecules';
+import {EndpointModal} from '@molecules/EndpointModal';
+import {MessagePanel} from '@molecules/MessagePanel';
+import {notificationCall} from '@molecules/Notification';
 
-import {
-  EndpointProcessing,
-  Executors,
-  GlobalSettings,
-  Loading,
-  NotFound,
-  Sources,
-  TestSuites,
-  Tests,
-  Triggers,
-} from '@pages';
+import {EndpointProcessing} from '@pages/EndpointProcessing';
+import {Executors} from '@pages/Executors';
+import {GlobalSettings} from '@pages/GlobalSettings';
+import {Loading} from '@pages/Loading';
+import {NotFound} from '@pages/NotFound';
+import {Sources} from '@pages/Sources';
+import {TestSuites} from '@pages/TestSuites';
+import {Tests} from '@pages/Tests';
+import {Triggers} from '@pages/Triggers';
 
-import PluginsContext from '@plugins/context';
-import createPluginManager from '@plugins/manager';
-import {Plugin} from '@plugins/types';
+import {PluginsContext} from '@plugins/context';
+import {createPluginManager} from '@plugins/manager';
+import type {Plugin} from '@plugins/types';
 
 import {useAppDispatch} from '@redux/hooks';
 import {setExecutors} from '@redux/reducers/executorsSlice';
@@ -46,7 +47,7 @@ export interface AppProps {
   plugins: Plugin[];
 }
 
-const App: React.FC<AppProps> = ({plugins}) => {
+export const App: FC<AppProps> = ({plugins}) => {
   const [TriggersProvider] = initializeTriggersStore();
 
   const dispatch = useAppDispatch();
@@ -190,5 +191,3 @@ const App: React.FC<AppProps> = ({plugins}) => {
       </Suspense>
     );
 };
-
-export default App;
diff --git a/src/AppRoot.tsx b/src/AppRoot.tsx
index d66c52d88..e09aa3c2e 100644
--- a/src/AppRoot.tsx
+++ b/src/AppRoot.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useMemo} from 'react';
+import {FC, useEffect, useMemo} from 'react';
 import {useLocation, useNavigate} from 'react-router-dom';
 import {useAsync} from 'react-use';
 
@@ -7,21 +7,23 @@ import {Content} from 'antd/lib/layout/layout';
 
 import FingerprintJS from '@fingerprintjs/fingerprintjs';
 
-import {ConfigContext, DashboardContext, MainContext} from '@contexts';
+import {ConfigContext} from '@contexts/ConfigContext';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 import {ModalHandler, ModalOutletProvider} from '@contexts/ModalContext';
 
-import {FeatureFlagsProvider} from '@feature-flags';
+import {FeatureFlagsProvider} from '@feature-flags/context';
 
 import {useAxiosInterceptors} from '@hooks/useAxiosInterceptors';
 import {useLastCallback} from '@hooks/useLastCallback';
 
-import {Sider} from '@organisms';
+import {Sider} from '@organisms/Sider';
 
-import {ErrorBoundary} from '@pages';
+import {ErrorBoundary} from '@pages/ErrorBoundary';
 
 import {BasePermissionsResolver, PermissionsProvider} from '@permissions/base';
 
-import {Plugin} from '@plugins/types';
+import type {Plugin} from '@plugins/types';
 
 import {useAppDispatch} from '@redux/hooks';
 
@@ -33,15 +35,15 @@ import {initializeTestsStore} from '@store/tests';
 
 import {useTelemetry, useTelemetryValue} from '@telemetry/hooks';
 
-import anonymizeQueryString from '@utils/anonymizeQueryString';
+import {anonymizeQueryString} from '@utils/anonymizeQueryString';
 import {composeProviders} from '@utils/composeProviders';
 import {externalLinks} from '@utils/externalLinks';
 import {safeRefetch} from '@utils/fetchUtils';
 
-import App from './App';
+import {App} from './App';
 import {StyledLayoutContentWrapper} from './App.styled';
 
-const AppRoot: React.FC = () => {
+export const AppRoot: FC = () => {
   useAxiosInterceptors();
 
   const dispatch = useAppDispatch();
@@ -141,5 +143,3 @@ const AppRoot: React.FC = () => {
       </>
     );
 };
-
-export default AppRoot;
diff --git a/src/DashboardRewrite.tsx b/src/DashboardRewrite.tsx
index c868da6e6..a0fb707cd 100644
--- a/src/DashboardRewrite.tsx
+++ b/src/DashboardRewrite.tsx
@@ -1,7 +1,7 @@
 import {FC, useContext, useLayoutEffect} from 'react';
 import {useParams} from 'react-router-dom';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
@@ -10,7 +10,7 @@ interface DashboardRewriteProps {
   keepQuery?: boolean;
 }
 
-const DashboardRewrite: FC<DashboardRewriteProps> = ({pattern, keepQuery = false}) => {
+export const DashboardRewrite: FC<DashboardRewriteProps> = ({pattern, keepQuery = false}) => {
   const {location} = useContext(DashboardContext);
   const params = useParams();
   const pathname = pattern.replace(/:([^/]+)/g, (_, key) => `${params[key]}`);
@@ -20,5 +20,3 @@ const DashboardRewrite: FC<DashboardRewriteProps> = ({pattern, keepQuery = false
 
   return null;
 };
-
-export default DashboardRewrite;
diff --git a/src/components/atoms/Asterisk/Asterisk.ts b/src/components/atoms/Asterisk.ts
similarity index 57%
rename from src/components/atoms/Asterisk/Asterisk.ts
rename to src/components/atoms/Asterisk.ts
index 3ed5d4f0b..7cd11aafd 100644
--- a/src/components/atoms/Asterisk/Asterisk.ts
+++ b/src/components/atoms/Asterisk.ts
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-const Asterisk = styled.span`
+export const Asterisk = styled.span`
   &::after {
     content: '*';
     margin: 0 4px;
@@ -10,5 +10,3 @@ const Asterisk = styled.span`
 
   color: ${Colors.rose500};
 `;
-
-export default Asterisk;
diff --git a/src/components/atoms/Asterisk/index.ts b/src/components/atoms/Asterisk/index.ts
deleted file mode 100644
index 07a6daf39..000000000
--- a/src/components/atoms/Asterisk/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Asterisk';
diff --git a/src/components/atoms/CommandInput/CommandInput.tsx b/src/components/atoms/CommandInput.tsx
similarity index 59%
rename from src/components/atoms/CommandInput/CommandInput.tsx
rename to src/components/atoms/CommandInput.tsx
index 898ef9a3a..e0d24aed3 100644
--- a/src/components/atoms/CommandInput/CommandInput.tsx
+++ b/src/components/atoms/CommandInput.tsx
@@ -1,10 +1,12 @@
+import {FC} from 'react';
+
 import {Input, InputProps} from 'antd';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-const CommandInput: React.FC<InputProps> = props => {
+export const CommandInput: FC<InputProps> = props => {
   return (
     <Input
       placeholder="e.g.: myscript.sh"
@@ -17,5 +19,3 @@ const CommandInput: React.FC<InputProps> = props => {
     />
   );
 };
-
-export default CommandInput;
diff --git a/src/components/atoms/CommandInput/index.ts b/src/components/atoms/CommandInput/index.ts
deleted file mode 100644
index b2031e1fe..000000000
--- a/src/components/atoms/CommandInput/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './CommandInput';
diff --git a/src/components/atoms/CopyButton/CopyButton.styled.tsx b/src/components/atoms/CopyButton.styled.tsx
similarity index 93%
rename from src/components/atoms/CopyButton/CopyButton.styled.tsx
rename to src/components/atoms/CopyButton.styled.tsx
index c0d07969b..e70bffc85 100644
--- a/src/components/atoms/CopyButton/CopyButton.styled.tsx
+++ b/src/components/atoms/CopyButton.styled.tsx
@@ -2,7 +2,7 @@ import {CheckOutlined, CopyOutlined} from '@ant-design/icons';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 const CopyIconBaseStyles = `
   position: absolute;
diff --git a/src/components/atoms/CopyButton/CopyButton.tsx b/src/components/atoms/CopyButton.tsx
similarity index 79%
rename from src/components/atoms/CopyButton/CopyButton.tsx
rename to src/components/atoms/CopyButton.tsx
index ffc79771b..1a96cc240 100644
--- a/src/components/atoms/CopyButton/CopyButton.tsx
+++ b/src/components/atoms/CopyButton.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {Tooltip} from 'antd';
 
@@ -6,7 +6,7 @@ import {useCopyToClipboard} from '@hooks/useCopyToClipboard';
 
 import {StyledCheckOutlined, StyledCopyOutlined} from './CopyButton.styled';
 
-const CopyButton: React.FC<{content: string | (() => string); onClick?: () => void}> = props => {
+export const CopyButton: FC<{content: string | (() => string); onClick?: () => void}> = props => {
   const {content, onClick} = props;
   const {isCopied, setCopyToClipboardState} = useCopyToClipboard(content);
 
@@ -21,5 +21,3 @@ const CopyButton: React.FC<{content: string | (() => string); onClick?: () => vo
     </Tooltip>
   );
 };
-
-export default CopyButton;
diff --git a/src/components/atoms/CopyButton/index.ts b/src/components/atoms/CopyButton/index.ts
deleted file mode 100644
index fe98b9a50..000000000
--- a/src/components/atoms/CopyButton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './CopyButton';
diff --git a/src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.styled.tsx b/src/components/atoms/CreatableMultiSelect.styled.tsx
similarity index 96%
rename from src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.styled.tsx
rename to src/components/atoms/CreatableMultiSelect.styled.tsx
index 1b050873c..889961012 100644
--- a/src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.styled.tsx
+++ b/src/components/atoms/CreatableMultiSelect.styled.tsx
@@ -2,9 +2,9 @@ import {GroupBase, StylesConfig, ThemeConfig} from 'react-select';
 
 import styled from 'styled-components';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledOption = styled.div`
   padding: 6px 12px;
diff --git a/src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.tsx b/src/components/atoms/CreatableMultiSelect.tsx
similarity index 76%
rename from src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.tsx
rename to src/components/atoms/CreatableMultiSelect.tsx
index 89a3275f8..c09340584 100644
--- a/src/components/atoms/CreatableMultiSelect/CreatableMultiSelect.tsx
+++ b/src/components/atoms/CreatableMultiSelect.tsx
@@ -1,18 +1,16 @@
-import React, {KeyboardEvent, useRef} from 'react';
+import {FC, KeyboardEvent, useRef} from 'react';
 import {MultiValueGenericProps, OptionProps} from 'react-select';
 import CreatableSelect from 'react-select/creatable';
 
-import usePressEnter from '@hooks/usePressEnter';
+import {usePressEnter} from '@hooks/usePressEnter';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
 import {customStyles, customTheme} from './CreatableMultiSelect.styled';
-import {
-  DefaultDropdownIndicator,
-  DefaultMultiValueLabel,
-  DefaultMultiValueRemove,
-  DefaultOptionComponent,
-} from './DefaultComponents';
+import {DropdownIndicator as DefaultDropdownIndicator} from './CreatableMultiSelect/DefaultComponents/DropdownIndicator';
+import {MultiValueLabel as DefaultMultiValueLabel} from './CreatableMultiSelect/DefaultComponents/MultiValueLabel';
+import {MultiValueRemove as DefaultMultiValueRemove} from './CreatableMultiSelect/DefaultComponents/MultiValueRemove';
+import {MultiValueLabel as DefaultOptionComponent} from './CreatableMultiSelect/DefaultComponents/Option';
 
 type MultiSelectProps = {
   options?: Option[];
@@ -30,7 +28,7 @@ type MultiSelectProps = {
   menuPlacement?: 'auto' | 'bottom' | 'top';
 };
 
-const CreatableMultiSelect: React.FC<MultiSelectProps> = props => {
+export const CreatableMultiSelect: FC<MultiSelectProps> = props => {
   const {
     options,
     placeholder,
@@ -92,4 +90,3 @@ const CreatableMultiSelect: React.FC<MultiSelectProps> = props => {
     />
   );
 };
-export default CreatableMultiSelect;
diff --git a/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsMultiValueLabel.tsx b/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsMultiValueLabel.tsx
index 244771977..d6b36cbce 100644
--- a/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsMultiValueLabel.tsx
+++ b/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsMultiValueLabel.tsx
@@ -1,12 +1,11 @@
 import {MultiValueGenericProps} from 'react-select';
 
-import {SplitLabelText} from '@atoms';
+import {StyledMultiLabel} from '@atoms/CreatableMultiSelect.styled';
+import {SplitLabelText} from '@atoms/SplitLabelText';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-import {StyledMultiLabel} from '../CreatableMultiSelect.styled';
-
-const LabelsMultiValueLabel = (props: MultiValueGenericProps<Option>) => {
+export const LabelsMultiValueLabel = (props: MultiValueGenericProps<Option>) => {
   const {children} = props;
 
   return (
@@ -15,5 +14,3 @@ const LabelsMultiValueLabel = (props: MultiValueGenericProps<Option>) => {
     </StyledMultiLabel>
   );
 };
-
-export default LabelsMultiValueLabel;
diff --git a/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsOption.tsx b/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsOption.tsx
index 52cfc7852..d277be60a 100644
--- a/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsOption.tsx
+++ b/src/components/atoms/CreatableMultiSelect/CustomComponents/LabelsOption.tsx
@@ -1,14 +1,13 @@
 import {OptionProps} from 'react-select';
 
-import {SplitLabelText} from '@atoms';
+import {StyledOption} from '@atoms/CreatableMultiSelect.styled';
+import {SplitLabelText} from '@atoms/SplitLabelText';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
 import {labelRegex} from '@molecules/LabelsSelect/utils';
 
-import {StyledOption} from '../CreatableMultiSelect.styled';
-
-const LabelsOption = (props: OptionProps<Option>) => {
+export const LabelsOption = (props: OptionProps<Option>) => {
   // @ts-ignore
   const {children, innerRef, innerProps, value} = props;
 
@@ -29,5 +28,3 @@ const LabelsOption = (props: OptionProps<Option>) => {
     <StyledOption ref={innerRef}>{children}</StyledOption>
   );
 };
-
-export default LabelsOption;
diff --git a/src/components/atoms/CreatableMultiSelect/CustomComponents/index.ts b/src/components/atoms/CreatableMultiSelect/CustomComponents/index.ts
deleted file mode 100644
index 8637d66fc..000000000
--- a/src/components/atoms/CreatableMultiSelect/CustomComponents/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as LabelsMultiValueLabel} from './LabelsMultiValueLabel';
-export {default as LabelsOption} from './LabelsOption';
diff --git a/src/components/atoms/CreatableMultiSelect/DefaultComponents/DropdownIndicator.tsx b/src/components/atoms/CreatableMultiSelect/DefaultComponents/DropdownIndicator.tsx
index 7bc478239..5db61d2e9 100644
--- a/src/components/atoms/CreatableMultiSelect/DefaultComponents/DropdownIndicator.tsx
+++ b/src/components/atoms/CreatableMultiSelect/DefaultComponents/DropdownIndicator.tsx
@@ -1,13 +1,11 @@
 import {DownOutlined} from '@ant-design/icons';
 
-import {DropdownWrapper} from '../CreatableMultiSelect.styled';
+import {DropdownWrapper} from '@atoms/CreatableMultiSelect.styled';
 
-const DropdownIndicator = () => {
+export const DropdownIndicator = () => {
   return (
     <DropdownWrapper>
       <DownOutlined />
     </DropdownWrapper>
   );
 };
-
-export default DropdownIndicator;
diff --git a/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueLabel.tsx b/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueLabel.tsx
index 5a3bab6ce..b98e8cede 100644
--- a/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueLabel.tsx
+++ b/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueLabel.tsx
@@ -1,9 +1,7 @@
 import {MultiValueGenericProps, components} from 'react-select';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-const MultiValueLabel = (props: MultiValueGenericProps<Option>) => {
+export const MultiValueLabel = (props: MultiValueGenericProps<Option>) => {
   return <components.MultiValueLabel {...props} />;
 };
-
-export default MultiValueLabel;
diff --git a/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueRemove.tsx b/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueRemove.tsx
index 8d8e3cfbb..c99e4c251 100644
--- a/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueRemove.tsx
+++ b/src/components/atoms/CreatableMultiSelect/DefaultComponents/MultiValueRemove.tsx
@@ -2,14 +2,12 @@ import {MultiValueRemoveProps, components} from 'react-select';
 
 import {ReactComponent as RemoveIcon} from '@assets/closeCircle.svg';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-const MultiValueRemove = (props: MultiValueRemoveProps<Option>) => {
+export const MultiValueRemove = (props: MultiValueRemoveProps<Option>) => {
   return (
     <components.MultiValueRemove {...props}>
       <RemoveIcon />
     </components.MultiValueRemove>
   );
 };
-
-export default MultiValueRemove;
diff --git a/src/components/atoms/CreatableMultiSelect/DefaultComponents/Option.tsx b/src/components/atoms/CreatableMultiSelect/DefaultComponents/Option.tsx
index 2996f8a36..da55d7aa7 100644
--- a/src/components/atoms/CreatableMultiSelect/DefaultComponents/Option.tsx
+++ b/src/components/atoms/CreatableMultiSelect/DefaultComponents/Option.tsx
@@ -1,9 +1,7 @@
 import {OptionProps, components} from 'react-select';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-const MultiValueLabel = (props: OptionProps<Option>) => {
+export const MultiValueLabel = (props: OptionProps<Option>) => {
   return <components.Option {...props} />;
 };
-
-export default MultiValueLabel;
diff --git a/src/components/atoms/CreatableMultiSelect/DefaultComponents/index.ts b/src/components/atoms/CreatableMultiSelect/DefaultComponents/index.ts
deleted file mode 100644
index 732eb55aa..000000000
--- a/src/components/atoms/CreatableMultiSelect/DefaultComponents/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {default as DefaultMultiValueLabel} from './MultiValueLabel';
-export {default as DefaultOptionComponent} from './Option';
-export {default as DefaultMultiValueRemove} from './MultiValueRemove';
-export {default as DefaultDropdownIndicator} from './DropdownIndicator';
diff --git a/src/components/atoms/CreatableMultiSelect/index.ts b/src/components/atoms/CreatableMultiSelect/index.ts
deleted file mode 100644
index e1c3469c0..000000000
--- a/src/components/atoms/CreatableMultiSelect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './CreatableMultiSelect';
diff --git a/src/components/atoms/Dots/Dots.styled.ts b/src/components/atoms/Dots.styled.ts
similarity index 100%
rename from src/components/atoms/Dots/Dots.styled.ts
rename to src/components/atoms/Dots.styled.ts
diff --git a/src/components/atoms/Dots/Dots.tsx b/src/components/atoms/Dots.tsx
similarity index 79%
rename from src/components/atoms/Dots/Dots.tsx
rename to src/components/atoms/Dots.tsx
index 8200ba476..6e97ba746 100644
--- a/src/components/atoms/Dots/Dots.tsx
+++ b/src/components/atoms/Dots.tsx
@@ -1,6 +1,8 @@
-import {Button} from '@custom-antd';
+import {FC} from 'react';
 
-import Colors from '@styles/Colors';
+import {Button} from '@custom-antd/Button';
+
+import {Colors} from '@styles/Colors';
 
 import {Dot, DotsContainer} from './Dots.styled';
 
@@ -11,7 +13,7 @@ type DotsProps = {
   withPadding?: boolean;
 };
 
-const Dots: React.FC<DotsProps> = props => {
+export const Dots: FC<DotsProps> = props => {
   const {dotNumber = 3, color = Colors.purple, direction = 'column', withPadding = true} = props;
 
   const dots = Array.from({length: dotNumber}).map((_, index) => {
@@ -26,5 +28,3 @@ const Dots: React.FC<DotsProps> = props => {
     </Button>
   );
 };
-
-export default Dots;
diff --git a/src/components/atoms/Dots/index.ts b/src/components/atoms/Dots/index.ts
deleted file mode 100644
index 6fd7d94be..000000000
--- a/src/components/atoms/Dots/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Dots';
diff --git a/src/components/atoms/DownloadButton/DownloadButton.styled.tsx b/src/components/atoms/DownloadButton.styled.tsx
similarity index 94%
rename from src/components/atoms/DownloadButton/DownloadButton.styled.tsx
rename to src/components/atoms/DownloadButton.styled.tsx
index 649c72a8b..ccde7044a 100644
--- a/src/components/atoms/DownloadButton/DownloadButton.styled.tsx
+++ b/src/components/atoms/DownloadButton.styled.tsx
@@ -2,7 +2,7 @@ import {CheckOutlined, DownloadOutlined} from '@ant-design/icons';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 const CopyIconBaseStyles = `
   position: absolute;
diff --git a/src/components/atoms/DownloadButton/DownloadButton.tsx b/src/components/atoms/DownloadButton.tsx
similarity index 87%
rename from src/components/atoms/DownloadButton/DownloadButton.tsx
rename to src/components/atoms/DownloadButton.tsx
index 0587b1136..ef9f99b1b 100644
--- a/src/components/atoms/DownloadButton/DownloadButton.tsx
+++ b/src/components/atoms/DownloadButton.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {Tooltip} from 'antd';
 
@@ -13,7 +13,7 @@ type SaveOptions = {
   extension: string;
 };
 
-const DownloadButton: React.FC<SaveOptions> = props => {
+export const DownloadButton: FC<SaveOptions> = props => {
   const {content, onClick, filename = 'download', extension} = props;
   const {isProcessed, setProcessed} = useDownloadFile(content, {
     filename: `${filename}.${extension}`,
@@ -34,4 +34,3 @@ const DownloadButton: React.FC<SaveOptions> = props => {
     </Tooltip>
   );
 };
-export default DownloadButton;
diff --git a/src/components/atoms/DownloadButton/index.ts b/src/components/atoms/DownloadButton/index.ts
deleted file mode 100644
index 2cd30ca98..000000000
--- a/src/components/atoms/DownloadButton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './DownloadButton';
diff --git a/src/components/atoms/ExecutorIcon/ExecutorIcon.styled.tsx b/src/components/atoms/ExecutorIcon.styled.tsx
similarity index 100%
rename from src/components/atoms/ExecutorIcon/ExecutorIcon.styled.tsx
rename to src/components/atoms/ExecutorIcon.styled.tsx
diff --git a/src/components/atoms/ExecutorIcon/ExecutorIcon.tsx b/src/components/atoms/ExecutorIcon.tsx
similarity index 93%
rename from src/components/atoms/ExecutorIcon/ExecutorIcon.tsx
rename to src/components/atoms/ExecutorIcon.tsx
index 3f6ed97af..b5683b591 100644
--- a/src/components/atoms/ExecutorIcon/ExecutorIcon.tsx
+++ b/src/components/atoms/ExecutorIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {ReactComponent as ArtilleryIcon} from '@assets/artilleryIcon.svg';
 import {ReactComponent as CurlIcon} from '@assets/curlIcon.svg';
@@ -38,7 +38,7 @@ export const executorIcons: Record<string, JSX.Element> = {
   tracetest: <TracetestIcon />,
 };
 
-const ExecutorIcon: React.FC<ExecutorIconProps> = props => {
+export const ExecutorIcon: FC<ExecutorIconProps> = props => {
   const {type, noWidth = false} = props;
 
   const icon = type ? executorIcons[type] : <DefaultIcon />;
@@ -52,5 +52,3 @@ const ExecutorIcon: React.FC<ExecutorIconProps> = props => {
     </StyledExecutorIcon>
   );
 };
-
-export default ExecutorIcon;
diff --git a/src/components/atoms/ExecutorIcon/index.ts b/src/components/atoms/ExecutorIcon/index.ts
deleted file mode 100644
index 7a05434a8..000000000
--- a/src/components/atoms/ExecutorIcon/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutorIcon';
diff --git a/src/components/atoms/ExternalLink.tsx b/src/components/atoms/ExternalLink.tsx
new file mode 100644
index 000000000..04575fd90
--- /dev/null
+++ b/src/components/atoms/ExternalLink.tsx
@@ -0,0 +1,11 @@
+import {AnchorHTMLAttributes, FC} from 'react';
+
+export const ExternalLink: FC<AnchorHTMLAttributes<HTMLAnchorElement>> = props => {
+  const {children, ...rest} = props;
+
+  return (
+    <a target="_blank" {...rest}>
+      {children}
+    </a>
+  );
+};
diff --git a/src/components/atoms/ExternalLink/ExternalLink.tsx b/src/components/atoms/ExternalLink/ExternalLink.tsx
deleted file mode 100644
index b41cd7d7e..000000000
--- a/src/components/atoms/ExternalLink/ExternalLink.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-const ExternalLink: React.FC<React.AnchorHTMLAttributes<HTMLAnchorElement>> = props => {
-  const {children, ...rest} = props;
-
-  return (
-    <a target="_blank" {...rest}>
-      {children}
-    </a>
-  );
-};
-
-export default ExternalLink;
diff --git a/src/components/atoms/ExternalLink/index.ts b/src/components/atoms/ExternalLink/index.ts
deleted file mode 100644
index 0ddcec2ae..000000000
--- a/src/components/atoms/ExternalLink/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExternalLink';
diff --git a/src/components/atoms/Icon/Icon.styled.tsx b/src/components/atoms/Icon.styled.tsx
similarity index 100%
rename from src/components/atoms/Icon/Icon.styled.tsx
rename to src/components/atoms/Icon.styled.tsx
diff --git a/src/components/atoms/Icon/Icon.tsx b/src/components/atoms/Icon.tsx
similarity index 85%
rename from src/components/atoms/Icon/Icon.tsx
rename to src/components/atoms/Icon.tsx
index 030336ce8..c9de7587e 100644
--- a/src/components/atoms/Icon/Icon.tsx
+++ b/src/components/atoms/Icon.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {HourglassOutlined} from '@ant-design/icons';
 import {IconComponentProps} from '@ant-design/icons/lib/components/Icon';
 
 import {StyledAntdIcon} from './Icon.styled';
-import Icons from './icons';
-import {IconProps} from './types';
+import {icons as Icons} from './Icon/icons';
+import type {IconProps} from './Icon/types';
 
 const {
   CogIcon,
@@ -31,7 +31,7 @@ const iconsMap: Record<IconProps['name'], IconComponentProps['component']> = {
   error: FailedStatusIcon,
   running: RunningStatusIcon,
   // It's standalone AntD icon that shouldn't be used, but it works
-  pending: HourglassOutlined as React.FC<{}>,
+  pending: HourglassOutlined as FC<{}>,
   queued: PendingStatusIcon,
   delay: DelayIcon,
   cancelled: FailedStatusIcon,
@@ -42,12 +42,10 @@ const iconsMap: Record<IconProps['name'], IconComponentProps['component']> = {
   cloudMigrate: CloudMigrateIcon,
 };
 
-const Icon: React.FC<IconProps> = props => {
+export const Icon: FC<IconProps> = props => {
   const {component, name, ...rest} = props;
 
   const iconComponent = name ? iconsMap[name] : component;
 
   return <StyledAntdIcon component={iconComponent} {...rest} />;
 };
-
-export default Icon;
diff --git a/src/components/atoms/Icon/icons.tsx b/src/components/atoms/Icon/icons.tsx
index 59aa22b95..a8a6df2f2 100644
--- a/src/components/atoms/Icon/icons.tsx
+++ b/src/components/atoms/Icon/icons.tsx
@@ -1,8 +1,10 @@
+import {FC} from 'react';
+
 import {LoadingOutlined} from '@ant-design/icons';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-const CogIcon: React.FC = () => {
+const CogIcon: FC = () => {
   return (
     <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M8.00894 5.83213C7.47501 5.83213 6.97501 6.03927 6.59644 6.41785C6.21965 6.79642 6.01072 7.29642 6.01072 7.83035C6.01072 8.36427 6.21965 8.86427 6.59644 9.24285C6.97501 9.61963 7.47501 9.82856 8.00894 9.82856C8.54287 9.82856 9.04287 9.61963 9.42144 9.24285C9.79822 8.86427 10.0072 8.36427 10.0072 7.83035C10.0072 7.29642 9.79822 6.79642 9.42144 6.41785C9.23653 6.23152 9.01645 6.08379 8.77397 5.98324C8.53148 5.88269 8.27144 5.83133 8.00894 5.83213ZM15.3714 10.0375L14.2036 9.03928C14.2589 8.69999 14.2875 8.35356 14.2875 8.00892C14.2875 7.66427 14.2589 7.31606 14.2036 6.97856L15.3714 5.98035C15.4597 5.90482 15.5228 5.80423 15.5525 5.69195C15.5821 5.57967 15.5769 5.46102 15.5375 5.35177L15.5214 5.30535C15.2 4.40658 14.7184 3.57348 14.1 2.84642L14.0679 2.80892C13.9928 2.72062 13.8927 2.65714 13.7808 2.62686C13.6689 2.59658 13.5505 2.6009 13.4411 2.63927L11.9911 3.15535C11.4554 2.71606 10.8589 2.36963 10.2125 2.12856L9.93215 0.612488C9.911 0.498278 9.8556 0.393207 9.77331 0.311234C9.69101 0.229261 9.58573 0.174268 9.47144 0.153559L9.42322 0.144631C8.49465 -0.0232265 7.51608 -0.0232265 6.58751 0.144631L6.53929 0.153559C6.425 0.174268 6.31972 0.229261 6.23743 0.311234C6.15513 0.393207 6.09973 0.498278 6.07858 0.612488L5.79644 2.1357C5.15613 2.3787 4.55964 2.72428 4.03037 3.15892L2.56965 2.63927C2.4603 2.6006 2.34178 2.59611 2.22982 2.62642C2.11786 2.65672 2.01778 2.72037 1.94287 2.80892L1.91072 2.84642C1.29339 3.57426 0.811922 4.40715 0.489294 5.30535L0.473223 5.35177C0.392866 5.57499 0.458937 5.82499 0.639294 5.98035L1.82144 6.98927C1.76608 7.32499 1.73929 7.66785 1.73929 8.00713C1.73929 8.34999 1.76608 8.69285 1.82144 9.02499L0.642866 10.0339C0.554644 10.1094 0.491502 10.21 0.461837 10.3223C0.432172 10.4346 0.437389 10.5532 0.476794 10.6625L0.492866 10.7089C0.81608 11.6071 1.29287 12.4375 1.91429 13.1678L1.94644 13.2053C2.02153 13.2936 2.12162 13.3571 2.23351 13.3874C2.3454 13.4177 2.46384 13.4134 2.57322 13.375L4.03394 12.8553C4.56608 13.2928 5.15894 13.6393 5.80001 13.8786L6.08215 15.4018C6.1033 15.516 6.15871 15.6211 6.241 15.703C6.32329 15.785 6.42857 15.84 6.54287 15.8607L6.59108 15.8696C7.52879 16.0384 8.48909 16.0384 9.4268 15.8696L9.47501 15.8607C9.5893 15.84 9.69459 15.785 9.77688 15.703C9.85917 15.6211 9.91457 15.516 9.93572 15.4018L10.2161 13.8857C10.8625 13.6428 11.4589 13.2982 11.9947 12.8589L13.4447 13.375C13.554 13.4137 13.6725 13.4181 13.7845 13.3878C13.8964 13.3575 13.9965 13.2939 14.0714 13.2053L14.1036 13.1678C14.725 12.4339 15.2018 11.6071 15.525 10.7089L15.5411 10.6625C15.6179 10.4411 15.5518 10.1928 15.3714 10.0375ZM8.00894 10.9696C6.27501 10.9696 4.86965 9.56427 4.86965 7.83035C4.86965 6.09642 6.27501 4.69106 8.00894 4.69106C9.74287 4.69106 11.1482 6.09642 11.1482 7.83035C11.1482 9.56427 9.74287 10.9696 8.00894 10.9696Z" />
@@ -10,7 +12,7 @@ const CogIcon: React.FC = () => {
   );
 };
 
-const DelayIcon: React.FC = () => {
+const DelayIcon: FC = () => {
   return (
     <svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -25,7 +27,7 @@ const DelayIcon: React.FC = () => {
   );
 };
 
-const DocumentationIcon: React.FC = () => {
+const DocumentationIcon: FC = () => {
   return (
     <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M8 0C3.58214 0 0 3.58214 0 8C0 12.4179 3.58214 16 8 16C12.4179 16 16 12.4179 16 8C16 3.58214 12.4179 0 8 0ZM8 12.6429C7.60536 12.6429 7.28571 12.3232 7.28571 11.9286C7.28571 11.5339 7.60536 11.2143 8 11.2143C8.39464 11.2143 8.71429 11.5339 8.71429 11.9286C8.71429 12.3232 8.39464 12.6429 8 12.6429ZM9.12321 8.72322C8.9615 8.78566 8.82235 8.8954 8.72392 9.0381C8.62549 9.18081 8.57235 9.34986 8.57143 9.52321V9.92857C8.57143 10.0071 8.50714 10.0714 8.42857 10.0714H7.57143C7.49286 10.0714 7.42857 10.0071 7.42857 9.92857V9.54464C7.42857 9.13214 7.54821 8.725 7.78393 8.38571C8.01429 8.05357 8.33571 7.8 8.71429 7.65536C9.32143 7.42143 9.71429 6.9125 9.71429 6.35714C9.71429 5.56964 8.94464 4.92857 8 4.92857C7.05536 4.92857 6.28571 5.56964 6.28571 6.35714V6.49286C6.28571 6.57143 6.22143 6.63571 6.14286 6.63571H5.28571C5.20714 6.63571 5.14286 6.57143 5.14286 6.49286V6.35714C5.14286 5.65536 5.45 5 6.00714 4.5125C6.54286 4.04286 7.25 3.78571 8 3.78571C8.75 3.78571 9.45714 4.04464 9.99286 4.5125C10.55 5 10.8571 5.65536 10.8571 6.35714C10.8571 7.38929 10.1768 8.31786 9.12321 8.72322Z" />
@@ -33,7 +35,7 @@ const DocumentationIcon: React.FC = () => {
   );
 };
 
-const GitHubIcon: React.FC = () => {
+const GitHubIcon: FC = () => {
   return (
     <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M7.99286 0.219666C3.57679 0.21788 0 3.79288 0 8.20538C0 11.6947 2.2375 14.6607 5.35357 15.75C5.77321 15.8554 5.70893 15.5572 5.70893 15.3536V13.9697C3.28571 14.2536 3.1875 12.65 3.025 12.3822C2.69643 11.8215 1.91964 11.6786 2.15179 11.4107C2.70357 11.1268 3.26607 11.4822 3.91786 12.4447C4.38929 13.1429 5.30893 13.025 5.775 12.909C5.87679 12.4893 6.09464 12.1143 6.39464 11.8232C3.88393 11.3732 2.8375 9.8411 2.8375 8.01967C2.8375 7.13574 3.12857 6.32324 3.7 5.66788C3.33571 4.58752 3.73393 3.66252 3.7875 3.52502C4.825 3.43217 5.90357 4.26788 5.9875 4.33395C6.57679 4.17502 7.25 4.0911 8.00357 4.0911C8.76071 4.0911 9.43571 4.1786 10.0304 4.33931C10.2321 4.18574 11.2321 3.46788 12.1964 3.55538C12.2482 3.69288 12.6375 4.59645 12.2946 5.66252C12.8732 6.31967 13.1679 7.13931 13.1679 8.02502C13.1679 9.85003 12.1143 11.384 9.59643 11.8268C9.81209 12.0389 9.98333 12.2918 10.1001 12.5708C10.217 12.8498 10.277 13.1493 10.2768 13.4518V15.4607C10.2911 15.6215 10.2768 15.7804 10.5446 15.7804C13.7071 14.7143 15.9839 11.7268 15.9839 8.20717C15.9839 3.79288 12.4054 0.219666 7.99286 0.219666Z" />
@@ -41,7 +43,7 @@ const GitHubIcon: React.FC = () => {
   );
 };
 
-const DiscordIcon: React.FC = () => {
+const DiscordIcon: FC = () => {
   return (
     <svg width="14" height="16" viewBox="0 0 14 16" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M9.28889 7.6C9.27534 7.75846 9.21596 7.90955 9.11799 8.03482C9.02002 8.1601 8.88769 8.25414 8.73717 8.30548C8.58665 8.35682 8.42444 8.36323 8.27033 8.32393C8.11623 8.28462 7.9769 8.20131 7.86935 8.08415C7.7618 7.967 7.69068 7.82106 7.66467 7.66417C7.63867 7.50727 7.6589 7.3462 7.7229 7.20061C7.78689 7.05501 7.89189 6.9312 8.02507 6.84428C8.15825 6.75736 8.31386 6.71109 8.47289 6.71111C8.58487 6.7158 8.69483 6.74252 8.79647 6.78974C8.89811 6.83697 8.98943 6.90378 9.06523 6.98634C9.14102 7.0689 9.19979 7.1656 9.23816 7.2709C9.27654 7.3762 9.29378 7.48803 9.28889 7.6ZM5.55289 6.71111C5.328 6.72702 5.11751 6.82758 4.96382 6.99253C4.81013 7.15748 4.72467 7.37455 4.72467 7.6C4.72467 7.82545 4.81013 8.04252 4.96382 8.20747C5.11751 8.37241 5.328 8.47298 5.55289 8.48889C5.66487 8.4842 5.77483 8.45748 5.87646 8.41026C5.9781 8.36303 6.06943 8.29622 6.14523 8.21366C6.22102 8.1311 6.27979 8.0344 6.31816 7.9291C6.35654 7.8238 6.37378 7.71197 6.36889 7.6C6.3745 7.48779 6.35773 7.37559 6.31956 7.26992C6.28139 7.16426 6.22258 7.06724 6.14656 6.98452C6.07054 6.90179 5.97882 6.83502 5.87675 6.78808C5.77468 6.74114 5.66429 6.71498 5.552 6.71111H5.55289ZM14 1.648V16C11.9844 14.2191 12.6293 14.8084 10.288 12.632L10.712 14.112H1.64C1.20402 14.1108 0.786355 13.9366 0.478821 13.6275C0.171286 13.3185 -0.00094039 12.9 3.86232e-06 12.464V1.648C-0.00094039 1.21202 0.171286 0.793508 0.478821 0.484473C0.786355 0.175439 1.20402 0.00117731 1.64 0L12.36 0C12.796 0.00117731 13.2137 0.175439 13.5212 0.484473C13.8287 0.793508 14.0009 1.21202 14 1.648ZM11.72 9.232C11.6941 7.61016 11.3002 6.01539 10.568 4.568C9.92374 4.06196 9.13824 3.76845 8.32 3.728L8.208 3.856C8.93644 4.04983 9.61542 4.39614 10.2 4.872C9.2873 4.37995 8.27412 4.10324 7.23801 4.06303C6.2019 4.02281 5.17032 4.22017 4.22223 4.64C3.92623 4.776 3.75023 4.872 3.75023 4.872C4.3664 4.37146 5.08541 4.01301 5.856 3.82222L5.77778 3.728C4.95954 3.76845 4.17405 4.06196 3.52978 4.568C2.79697 6.01524 2.40245 7.61002 2.376 9.232C2.65192 9.61913 3.01875 9.9325 3.44423 10.1445C3.86971 10.3566 4.34079 10.4608 4.816 10.448C4.816 10.448 5.112 10.088 5.352 9.784C4.78959 9.64208 4.29441 9.30819 3.952 8.84C4.06978 8.92222 4.26311 9.02933 4.28 9.04C5.03927 9.45388 5.88109 9.69371 6.74447 9.74214C7.60786 9.79057 8.47121 9.64637 9.272 9.32C9.59551 9.19792 9.90415 9.03957 10.192 8.848C9.83679 9.32625 9.32388 9.66346 8.744 9.8C8.984 10.104 9.272 10.448 9.272 10.448C9.74823 10.46 10.2202 10.3555 10.6468 10.1436C11.0735 9.93168 11.4419 9.61874 11.72 9.232Z" />
@@ -49,7 +51,7 @@ const DiscordIcon: React.FC = () => {
   );
 };
 
-const FailedStatusIcon: React.FC = () => {
+const FailedStatusIcon: FC = () => {
   return (
     <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -60,7 +62,7 @@ const FailedStatusIcon: React.FC = () => {
   );
 };
 
-const PassedStatusIcon: React.FC = () => {
+const PassedStatusIcon: FC = () => {
   return (
     <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -71,15 +73,15 @@ const PassedStatusIcon: React.FC = () => {
   );
 };
 
-const RunningStatusIcon: React.FC = () => {
+const RunningStatusIcon: FC = () => {
   return <LoadingOutlined style={{color: '#7DD3FC'}} />;
 };
 
-const AbortingStatusIcon: React.FC = () => {
+const AbortingStatusIcon: FC = () => {
   return <LoadingOutlined style={{color: '#F472B6'}} />;
 };
 
-const PendingStatusIcon: React.FC = () => {
+const PendingStatusIcon: FC = () => {
   return (
     <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -90,7 +92,7 @@ const PendingStatusIcon: React.FC = () => {
   );
 };
 
-const CloudMigrateIcon: React.FC = () => {
+const CloudMigrateIcon: FC = () => {
   return (
     <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M16.1978 14.3449C16.1744 14.3151 16.1445 14.2909 16.1104 14.2743C16.0763 14.2577 16.0388 14.249 16.0009 14.249C15.9629 14.249 15.9255 14.2577 15.8914 14.2743C15.8573 14.2909 15.8274 14.3151 15.804 14.3449L12.304 18.7731C12.2752 18.8099 12.2573 18.8542 12.2524 18.9007C12.2474 18.9472 12.2557 18.9942 12.2763 19.0363C12.2968 19.0783 12.3288 19.1137 12.3685 19.1385C12.4082 19.1632 12.4541 19.1763 12.5009 19.1762H14.8103V26.7512C14.8103 26.8887 14.9228 27.0012 15.0603 27.0012H16.9353C17.0728 27.0012 17.1853 26.8887 17.1853 26.7512V19.1793H19.5009C19.7102 19.1793 19.8259 18.9387 19.6977 18.7762L16.1978 14.3449Z" />
@@ -99,7 +101,7 @@ const CloudMigrateIcon: React.FC = () => {
   );
 };
 
-export default {
+export const icons = {
   CogIcon,
   DocumentationIcon,
   GitHubIcon,
diff --git a/src/components/atoms/Icon/types.ts b/src/components/atoms/Icon/types.ts
index 02eb20ab4..77622e3f8 100644
--- a/src/components/atoms/Icon/types.ts
+++ b/src/components/atoms/Icon/types.ts
@@ -1,3 +1,5 @@
+import {CSSProperties} from 'react';
+
 import {IconComponentProps} from '@ant-design/icons/lib/components/Icon';
 
 export type IconProps = {
@@ -20,5 +22,5 @@ export type IconProps = {
     | 'success'
     | 'cloudMigrate';
   component?: IconComponentProps['component'];
-  style?: React.CSSProperties;
+  style?: CSSProperties;
 };
diff --git a/src/components/atoms/IconLabel/IconLabel.styled.tsx b/src/components/atoms/IconLabel.styled.tsx
similarity index 100%
rename from src/components/atoms/IconLabel/IconLabel.styled.tsx
rename to src/components/atoms/IconLabel.styled.tsx
diff --git a/src/components/atoms/IconLabel/IconLabel.tsx b/src/components/atoms/IconLabel.tsx
similarity index 63%
rename from src/components/atoms/IconLabel/IconLabel.tsx
rename to src/components/atoms/IconLabel.tsx
index d2b0589c0..a257c1836 100644
--- a/src/components/atoms/IconLabel/IconLabel.tsx
+++ b/src/components/atoms/IconLabel.tsx
@@ -1,4 +1,4 @@
-import {ReactElement} from 'react';
+import {FC, ReactElement} from 'react';
 
 import {IconLabelContainer} from './IconLabel.styled';
 
@@ -7,7 +7,7 @@ interface NewTabProps {
   icon: ReactElement;
 }
 
-const IconLabel: React.FC<NewTabProps> = ({title, icon}) => {
+export const IconLabel: FC<NewTabProps> = ({title, icon}) => {
   return (
     <IconLabelContainer>
       {title}
@@ -15,5 +15,3 @@ const IconLabel: React.FC<NewTabProps> = ({title, icon}) => {
     </IconLabelContainer>
   );
 };
-
-export default IconLabel;
diff --git a/src/components/atoms/IconLabel/index.ts b/src/components/atoms/IconLabel/index.ts
deleted file mode 100644
index 3122e9ab1..000000000
--- a/src/components/atoms/IconLabel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './IconLabel';
diff --git a/src/components/atoms/LabelListItem/LabelListItem.styled.ts b/src/components/atoms/LabelListItem.styled.ts
similarity index 89%
rename from src/components/atoms/LabelListItem/LabelListItem.styled.ts
rename to src/components/atoms/LabelListItem.styled.ts
index a84056e34..39ffdc8cb 100644
--- a/src/components/atoms/LabelListItem/LabelListItem.styled.ts
+++ b/src/components/atoms/LabelListItem.styled.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledLabelListItem = styled.li<{isSkippedMode: boolean}>`
   display: flex;
diff --git a/src/components/atoms/LabelListItem/LabelListItem.tsx b/src/components/atoms/LabelListItem.tsx
similarity index 73%
rename from src/components/atoms/LabelListItem/LabelListItem.tsx
rename to src/components/atoms/LabelListItem.tsx
index b5a7c155b..166780caf 100644
--- a/src/components/atoms/LabelListItem/LabelListItem.tsx
+++ b/src/components/atoms/LabelListItem.tsx
@@ -1,8 +1,9 @@
-import {SplitLabelText} from '@atoms';
+import {FC} from 'react';
 
-import {EntityKey, EntityValue} from '@models/entityMap';
+import type {EntityKey, EntityValue} from '@models/entityMap';
 
 import {StyledLabelListItem} from './LabelListItem.styled';
+import {SplitLabelText} from './SplitLabelText';
 
 type LabelListItemProps = {
   labelKey?: EntityKey;
@@ -11,7 +12,7 @@ type LabelListItemProps = {
   skippedLabelsNumber?: number;
 };
 
-const LabelListItem: React.FC<LabelListItemProps> = props => {
+export const LabelListItem: FC<LabelListItemProps> = props => {
   const {labelKey = '', labelValue = '', isSkippedMode = false, skippedLabelsNumber = 0} = props;
 
   const value = isSkippedMode ? `+${skippedLabelsNumber} more` : labelValue ? `${labelKey}: ${labelValue}` : labelKey;
@@ -22,5 +23,3 @@ const LabelListItem: React.FC<LabelListItemProps> = props => {
     </StyledLabelListItem>
   );
 };
-
-export default LabelListItem;
diff --git a/src/components/atoms/LabelListItem/index.ts b/src/components/atoms/LabelListItem/index.ts
deleted file mode 100644
index 1ce5595c6..000000000
--- a/src/components/atoms/LabelListItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './LabelListItem';
diff --git a/src/components/atoms/Loader/Loader.styled.tsx b/src/components/atoms/Loader.styled.tsx
similarity index 100%
rename from src/components/atoms/Loader/Loader.styled.tsx
rename to src/components/atoms/Loader.styled.tsx
diff --git a/src/components/atoms/Loader/Loader.tsx b/src/components/atoms/Loader.tsx
similarity index 90%
rename from src/components/atoms/Loader/Loader.tsx
rename to src/components/atoms/Loader.tsx
index 96ee0fc98..471533f4f 100644
--- a/src/components/atoms/Loader/Loader.tsx
+++ b/src/components/atoms/Loader.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {SpinProps} from 'antd';
 
 import {ReactComponent as LoadingIcon} from '@assets/loading.svg';
@@ -17,7 +19,7 @@ const durationTime: Record<DurationType, number> = {
   short: 500,
 };
 
-const Loader: React.FC<LoaderProps> = props => {
+export const Loader: FC<LoaderProps> = props => {
   const {isCentered = true, duration = 'default', ...rest} = props;
 
   const animationDuration = typeof duration === 'number' ? duration : durationTime[duration];
@@ -28,5 +30,3 @@ const Loader: React.FC<LoaderProps> = props => {
     </StyledLoaderContainer>
   );
 };
-
-export default Loader;
diff --git a/src/components/atoms/Loader/index.ts b/src/components/atoms/Loader/index.ts
deleted file mode 100644
index c624348c0..000000000
--- a/src/components/atoms/Loader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Loader';
diff --git a/src/components/atoms/MonacoEditor/MonacoEditor.tsx b/src/components/atoms/MonacoEditor.tsx
similarity index 93%
rename from src/components/atoms/MonacoEditor/MonacoEditor.tsx
rename to src/components/atoms/MonacoEditor.tsx
index 44baff066..83c6ff869 100644
--- a/src/components/atoms/MonacoEditor/MonacoEditor.tsx
+++ b/src/components/atoms/MonacoEditor.tsx
@@ -1,8 +1,8 @@
-import React, {lazy, useEffect, useMemo, useState} from 'react';
+import {FC, lazy, useEffect, useMemo, useState} from 'react';
 import type {EditorDidMount, monaco} from 'react-monaco-editor';
 import {useWindowSize} from 'react-use';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 const MonacoEditor = lazy(() => import('react-monaco-editor'));
 
@@ -40,7 +40,7 @@ const options = {
 
 const defaultEditorHeight = 300;
 
-const TkMonacoEditor: React.FC<TkMonacoEditorProps> = props => {
+export const TkMonacoEditor: FC<TkMonacoEditorProps> = props => {
   const {value, onChange, language, disabled = false, height, minHeight = defaultEditorHeight} = props;
   const [editor, setEditor] = useState<monaco.editor.IStandaloneCodeEditor | null>(null);
   const editorOptions = useMemo(() => ({...options, readOnly: disabled}), [disabled]);
@@ -100,5 +100,3 @@ const TkMonacoEditor: React.FC<TkMonacoEditorProps> = props => {
     />
   );
 };
-
-export default TkMonacoEditor;
diff --git a/src/components/atoms/MonacoEditor/index.ts b/src/components/atoms/MonacoEditor/index.ts
deleted file mode 100644
index bb0525764..000000000
--- a/src/components/atoms/MonacoEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default, lineHeight} from './MonacoEditor';
diff --git a/src/components/atoms/Pre/Pre.styled.tsx b/src/components/atoms/Pre.styled.tsx
similarity index 100%
rename from src/components/atoms/Pre/Pre.styled.tsx
rename to src/components/atoms/Pre.styled.tsx
diff --git a/src/components/atoms/Pre/Pre.tsx b/src/components/atoms/Pre.tsx
similarity index 50%
rename from src/components/atoms/Pre/Pre.tsx
rename to src/components/atoms/Pre.tsx
index cb2be0286..9ae28ab88 100644
--- a/src/components/atoms/Pre/Pre.tsx
+++ b/src/components/atoms/Pre.tsx
@@ -1,11 +1,9 @@
-import {PropsWithChildren} from 'react';
+import {FC, PropsWithChildren} from 'react';
 
 import {StyledPre} from './Pre.styled';
 
-const Pre: React.FC<PropsWithChildren<{}>> = props => {
+export const Pre: FC<PropsWithChildren<{}>> = props => {
   const {children} = props;
 
   return <StyledPre>{children}</StyledPre>;
 };
-
-export default Pre;
diff --git a/src/components/atoms/Pre/index.ts b/src/components/atoms/Pre/index.ts
deleted file mode 100644
index 4855db4c2..000000000
--- a/src/components/atoms/Pre/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Pre';
diff --git a/src/components/atoms/ScrollTrigger/ScrollTrigger.spec.tsx b/src/components/atoms/ScrollTrigger.spec.tsx
similarity index 97%
rename from src/components/atoms/ScrollTrigger/ScrollTrigger.spec.tsx
rename to src/components/atoms/ScrollTrigger.spec.tsx
index 29a3b7261..b3715f2be 100644
--- a/src/components/atoms/ScrollTrigger/ScrollTrigger.spec.tsx
+++ b/src/components/atoms/ScrollTrigger.spec.tsx
@@ -1,7 +1,7 @@
 import {intersectionObserver} from '@shopify/jest-dom-mocks';
 import {act, render} from '@testing-library/react';
 
-import {ScrollTrigger} from '@atoms';
+import {ScrollTrigger} from './ScrollTrigger';
 
 describe('atoms', () => {
   describe('ScrollTrigger', () => {
diff --git a/src/components/atoms/ScrollTrigger/ScrollTrigger.styled.tsx b/src/components/atoms/ScrollTrigger.styled.tsx
similarity index 100%
rename from src/components/atoms/ScrollTrigger/ScrollTrigger.styled.tsx
rename to src/components/atoms/ScrollTrigger.styled.tsx
diff --git a/src/components/atoms/ScrollTrigger/ScrollTrigger.tsx b/src/components/atoms/ScrollTrigger.tsx
similarity index 67%
rename from src/components/atoms/ScrollTrigger/ScrollTrigger.tsx
rename to src/components/atoms/ScrollTrigger.tsx
index 4ea19247e..df4414168 100644
--- a/src/components/atoms/ScrollTrigger/ScrollTrigger.tsx
+++ b/src/components/atoms/ScrollTrigger.tsx
@@ -1,6 +1,6 @@
-import {memo, useEffect, useMemo, useRef} from 'react';
+import {FC, memo, useEffect, useMemo, useRef} from 'react';
 
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
 import {StyledScrollTrigger} from './ScrollTrigger.styled';
 
@@ -10,7 +10,7 @@ type ScrollTriggerProps = {
   onScroll?: () => void;
 };
 
-const InternalScrollTrigger: React.FC<ScrollTriggerProps> = memo(props => {
+const InternalScrollTrigger: FC<ScrollTriggerProps> = memo(props => {
   const {offset = 0, disabled = false, onScroll} = props;
   const style = useMemo(() => ({top: `${-offset}px`}), [offset]);
   const ref = useRef(null);
@@ -25,7 +25,5 @@ const InternalScrollTrigger: React.FC<ScrollTriggerProps> = memo(props => {
   return <StyledScrollTrigger ref={ref} style={style} />;
 });
 
-const ScrollTrigger: React.FC<ScrollTriggerProps> = ({onScroll, disabled, ...rest}) =>
+export const ScrollTrigger: FC<ScrollTriggerProps> = ({onScroll, disabled, ...rest}) =>
   onScroll && !disabled ? <InternalScrollTrigger onScroll={onScroll} {...rest} /> : null;
-
-export default ScrollTrigger;
diff --git a/src/components/atoms/ScrollTrigger/index.ts b/src/components/atoms/ScrollTrigger/index.ts
deleted file mode 100644
index ad7d82045..000000000
--- a/src/components/atoms/ScrollTrigger/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ScrollTrigger';
diff --git a/src/components/atoms/SplitLabelText/SplitLabelText.tsx b/src/components/atoms/SplitLabelText.tsx
similarity index 76%
rename from src/components/atoms/SplitLabelText/SplitLabelText.tsx
rename to src/components/atoms/SplitLabelText.tsx
index d46c0b17f..81b890b06 100644
--- a/src/components/atoms/SplitLabelText/SplitLabelText.tsx
+++ b/src/components/atoms/SplitLabelText.tsx
@@ -1,17 +1,17 @@
-import React from 'react';
+import {FC} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {labelRegex} from '@molecules/LabelsSelect/utils';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 type SplitLabelProps = {
   value: string;
   textClassName?: string;
 };
 
-const SplitLabelText: React.FC<SplitLabelProps> = props => {
+export const SplitLabelText: FC<SplitLabelProps> = props => {
   const {value, textClassName = 'regular'} = props;
 
   if (!labelRegex.test(value)) {
@@ -35,5 +35,3 @@ const SplitLabelText: React.FC<SplitLabelProps> = props => {
     </>
   );
 };
-
-export default SplitLabelText;
diff --git a/src/components/atoms/SplitLabelText/index.ts b/src/components/atoms/SplitLabelText/index.ts
deleted file mode 100644
index 3b890d055..000000000
--- a/src/components/atoms/SplitLabelText/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SplitLabelText';
diff --git a/src/components/atoms/StatusIcon/StatusIcon.styled.tsx b/src/components/atoms/StatusIcon.styled.tsx
similarity index 100%
rename from src/components/atoms/StatusIcon/StatusIcon.styled.tsx
rename to src/components/atoms/StatusIcon.styled.tsx
diff --git a/src/components/atoms/StatusIcon/StatusIcon.tsx b/src/components/atoms/StatusIcon.tsx
similarity index 87%
rename from src/components/atoms/StatusIcon/StatusIcon.tsx
rename to src/components/atoms/StatusIcon.tsx
index 7f4c554c0..449d0c497 100644
--- a/src/components/atoms/StatusIcon/StatusIcon.tsx
+++ b/src/components/atoms/StatusIcon.tsx
@@ -1,9 +1,9 @@
-import {Icon} from '@atoms';
+import {FC} from 'react';
 
-import Colors from '@styles/Colors';
-
-import {IconProps} from '../Icon/types';
+import {Colors} from '@styles/Colors';
 
+import {Icon} from './Icon';
+import type {IconProps} from './Icon/types';
 import {StyledStatusIcon} from './StatusIcon.styled';
 
 interface IconStyle {
@@ -64,7 +64,7 @@ type StatusIconProps = {
   status: IconProps['name'];
 };
 
-const StatusIcon: React.FC<StatusIconProps> = props => {
+export const StatusIcon: FC<StatusIconProps> = props => {
   const {status} = props;
 
   return (
@@ -73,5 +73,3 @@ const StatusIcon: React.FC<StatusIconProps> = props => {
     </StyledStatusIcon>
   );
 };
-
-export default StatusIcon;
diff --git a/src/components/atoms/StatusIcon/index.ts b/src/components/atoms/StatusIcon/index.ts
deleted file mode 100644
index cdbf5dc2d..000000000
--- a/src/components/atoms/StatusIcon/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './StatusIcon';
diff --git a/src/components/atoms/Tag/Tag.styled.tsx b/src/components/atoms/Tag.styled.tsx
similarity index 96%
rename from src/components/atoms/Tag/Tag.styled.tsx
rename to src/components/atoms/Tag.styled.tsx
index e24c86f99..7799f461b 100644
--- a/src/components/atoms/Tag/Tag.styled.tsx
+++ b/src/components/atoms/Tag.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const TagContainer = styled.div`
   display: inline-flex;
diff --git a/src/components/atoms/Tag/Tag.tsx b/src/components/atoms/Tag.tsx
similarity index 76%
rename from src/components/atoms/Tag/Tag.tsx
rename to src/components/atoms/Tag.tsx
index 114503bd0..ccd9386e1 100644
--- a/src/components/atoms/Tag/Tag.tsx
+++ b/src/components/atoms/Tag.tsx
@@ -1,6 +1,8 @@
+import {FC} from 'react';
+
 import {Tooltip} from 'antd';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {TagContainer} from './Tag.styled';
 
@@ -10,7 +12,7 @@ export interface TagProps {
   tooltipMessage?: string;
 }
 
-const Tag: React.FC<TagProps> = ({title, type = '', tooltipMessage}) => {
+export const Tag: FC<TagProps> = ({title, type = '', tooltipMessage}) => {
   return (
     <TagContainer className={`${type}`}>
       {tooltipMessage ? (
@@ -23,5 +25,3 @@ const Tag: React.FC<TagProps> = ({title, type = '', tooltipMessage}) => {
     </TagContainer>
   );
 };
-
-export default Tag;
diff --git a/src/components/atoms/Tag/index.ts b/src/components/atoms/Tag/index.ts
deleted file mode 100644
index c752393e5..000000000
--- a/src/components/atoms/Tag/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Tag';
diff --git a/src/components/atoms/TestkubeTheme/AnsiClassesMapping.ts b/src/components/atoms/TestkubeTheme/AnsiClassesMapping.ts
index ce3e9c8f1..8b54af9da 100644
--- a/src/components/atoms/TestkubeTheme/AnsiClassesMapping.ts
+++ b/src/components/atoms/TestkubeTheme/AnsiClassesMapping.ts
@@ -1,6 +1,6 @@
 import {range} from 'lodash';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 const foregrounds = {
   black: [Colors.slate600, Colors.slate400],
@@ -59,7 +59,7 @@ const ansiGrayscaleCss = range(232, 256)
   })
   .join('\n');
 
-export default `
+export const AnsiClassesMapping = `
   ${baseBackgroundCss}
   ${baseTextCss}
   ${ansiCss}
diff --git a/src/components/atoms/UploadWithInput/UploadWithInput.styled.tsx b/src/components/atoms/UploadWithInput.styled.tsx
similarity index 96%
rename from src/components/atoms/UploadWithInput/UploadWithInput.styled.tsx
rename to src/components/atoms/UploadWithInput.styled.tsx
index 984778ce6..03d895ba1 100644
--- a/src/components/atoms/UploadWithInput/UploadWithInput.styled.tsx
+++ b/src/components/atoms/UploadWithInput.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledUploadWithInputContainer = styled.div`
   display: flex;
diff --git a/src/components/atoms/UploadWithInput/UploadWithInput.tsx b/src/components/atoms/UploadWithInput.tsx
similarity index 86%
rename from src/components/atoms/UploadWithInput/UploadWithInput.tsx
rename to src/components/atoms/UploadWithInput.tsx
index 2f8c81588..426ce2dc0 100644
--- a/src/components/atoms/UploadWithInput/UploadWithInput.tsx
+++ b/src/components/atoms/UploadWithInput.tsx
@@ -1,8 +1,11 @@
+import {FC} from 'react';
+
 import {UploadChangeParam, UploadProps} from 'antd/lib/upload';
 
 import classNames from 'classnames';
 
-import {Input, Upload} from '@custom-antd';
+import {Input} from '@custom-antd/Input';
+import {Upload} from '@custom-antd/Upload';
 
 import {StyledUploadWithInputContainer} from './UploadWithInput.styled';
 
@@ -18,7 +21,7 @@ type UploadWithInputProps = {
 
 const defaultBeforeUpload = () => false;
 
-const UploadWithInput: React.FC<UploadWithInputProps> = props => {
+export const UploadWithInput: FC<UploadWithInputProps> = props => {
   const {onFileChange, beforeUpload = defaultBeforeUpload, value} = props;
 
   const inputClassNames = classNames({
@@ -42,5 +45,3 @@ const UploadWithInput: React.FC<UploadWithInputProps> = props => {
     </StyledUploadWithInputContainer>
   );
 };
-
-export default UploadWithInput;
diff --git a/src/components/atoms/UploadWithInput/index.ts b/src/components/atoms/UploadWithInput/index.ts
deleted file mode 100644
index 43acb8701..000000000
--- a/src/components/atoms/UploadWithInput/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './UploadWithInput';
diff --git a/src/components/atoms/index.ts b/src/components/atoms/index.ts
deleted file mode 100644
index 385255c83..000000000
--- a/src/components/atoms/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export {default as Icon} from './Icon/Icon';
-export {default as ExecutorIcon} from './ExecutorIcon';
-export {default as Dots} from './Dots';
-export {default as LabelListItem} from './LabelListItem';
-export {default as Loader} from './Loader';
-export {default as UploadWithInput} from './UploadWithInput';
-export {default as StatusIcon} from './StatusIcon';
-export {default as Pre} from './Pre';
-export {default as CreatableMultiSelect} from './CreatableMultiSelect';
-export {default as SplitLabelText} from './SplitLabelText';
-export {default as CopyButton} from './CopyButton';
-export {default as ScrollTrigger} from './ScrollTrigger';
-export {default as AnsiClassesMapping} from './TestkubeTheme/AnsiClassesMapping';
-export {default as ExternalLink} from './ExternalLink';
-export {default as DownloadButton} from './DownloadButton';
-export {default as Asterisk} from './Asterisk';
-export {default as CommandInput} from './CommandInput';
-export {default as MonacoEditor} from './MonacoEditor';
-export {default as IconLabel} from './IconLabel';
-export {default as Tag} from './Tag';
diff --git a/src/components/custom-antd/Button/Button.styled.tsx b/src/components/custom-antd/Button.styled.tsx
similarity index 98%
rename from src/components/custom-antd/Button/Button.styled.tsx
rename to src/components/custom-antd/Button.styled.tsx
index 6582445a4..9d97411e2 100644
--- a/src/components/custom-antd/Button/Button.styled.tsx
+++ b/src/components/custom-antd/Button.styled.tsx
@@ -2,7 +2,7 @@ import {Button as AntdButton, ButtonProps as AntdButtonProps} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export interface ICustomButtonProps extends AntdButtonProps {
   $customType?: 'primary' | 'secondary' | 'tertiary' | 'transparent' | 'warning' | 'github' | 'gitlab';
diff --git a/src/components/custom-antd/Button/Button.tsx b/src/components/custom-antd/Button.tsx
similarity index 57%
rename from src/components/custom-antd/Button/Button.tsx
rename to src/components/custom-antd/Button.tsx
index f8e35371b..760d2eabc 100644
--- a/src/components/custom-antd/Button/Button.tsx
+++ b/src/components/custom-antd/Button.tsx
@@ -1,7 +1,7 @@
+import {FC} from 'react';
+
 import {AntdCustomStyledButton, ICustomButtonProps} from './Button.styled';
 
-const Button: React.FC<ICustomButtonProps> = ({hidden = false, $withPadding = true, ...props}) => {
+export const Button: FC<ICustomButtonProps> = ({hidden = false, $withPadding = true, ...props}) => {
   return !hidden ? <AntdCustomStyledButton {...props} $withPadding={$withPadding} /> : <></>;
 };
-
-export default Button;
diff --git a/src/components/custom-antd/Button/index.ts b/src/components/custom-antd/Button/index.ts
deleted file mode 100644
index 67facdbbf..000000000
--- a/src/components/custom-antd/Button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Button';
diff --git a/src/components/custom-antd/Checkbox/Checkbox.styled.tsx b/src/components/custom-antd/Checkbox.styled.tsx
similarity index 94%
rename from src/components/custom-antd/Checkbox/Checkbox.styled.tsx
rename to src/components/custom-antd/Checkbox.styled.tsx
index d3c5095aa..e5179b45c 100644
--- a/src/components/custom-antd/Checkbox/Checkbox.styled.tsx
+++ b/src/components/custom-antd/Checkbox.styled.tsx
@@ -2,7 +2,7 @@ import {Checkbox, CheckboxProps} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export interface CustomCheckboxProps extends CheckboxProps {}
 
diff --git a/src/components/custom-antd/Checkbox/Checkbox.tsx b/src/components/custom-antd/Checkbox.tsx
similarity index 57%
rename from src/components/custom-antd/Checkbox/Checkbox.tsx
rename to src/components/custom-antd/Checkbox.tsx
index 3f16fb62d..a5a7cd7ef 100644
--- a/src/components/custom-antd/Checkbox/Checkbox.tsx
+++ b/src/components/custom-antd/Checkbox.tsx
@@ -1,7 +1,7 @@
+import {FC} from 'react';
+
 import {CustomCheckbox, CustomCheckboxProps} from './Checkbox.styled';
 
-const Checkbox: React.FC<CustomCheckboxProps> = props => {
+export const Checkbox: FC<CustomCheckboxProps> = props => {
   return <CustomCheckbox {...props} />;
 };
-
-export default Checkbox;
diff --git a/src/components/custom-antd/Checkbox/index.ts b/src/components/custom-antd/Checkbox/index.ts
deleted file mode 100644
index 107e2e659..000000000
--- a/src/components/custom-antd/Checkbox/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Checkbox';
diff --git a/src/components/custom-antd/Form/Form.styled.tsx b/src/components/custom-antd/Form.styled.tsx
similarity index 92%
rename from src/components/custom-antd/Form/Form.styled.tsx
rename to src/components/custom-antd/Form.styled.tsx
index 4f2de8550..d950bb4df 100644
--- a/src/components/custom-antd/Form/Form.styled.tsx
+++ b/src/components/custom-antd/Form.styled.tsx
@@ -2,7 +2,7 @@ import {Form} from 'antd';
 
 import styled from 'styled-components';
 
-import Fonts from '@styles/Fonts';
+import {Fonts} from '@styles/Fonts';
 
 const {Item: AntdFormItem} = Form;
 
diff --git a/src/components/custom-antd/Form/FormItem/FormItem.tsx b/src/components/custom-antd/Form/FormItem.tsx
similarity index 69%
rename from src/components/custom-antd/Form/FormItem/FormItem.tsx
rename to src/components/custom-antd/Form/FormItem.tsx
index 56044d2c4..0902cc021 100644
--- a/src/components/custom-antd/Form/FormItem/FormItem.tsx
+++ b/src/components/custom-antd/Form/FormItem.tsx
@@ -1,12 +1,14 @@
+import {FC} from 'react';
+
 import {FormItemProps} from 'antd';
 
-import {StyledFormItem, StyledFormItemLabel} from '../Form.styled';
+import {StyledFormItem, StyledFormItemLabel} from '@custom-antd/Form.styled';
 
 type FormItemCustomProps = {
   flex?: number | string;
 };
 
-const FormItem: React.FC<FormItemProps & FormItemCustomProps> = props => {
+export const FormItem: FC<FormItemProps & FormItemCustomProps> = props => {
   const {children, label, flex = 1, ...rest} = props;
 
   const formItemsProps: FormItemProps & {$flex: number | string} = {
@@ -17,5 +19,3 @@ const FormItem: React.FC<FormItemProps & FormItemCustomProps> = props => {
 
   return <StyledFormItem {...formItemsProps}>{children}</StyledFormItem>;
 };
-
-export default FormItem;
diff --git a/src/components/custom-antd/Form/FormItem/FormItemLabel.tsx b/src/components/custom-antd/Form/FormItem/FormItemLabel.tsx
index c21f7a0a6..d413e7b87 100644
--- a/src/components/custom-antd/Form/FormItem/FormItemLabel.tsx
+++ b/src/components/custom-antd/Form/FormItem/FormItemLabel.tsx
@@ -1,11 +1,13 @@
+import {FC} from 'react';
+
 import {QuestionCircleOutlined} from '@ant-design/icons';
 import {Tooltip} from 'antd';
 
-import {Asterisk} from '@atoms';
+import {Asterisk} from '@atoms/Asterisk';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 type FormItemLabelProps = {
   status?: string;
@@ -14,7 +16,7 @@ type FormItemLabelProps = {
   required?: boolean;
 };
 
-const FormItemLabel: React.FC<FormItemLabelProps> = props => {
+export const FormItemLabel: FC<FormItemLabelProps> = props => {
   const {status, text, tooltipMessage, required} = props;
 
   return (
@@ -31,5 +33,3 @@ const FormItemLabel: React.FC<FormItemLabelProps> = props => {
     </>
   );
 };
-
-export default FormItemLabel;
diff --git a/src/components/custom-antd/Form/FormItem/index.ts b/src/components/custom-antd/Form/FormItem/index.ts
deleted file mode 100644
index 7ceb42b06..000000000
--- a/src/components/custom-antd/Form/FormItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './FormItem';
diff --git a/src/components/custom-antd/Form/FormRow/FormRow.styled.tsx b/src/components/custom-antd/Form/FormRow.styled.tsx
similarity index 100%
rename from src/components/custom-antd/Form/FormRow/FormRow.styled.tsx
rename to src/components/custom-antd/Form/FormRow.styled.tsx
diff --git a/src/components/custom-antd/Form/FormRow/FormRow.tsx b/src/components/custom-antd/Form/FormRow.tsx
similarity index 58%
rename from src/components/custom-antd/Form/FormRow/FormRow.tsx
rename to src/components/custom-antd/Form/FormRow.tsx
index c35ce4d1c..80983f9ed 100644
--- a/src/components/custom-antd/Form/FormRow/FormRow.tsx
+++ b/src/components/custom-antd/Form/FormRow.tsx
@@ -1,4 +1,4 @@
-import {PropsWithChildren} from 'react';
+import {FC, PropsWithChildren} from 'react';
 
 import {FormRowWrapper} from './FormRow.styled';
 
@@ -6,8 +6,6 @@ type FormRowProps = {
   justify?: 'start' | 'end' | 'center' | 'space-between' | 'space-around';
 };
 
-const FormRow: React.FC<PropsWithChildren<FormRowProps>> = ({children, justify = 'start'}) => {
+export const FormRow: FC<PropsWithChildren<FormRowProps>> = ({children, justify = 'start'}) => {
   return <FormRowWrapper $justify={justify}>{children}</FormRowWrapper>;
 };
-
-export default FormRow;
diff --git a/src/components/custom-antd/Form/FormRow/index.ts b/src/components/custom-antd/Form/FormRow/index.ts
deleted file mode 100644
index 843a4e92f..000000000
--- a/src/components/custom-antd/Form/FormRow/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './FormRow';
diff --git a/src/components/custom-antd/FullWidthSpace/FullWidthSpace.styled.tsx b/src/components/custom-antd/FullWidthSpace.styled.tsx
similarity index 100%
rename from src/components/custom-antd/FullWidthSpace/FullWidthSpace.styled.tsx
rename to src/components/custom-antd/FullWidthSpace.styled.tsx
diff --git a/src/components/custom-antd/FullWidthSpace/FullWidthSpace.tsx b/src/components/custom-antd/FullWidthSpace.tsx
similarity index 65%
rename from src/components/custom-antd/FullWidthSpace/FullWidthSpace.tsx
rename to src/components/custom-antd/FullWidthSpace.tsx
index 9a3e54273..ae7ea3fd8 100644
--- a/src/components/custom-antd/FullWidthSpace/FullWidthSpace.tsx
+++ b/src/components/custom-antd/FullWidthSpace.tsx
@@ -1,9 +1,9 @@
+import {FC} from 'react';
+
 import {FullWidthSpaceProps, StyledSpace} from './FullWidthSpace.styled';
 
-const FullWidthSpace: React.FC<FullWidthSpaceProps> = props => {
+export const FullWidthSpace: FC<FullWidthSpaceProps> = props => {
   const {justify = 'flex-start', ...rest} = props;
 
   return <StyledSpace $justify={justify} {...rest} />;
 };
-
-export default FullWidthSpace;
diff --git a/src/components/custom-antd/FullWidthSpace/index.ts b/src/components/custom-antd/FullWidthSpace/index.ts
deleted file mode 100644
index 97a2e2e40..000000000
--- a/src/components/custom-antd/FullWidthSpace/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './FullWidthSpace';
diff --git a/src/components/custom-antd/Input/Input.styled.tsx b/src/components/custom-antd/Input.styled.tsx
similarity index 100%
rename from src/components/custom-antd/Input/Input.styled.tsx
rename to src/components/custom-antd/Input.styled.tsx
diff --git a/src/components/custom-antd/Input/Input.tsx b/src/components/custom-antd/Input.tsx
similarity index 60%
rename from src/components/custom-antd/Input/Input.tsx
rename to src/components/custom-antd/Input.tsx
index 98421b9b2..1b06b01c8 100644
--- a/src/components/custom-antd/Input/Input.tsx
+++ b/src/components/custom-antd/Input.tsx
@@ -1,7 +1,7 @@
+import {FC} from 'react';
+
 import {AntdCustomStyledInput, ICustomInputProps} from './Input.styled';
 
-const Input: React.FC<ICustomInputProps> = props => {
+export const Input: FC<ICustomInputProps> = props => {
   return <AntdCustomStyledInput {...props} />;
 };
-
-export default Input;
diff --git a/src/components/custom-antd/Input/index.ts b/src/components/custom-antd/Input/index.ts
deleted file mode 100644
index e0c591f92..000000000
--- a/src/components/custom-antd/Input/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Input';
diff --git a/src/components/custom-antd/Modal/Modal.styled.tsx b/src/components/custom-antd/Modal.styled.tsx
similarity index 93%
rename from src/components/custom-antd/Modal/Modal.styled.tsx
rename to src/components/custom-antd/Modal.styled.tsx
index 94d21a0ff..1ae0cbc93 100644
--- a/src/components/custom-antd/Modal/Modal.styled.tsx
+++ b/src/components/custom-antd/Modal.styled.tsx
@@ -2,7 +2,7 @@ import {Modal} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledModal = styled(Modal)`
   .ant-modal-content {
diff --git a/src/components/custom-antd/Modal/Modal.tsx b/src/components/custom-antd/Modal.tsx
similarity index 84%
rename from src/components/custom-antd/Modal/Modal.tsx
rename to src/components/custom-antd/Modal.tsx
index de14ad536..62ae47e56 100644
--- a/src/components/custom-antd/Modal/Modal.tsx
+++ b/src/components/custom-antd/Modal.tsx
@@ -1,4 +1,4 @@
-import {cloneElement} from 'react';
+import {FC, ReactNode, cloneElement} from 'react';
 
 import {CloseOutlined} from '@ant-design/icons';
 
@@ -7,15 +7,15 @@ import {StyledModal} from './Modal.styled';
 export type ModalProps = {
   title: string;
   width?: number;
-  footer?: React.ReactNode;
-  content: React.ReactNode;
+  footer?: ReactNode;
+  content: ReactNode;
   isModalVisible: boolean;
   setIsModalVisible: (flag: boolean) => void;
   dataTestModalRoot?: string;
   dataTestCloseBtn?: string;
 };
 
-const CustomModal: React.FC<ModalProps> = props => {
+export const CustomModal: FC<ModalProps> = props => {
   const {
     setIsModalVisible,
     isModalVisible,
@@ -48,5 +48,3 @@ const CustomModal: React.FC<ModalProps> = props => {
     </StyledModal>
   );
 };
-
-export default CustomModal;
diff --git a/src/components/custom-antd/Modal/index.ts b/src/components/custom-antd/Modal/index.ts
deleted file mode 100644
index fb26d37b3..000000000
--- a/src/components/custom-antd/Modal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Modal';
diff --git a/src/components/custom-antd/Skeleton/Skeleton.styled.tsx b/src/components/custom-antd/Skeleton.styled.tsx
similarity index 97%
rename from src/components/custom-antd/Skeleton/Skeleton.styled.tsx
rename to src/components/custom-antd/Skeleton.styled.tsx
index 5d1667ed3..359d07651 100644
--- a/src/components/custom-antd/Skeleton/Skeleton.styled.tsx
+++ b/src/components/custom-antd/Skeleton.styled.tsx
@@ -2,7 +2,7 @@ import {Skeleton} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export type AdditionalSkeletonStyles = {
   lineHeight?: number;
diff --git a/src/components/custom-antd/Skeleton/Skeleton.tsx b/src/components/custom-antd/Skeleton.tsx
similarity index 85%
rename from src/components/custom-antd/Skeleton/Skeleton.tsx
rename to src/components/custom-antd/Skeleton.tsx
index c53e96331..310606cc9 100644
--- a/src/components/custom-antd/Skeleton/Skeleton.tsx
+++ b/src/components/custom-antd/Skeleton.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {SkeletonProps as AntdSkeletonProps} from 'antd';
 
 import {AdditionalSkeletonStyles, StyledSkeleton} from './Skeleton.styled';
@@ -6,7 +8,7 @@ type CustomAntdSkeletonProps = {
   additionalStyles?: AdditionalSkeletonStyles;
 };
 
-const Skeleton: React.FC<AntdSkeletonProps & CustomAntdSkeletonProps> = props => {
+export const Skeleton: FC<AntdSkeletonProps & CustomAntdSkeletonProps> = props => {
   const {children, active = true, title = false, paragraph = {rows: 1, width: '100%'}} = props;
 
   if (children) {
@@ -21,5 +23,3 @@ const Skeleton: React.FC<AntdSkeletonProps & CustomAntdSkeletonProps> = props =>
     <StyledSkeleton className="testkube-skeleton" active={active} title={title} paragraph={paragraph} {...props} />
   );
 };
-
-export default Skeleton;
diff --git a/src/components/custom-antd/Skeleton/index.ts b/src/components/custom-antd/Skeleton/index.ts
deleted file mode 100644
index 0e919b5d6..000000000
--- a/src/components/custom-antd/Skeleton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Skeleton';
diff --git a/src/components/custom-antd/Typography/Text/Text.styled.tsx b/src/components/custom-antd/Typography/Text.styled.tsx
similarity index 100%
rename from src/components/custom-antd/Typography/Text/Text.styled.tsx
rename to src/components/custom-antd/Typography/Text.styled.tsx
diff --git a/src/components/custom-antd/Typography/Text/Text.tsx b/src/components/custom-antd/Typography/Text.tsx
similarity index 81%
rename from src/components/custom-antd/Typography/Text/Text.tsx
rename to src/components/custom-antd/Typography/Text.tsx
index a7e82a286..69e2cf63d 100644
--- a/src/components/custom-antd/Typography/Text/Text.tsx
+++ b/src/components/custom-antd/Typography/Text.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {TextProps as AntdTextProps} from 'antd/lib/typography/Text';
 import {TypographyProps as AntTypographyProps} from 'antd/lib/typography/Typography';
 
@@ -7,7 +9,7 @@ type TextProps = {
   color?: string;
 };
 
-const Text: React.FC<AntTypographyProps<any> & AntdTextProps & TextProps> = props => {
+export const Text: FC<AntTypographyProps<any> & AntdTextProps & TextProps> = props => {
   const {children, color, className = 'regular small', ...rest} = props;
 
   const classNames = `testkube-text ${className}`;
@@ -18,5 +20,3 @@ const Text: React.FC<AntTypographyProps<any> & AntdTextProps & TextProps> = prop
     </StyledText>
   );
 };
-
-export default Text;
diff --git a/src/components/custom-antd/Typography/Text/index.ts b/src/components/custom-antd/Typography/Text/index.ts
deleted file mode 100644
index 29e7c10d1..000000000
--- a/src/components/custom-antd/Typography/Text/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Text';
diff --git a/src/components/custom-antd/Typography/Title/Title.styled.tsx b/src/components/custom-antd/Typography/Title.styled.tsx
similarity index 100%
rename from src/components/custom-antd/Typography/Title/Title.styled.tsx
rename to src/components/custom-antd/Typography/Title.styled.tsx
diff --git a/src/components/custom-antd/Typography/Title/Title.tsx b/src/components/custom-antd/Typography/Title.tsx
similarity index 78%
rename from src/components/custom-antd/Typography/Title/Title.tsx
rename to src/components/custom-antd/Typography/Title.tsx
index ebe5a80e8..d6a068650 100644
--- a/src/components/custom-antd/Typography/Title/Title.tsx
+++ b/src/components/custom-antd/Typography/Title.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {TitleProps as AntdTitleProps} from 'antd/lib/typography/Title';
 import {TypographyProps as AntTypographyProps} from 'antd/lib/typography/Typography';
 
@@ -7,7 +9,7 @@ type TitleProps = {
   color?: string;
 };
 
-const Title: React.FC<AntTypographyProps<any> & AntdTitleProps & TitleProps> = props => {
+export const Title: FC<AntTypographyProps<any> & AntdTitleProps & TitleProps> = props => {
   const {children, color, ...rest} = props;
 
   return (
@@ -16,5 +18,3 @@ const Title: React.FC<AntTypographyProps<any> & AntdTitleProps & TitleProps> = p
     </StyledTitle>
   );
 };
-
-export default Title;
diff --git a/src/components/custom-antd/Typography/Title/index.ts b/src/components/custom-antd/Typography/Title/index.ts
deleted file mode 100644
index 94e414c2c..000000000
--- a/src/components/custom-antd/Typography/Title/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Title';
diff --git a/src/components/custom-antd/Upload/Upload.tsx b/src/components/custom-antd/Upload.tsx
similarity index 76%
rename from src/components/custom-antd/Upload/Upload.tsx
rename to src/components/custom-antd/Upload.tsx
index b6e1d5cdd..2f180ec21 100644
--- a/src/components/custom-antd/Upload/Upload.tsx
+++ b/src/components/custom-antd/Upload.tsx
@@ -1,11 +1,11 @@
+import {FC} from 'react';
+
 import {Upload as AntdUpload, UploadProps as AntdUploadProps, Button} from 'antd';
 
 const DefaultBrowseButton = <Button>Browse</Button>;
 
-const Upload: React.FC<AntdUploadProps> = props => {
+export const Upload: FC<AntdUploadProps> = props => {
   const {children = DefaultBrowseButton, ...rest} = props;
 
   return <AntdUpload {...rest}>{children}</AntdUpload>;
 };
-
-export default Upload;
diff --git a/src/components/custom-antd/Upload/index.ts b/src/components/custom-antd/Upload/index.ts
deleted file mode 100644
index fef46fe3b..000000000
--- a/src/components/custom-antd/Upload/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Upload';
diff --git a/src/components/custom-antd/index.ts b/src/components/custom-antd/index.ts
deleted file mode 100644
index c322ab2bd..000000000
--- a/src/components/custom-antd/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export {default as Skeleton} from './Skeleton';
-export {default as Button} from './Button';
-export {default as Title} from './Typography/Title';
-export {default as Text} from './Typography/Text';
-export {default as Input} from './Input';
-export {default as FormItem} from './Form/FormItem';
-export {default as Upload} from './Upload';
-export {default as Modal} from './Modal';
-export {default as Checkbox} from './Checkbox';
-export {default as FullWidthSpace} from './FullWidthSpace';
-export {default as FormRow} from './Form/FormRow';
-export {default as FormItemLabel} from './Form/FormItem/FormItemLabel';
-export {FormIconWrapper} from './Form/Form.styled';
diff --git a/src/components/molecules/AiInsightsTab/AiInsightsTab.styled.tsx b/src/components/molecules/AiInsightsTab.styled.tsx
similarity index 90%
rename from src/components/molecules/AiInsightsTab/AiInsightsTab.styled.tsx
rename to src/components/molecules/AiInsightsTab.styled.tsx
index 7dccfc65d..9ee96651c 100644
--- a/src/components/molecules/AiInsightsTab/AiInsightsTab.styled.tsx
+++ b/src/components/molecules/AiInsightsTab.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const AiInsightContainer = styled.div`
   width: 100%;
diff --git a/src/components/molecules/AiInsightsTab/AiInsightsTab.tsx b/src/components/molecules/AiInsightsTab.tsx
similarity index 82%
rename from src/components/molecules/AiInsightsTab/AiInsightsTab.tsx
rename to src/components/molecules/AiInsightsTab.tsx
index 2691b46dc..b30beef85 100644
--- a/src/components/molecules/AiInsightsTab/AiInsightsTab.tsx
+++ b/src/components/molecules/AiInsightsTab.tsx
@@ -1,10 +1,11 @@
 import {ReactComponent as LockedIcon} from '@assets/lockedIcon.svg';
 
-import {Button, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Execution} from '@models/execution';
+import type {Execution} from '@models/execution';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -15,7 +16,7 @@ interface AiInsightsTabProps {
   test: any;
 }
 
-const AiInsightsTab = () => {
+export const AiInsightsTab = () => {
   return (
     <AiInsightContainer>
       <AiInsightContent>
@@ -40,5 +41,3 @@ const AiInsightsTab = () => {
     </AiInsightContainer>
   );
 };
-
-export default AiInsightsTab;
diff --git a/src/components/molecules/AiInsightsTab/index.ts b/src/components/molecules/AiInsightsTab/index.ts
deleted file mode 100644
index dd2053603..000000000
--- a/src/components/molecules/AiInsightsTab/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './AiInsightsTab';
diff --git a/src/components/molecules/ArtifactsList/ArtifactsList.styled.tsx b/src/components/molecules/ArtifactsList.styled.tsx
similarity index 100%
rename from src/components/molecules/ArtifactsList/ArtifactsList.styled.tsx
rename to src/components/molecules/ArtifactsList.styled.tsx
diff --git a/src/components/molecules/ArtifactsList/ArtifactsList.tsx b/src/components/molecules/ArtifactsList.tsx
similarity index 82%
rename from src/components/molecules/ArtifactsList/ArtifactsList.tsx
rename to src/components/molecules/ArtifactsList.tsx
index 2d30ded15..3d2fd7c57 100644
--- a/src/components/molecules/ArtifactsList/ArtifactsList.tsx
+++ b/src/components/molecules/ArtifactsList.tsx
@@ -1,18 +1,20 @@
-import {useMemo, useState} from 'react';
+import {FC, useMemo, useState} from 'react';
 
-import {Button, Skeleton, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Skeleton} from '@custom-antd/Skeleton';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Artifact} from '@models/artifact';
+import type {Artifact} from '@models/artifact';
 
 import {downloadArtifactArchive} from '@services/artifacts';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {DefaultRequestError, displayDefaultErrorNotification} from '@utils/notification';
 
 import {ArtifactsListContainer} from './ArtifactsList.styled';
-import ArtifactsListItem from './ArtifactsListItem';
-import {StyledDownloadAllContainer} from './ArtifactsListItem.styled';
+import {ArtifactsListItem} from './ArtifactsList/ArtifactsListItem';
+import {StyledDownloadAllContainer} from './ArtifactsList/ArtifactsListItem.styled';
 
 type ArtifactsListProps = {
   artifacts: Artifact[];
@@ -23,7 +25,7 @@ type ArtifactsListProps = {
   startTime?: string;
 };
 
-const ArtifactsList: React.FC<ArtifactsListProps> = props => {
+export const ArtifactsList: FC<ArtifactsListProps> = props => {
   const {artifacts, testExecutionId, testName, testSuiteName, isLoading, startTime} = props;
 
   const [isDownloading, setIsDownloading] = useState(false);
@@ -85,5 +87,3 @@ const ArtifactsList: React.FC<ArtifactsListProps> = props => {
     </ArtifactsListContainer>
   );
 };
-
-export default ArtifactsList;
diff --git a/src/components/molecules/ArtifactsList/ArtifactsListItem.styled.tsx b/src/components/molecules/ArtifactsList/ArtifactsListItem.styled.tsx
index 341ae1467..261c483f5 100644
--- a/src/components/molecules/ArtifactsList/ArtifactsListItem.styled.tsx
+++ b/src/components/molecules/ArtifactsList/ArtifactsListItem.styled.tsx
@@ -3,9 +3,9 @@ import {Space} from 'antd';
 
 import styled from 'styled-components';
 
-import {Loader} from '@atoms';
+import {Loader} from '@atoms/Loader';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const ArtifactsListItemContainer = styled.li`
   padding: 10px 15px;
diff --git a/src/components/molecules/ArtifactsList/ArtifactsListItem.tsx b/src/components/molecules/ArtifactsList/ArtifactsListItem.tsx
index cb99d5eab..9a05c82c3 100644
--- a/src/components/molecules/ArtifactsList/ArtifactsListItem.tsx
+++ b/src/components/molecules/ArtifactsList/ArtifactsListItem.tsx
@@ -1,14 +1,14 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
 import {FileOutlined} from '@ant-design/icons';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Artifact} from '@models/artifact';
+import type {Artifact} from '@models/artifact';
 
 import {downloadArtifact} from '@services/artifacts';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {DefaultRequestError, displayDefaultErrorNotification} from '@utils/notification';
 
@@ -21,7 +21,7 @@ interface ArtifactsListItemProps {
   testSuiteName?: string;
 }
 
-const ArtifactsListItem: React.FC<ArtifactsListItemProps> = ({artifact, executionId, testName, testSuiteName}) => {
+export const ArtifactsListItem: FC<ArtifactsListItemProps> = ({artifact, executionId, testName, testSuiteName}) => {
   const {name} = artifact;
 
   const [isDownloading, setIsDownloading] = useState(false);
@@ -49,5 +49,3 @@ const ArtifactsListItem: React.FC<ArtifactsListItemProps> = ({artifact, executio
     </ArtifactsListItemContainer>
   );
 };
-
-export default ArtifactsListItem;
diff --git a/src/components/molecules/ArtifactsList/index.ts b/src/components/molecules/ArtifactsList/index.ts
deleted file mode 100644
index 8a0bb7087..000000000
--- a/src/components/molecules/ArtifactsList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ArtifactsList';
diff --git a/src/components/molecules/CLICommands/CLICommands.tsx b/src/components/molecules/CLICommands.tsx
similarity index 92%
rename from src/components/molecules/CLICommands/CLICommands.tsx
rename to src/components/molecules/CLICommands.tsx
index 51e768242..9b9ca8179 100644
--- a/src/components/molecules/CLICommands/CLICommands.tsx
+++ b/src/components/molecules/CLICommands.tsx
@@ -1,10 +1,10 @@
-import React, {useMemo} from 'react';
+import {FC, useMemo} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Entity} from '@models/entity';
-import {ExecutionStatusEnum} from '@models/execution';
-import {TestExecutor} from '@models/testExecutors';
+import type {Entity} from '@models/entity';
+import type {ExecutionStatusEnum} from '@models/execution';
+import type {TestExecutor} from '@models/testExecutors';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -15,7 +15,7 @@ import {useEntityDetailsPick} from '@store/entityDetails';
 
 import {useTelemetry} from '@telemetry/hooks';
 
-import CopyCommand from './CopyCommand';
+import {CopyCommand} from './CLICommands/CopyCommand';
 
 type CLIScriptModifier = 'isFinished' | 'canHaveArtifacts' | 'isRunPermission' | 'isDeletePermission';
 
@@ -110,7 +110,7 @@ const modifyActions: Record<CLIScriptModifier, (arg: boolean | string) => boolea
   },
 };
 
-const CLICommands: React.FC<CLICommandsProps> = props => {
+export const CLICommands: FC<CLICommandsProps> = props => {
   const {isExecutions, type, name, id, modifyMap, bg} = props;
   const mayRun = usePermission(Permissions.runEntity);
   const mayDelete = usePermission(Permissions.deleteEntity);
@@ -163,5 +163,3 @@ const CLICommands: React.FC<CLICommandsProps> = props => {
     </div>
   );
 };
-
-export default CLICommands;
diff --git a/src/components/molecules/CLICommands/CopyCommand.styled.tsx b/src/components/molecules/CLICommands/CopyCommand.styled.tsx
index 744b4cfac..bd94c49b0 100644
--- a/src/components/molecules/CLICommands/CopyCommand.styled.tsx
+++ b/src/components/molecules/CLICommands/CopyCommand.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const LabelWrapper = styled.div`
   margin-bottom: 12px;
diff --git a/src/components/molecules/CLICommands/CopyCommand.tsx b/src/components/molecules/CLICommands/CopyCommand.tsx
index 1ebef10ed..729947e1c 100644
--- a/src/components/molecules/CLICommands/CopyCommand.tsx
+++ b/src/components/molecules/CLICommands/CopyCommand.tsx
@@ -1,15 +1,17 @@
-import React, {useCallback, useMemo, useRef} from 'react';
+import {FC, useCallback, useMemo, useRef} from 'react';
 
-import {CopyButton, DownloadButton, Pre} from '@atoms';
+import {CopyButton} from '@atoms/CopyButton';
+import {DownloadButton} from '@atoms/DownloadButton';
+import {Pre} from '@atoms/Pre';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useLocation from '@hooks/useLocation';
-import useSecureContext from '@hooks/useSecureContext';
+import {useLocation} from '@hooks/useLocation';
+import {useSecureContext} from '@hooks/useSecureContext';
 
 import {getLiteralColor} from '@models/command';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {LabelWrapper, StyledCopyCommandCode, StyledCopyCommandContainer} from './CopyCommand.styled';
 
@@ -26,7 +28,7 @@ type CopyCommandProps = {
 };
 
 // TODO consider refactoring to a more generic component. (i.e. not specific to CLI commands)
-const CopyCommand: React.FC<CopyCommandProps> = props => {
+export const CopyCommand: FC<CopyCommandProps> = props => {
   const {
     command,
     label,
@@ -111,5 +113,3 @@ const CopyCommand: React.FC<CopyCommandProps> = props => {
     </>
   );
 };
-
-export default CopyCommand;
diff --git a/src/components/molecules/CLICommands/index.ts b/src/components/molecules/CLICommands/index.ts
deleted file mode 100644
index eafc4a106..000000000
--- a/src/components/molecules/CLICommands/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './CLICommands';
diff --git a/src/components/molecules/CommonSettings/Delete.tsx b/src/components/molecules/CommonSettings/Delete.tsx
index 7dd746b86..af9af7e53 100644
--- a/src/components/molecules/CommonSettings/Delete.tsx
+++ b/src/components/molecules/CommonSettings/Delete.tsx
@@ -5,9 +5,10 @@ import {Form} from 'antd';
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {ModalContext} from '@contexts';
+import {ModalContext} from '@contexts/ModalContext';
 
-import {ConfigurationCard, DeleteEntityModal} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {DeleteEntityModal} from '@molecules/DeleteEntityModal';
 
 interface DeleteProps {
   name: string;
@@ -17,7 +18,7 @@ interface DeleteProps {
   useDeleteMutation: UseMutation<MutationDefinition<string, any, never, void>>;
 }
 
-const Delete: FC<DeleteProps> = ({name, description, label, redirectUrl, useDeleteMutation}) => {
+export const Delete: FC<DeleteProps> = ({name, description, label, redirectUrl, useDeleteMutation}) => {
   const {setModalConfig, setModalOpen} = useContext(ModalContext);
 
   const onConfirm = () => {
@@ -49,5 +50,3 @@ const Delete: FC<DeleteProps> = ({name, description, label, redirectUrl, useDele
     </Form>
   );
 };
-
-export default Delete;
diff --git a/src/components/molecules/CommonSettings/index.ts b/src/components/molecules/CommonSettings/index.ts
deleted file mode 100644
index 26c5d950c..000000000
--- a/src/components/molecules/CommonSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default as Delete} from './Delete';
diff --git a/src/components/molecules/ConfigurationCard/ConfigurationCard.styled.tsx b/src/components/molecules/ConfigurationCard.styled.tsx
similarity index 97%
rename from src/components/molecules/ConfigurationCard/ConfigurationCard.styled.tsx
rename to src/components/molecules/ConfigurationCard.styled.tsx
index 3a289a48d..96738e816 100644
--- a/src/components/molecules/ConfigurationCard/ConfigurationCard.styled.tsx
+++ b/src/components/molecules/ConfigurationCard.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledContainer = styled.div<{isWarning?: boolean}>`
   display: flex;
diff --git a/src/components/molecules/ConfigurationCard/ConfigurationCard.tsx b/src/components/molecules/ConfigurationCard.tsx
similarity index 89%
rename from src/components/molecules/ConfigurationCard/ConfigurationCard.tsx
rename to src/components/molecules/ConfigurationCard.tsx
index f50d18360..3b48c21aa 100644
--- a/src/components/molecules/ConfigurationCard/ConfigurationCard.tsx
+++ b/src/components/molecules/ConfigurationCard.tsx
@@ -1,16 +1,15 @@
-import React, {ReactElement, useRef, useState} from 'react';
+import {FC, ReactElement, ReactNode, useRef, useState} from 'react';
 
 import {Form} from 'antd';
 
-import {Button, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {ErrorNotification, ErrorNotificationConfig} from '@models/notifications';
+import type {ErrorNotification, ErrorNotificationConfig} from '@models/notifications';
 
-import Colors from '@styles/Colors';
-
-import {NotificationContent} from '../Notification';
+import {Colors} from '@styles/Colors';
 
 import {
   HeaderAction,
@@ -24,24 +23,25 @@ import {
   StyledHeaderContainer,
   StyledNotificationContainer,
 } from './ConfigurationCard.styled';
+import {NotificationContent} from './Notification/NotificationContent';
 
 type ConfigurationCardProps = {
   title: string;
   description: string | ReactElement;
   headerAction?: ReactElement;
   isWarning?: boolean;
-  footerText?: React.ReactNode;
+  footerText?: ReactNode;
   onConfirm?: () => Promise<ErrorNotification | void> | void;
   confirmButtonText?: string;
   onCancel?: () => void;
   isButtonsDisabled?: boolean;
   forceEnableButtons?: boolean;
-  children?: React.ReactNode;
+  children?: ReactNode;
   isEditable?: boolean;
   enabled?: boolean;
 };
 
-const ConfigurationCard: React.FC<ConfigurationCardProps> = props => {
+export const ConfigurationCard: FC<ConfigurationCardProps> = props => {
   const {
     title,
     description,
@@ -151,5 +151,3 @@ const ConfigurationCard: React.FC<ConfigurationCardProps> = props => {
     </StyledContainer>
   );
 };
-
-export default ConfigurationCard;
diff --git a/src/components/molecules/ConfigurationCard/index.ts b/src/components/molecules/ConfigurationCard/index.ts
deleted file mode 100644
index 68aecfe1d..000000000
--- a/src/components/molecules/ConfigurationCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ConfigurationCard';
diff --git a/src/components/molecules/Definition/Definition.tsx b/src/components/molecules/Definition.tsx
similarity index 84%
rename from src/components/molecules/Definition/Definition.tsx
rename to src/components/molecules/Definition.tsx
index bb32126fd..fb9100436 100644
--- a/src/components/molecules/Definition/Definition.tsx
+++ b/src/components/molecules/Definition.tsx
@@ -1,4 +1,4 @@
-import React, {PropsWithChildren, Suspense, useContext, useEffect, useState} from 'react';
+import {FC, PropsWithChildren, Suspense, useContext, useEffect, useState} from 'react';
 
 import {Form} from 'antd';
 
@@ -8,21 +8,21 @@ import {UseMutation, UseQuery} from '@reduxjs/toolkit/dist/query/react/buildHook
 import {JSONSchema4} from 'json-schema';
 import {capitalize} from 'lodash';
 
-import {Pre} from '@atoms';
+import {Pre} from '@atoms/Pre';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {FullWidthSpace} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import useClusterVersionMatch from '@hooks/useClusterVersionMatch';
-
-import {ConfigurationCard, InlineNotification, notificationCall} from '@molecules';
+import {useClusterVersionMatch} from '@hooks/useClusterVersionMatch';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import KubernetesResourceEditor from '../KubernetesResourceEditor';
-
-import DefinitionSkeleton from './DefinitionSkeleton';
+import {ConfigurationCard} from './ConfigurationCard';
+import {DefinitionSkeleton} from './Definition/DefinitionSkeleton';
+import {InlineNotification} from './InlineNotification';
+import {KubernetesResourceEditor} from './KubernetesResourceEditor';
+import {notificationCall} from './Notification';
 
 type DefinitionProps = {
   useGetDefinitionQuery: UseQuery<QueryDefinition<any, any, any, any, any>>;
@@ -34,7 +34,7 @@ type DefinitionProps = {
   overrideSchema?: (schema: JSONSchema4) => JSONSchema4;
 };
 
-const Definition: React.FC<PropsWithChildren<DefinitionProps>> = props => {
+export const Definition: FC<PropsWithChildren<DefinitionProps>> = props => {
   const {name, onUpdate, useGetDefinitionQuery, useUpdateDefinitionMutation, crdUrl, label, overrideSchema} = props;
 
   const {isClusterAvailable} = useContext(MainContext);
@@ -141,5 +141,3 @@ const Definition: React.FC<PropsWithChildren<DefinitionProps>> = props => {
     </FullWidthSpace>
   );
 };
-
-export default Definition;
diff --git a/src/components/molecules/Definition/DefinitionSkeleton.tsx b/src/components/molecules/Definition/DefinitionSkeleton.tsx
index 0f93fd128..7e1fc00eb 100644
--- a/src/components/molecules/Definition/DefinitionSkeleton.tsx
+++ b/src/components/molecules/Definition/DefinitionSkeleton.tsx
@@ -1,8 +1,8 @@
 import {lineHeight} from '@atoms/MonacoEditor';
 
-import {Skeleton} from '@custom-antd';
+import {Skeleton} from '@custom-antd/Skeleton';
 
-const DefinitionSkeleton = () => {
+export const DefinitionSkeleton = () => {
   return (
     <>
       <Skeleton additionalStyles={{lineHeight}} paragraph={{rows: 1, width: 400}} />
@@ -15,5 +15,3 @@ const DefinitionSkeleton = () => {
     </>
   );
 };
-
-export default DefinitionSkeleton;
diff --git a/src/components/molecules/Definition/index.ts b/src/components/molecules/Definition/index.ts
deleted file mode 100644
index d9773a0dd..000000000
--- a/src/components/molecules/Definition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Definition';
diff --git a/src/components/molecules/DeleteEntityModal/DeleteEntityModal.styled.tsx b/src/components/molecules/DeleteEntityModal.styled.tsx
similarity index 100%
rename from src/components/molecules/DeleteEntityModal/DeleteEntityModal.styled.tsx
rename to src/components/molecules/DeleteEntityModal.styled.tsx
diff --git a/src/components/molecules/DeleteEntityModal/DeleteEntityModal.tsx b/src/components/molecules/DeleteEntityModal.tsx
similarity index 85%
rename from src/components/molecules/DeleteEntityModal/DeleteEntityModal.tsx
rename to src/components/molecules/DeleteEntityModal.tsx
index cb7fd1761..ddd7c408f 100644
--- a/src/components/molecules/DeleteEntityModal/DeleteEntityModal.tsx
+++ b/src/components/molecules/DeleteEntityModal.tsx
@@ -1,4 +1,4 @@
-import {useContext, useState} from 'react';
+import {FC, useContext, useState} from 'react';
 
 import {Input} from 'antd';
 
@@ -7,23 +7,24 @@ import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 
 import {capitalize} from 'lodash';
 
-import {ModalContext} from '@contexts';
+import {ModalContext} from '@contexts/ModalContext';
 
-import {Button, FullWidthSpace, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import usePressEnter from '@hooks/usePressEnter';
+import {usePressEnter} from '@hooks/usePressEnter';
 
-import {notificationCall} from '@molecules';
-
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
 import {FooterSpace} from './DeleteEntityModal.styled';
+import {notificationCall} from './Notification';
 
 // TODO: refactor using DeleteModal
-const DeleteEntityModal: React.FC<{
+export const DeleteEntityModal: FC<{
   // onCancel is passed from parent component <Modal />.
   // Do not pass it directly
   onCancel?: any;
@@ -100,5 +101,3 @@ const DeleteEntityModal: React.FC<{
     </FullWidthSpace>
   );
 };
-
-export default DeleteEntityModal;
diff --git a/src/components/molecules/DeleteEntityModal/index.ts b/src/components/molecules/DeleteEntityModal/index.ts
deleted file mode 100644
index 200205108..000000000
--- a/src/components/molecules/DeleteEntityModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './DeleteEntityModal';
diff --git a/src/components/molecules/DotsDropdown/DotsDropdown.styled.tsx b/src/components/molecules/DotsDropdown.styled.tsx
similarity index 100%
rename from src/components/molecules/DotsDropdown/DotsDropdown.styled.tsx
rename to src/components/molecules/DotsDropdown.styled.tsx
diff --git a/src/components/molecules/DotsDropdown/DotsDropdown.tsx b/src/components/molecules/DotsDropdown.tsx
similarity index 82%
rename from src/components/molecules/DotsDropdown/DotsDropdown.tsx
rename to src/components/molecules/DotsDropdown.tsx
index 40b18b992..eedf27836 100644
--- a/src/components/molecules/DotsDropdown/DotsDropdown.tsx
+++ b/src/components/molecules/DotsDropdown.tsx
@@ -1,9 +1,11 @@
+import {CSSProperties, FC} from 'react';
+
 import {Dropdown} from 'antd';
 import {ItemType} from 'antd/lib/menu/hooks/useItems';
 
-import {Dots} from '@atoms';
+import {Dots} from '@atoms/Dots';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {DotsWrapper} from './DotsDropdown.styled';
 
@@ -20,12 +22,12 @@ interface DotsDropdownProps {
     | 'bottomRight'
     | undefined;
   withPadding?: boolean;
-  wrapperStyle?: React.CSSProperties;
+  wrapperStyle?: CSSProperties;
   trigger?: ('click' | 'hover' | 'contextMenu')[];
   overlayClassName?: string;
 }
 
-const DotsDropdown: React.FC<DotsDropdownProps> = ({
+export const DotsDropdown: FC<DotsDropdownProps> = ({
   items,
   placement = 'bottom',
   withPadding = true,
@@ -48,5 +50,3 @@ const DotsDropdown: React.FC<DotsDropdownProps> = ({
     </Dropdown>
   );
 };
-
-export default DotsDropdown;
diff --git a/src/components/molecules/DotsDropdown/index.ts b/src/components/molecules/DotsDropdown/index.ts
deleted file mode 100644
index c2389f566..000000000
--- a/src/components/molecules/DotsDropdown/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './DotsDropdown';
diff --git a/src/components/molecules/EmptyListContent/EmptyListContent.styled.tsx b/src/components/molecules/EmptyListContent.styled.tsx
similarity index 100%
rename from src/components/molecules/EmptyListContent/EmptyListContent.styled.tsx
rename to src/components/molecules/EmptyListContent.styled.tsx
diff --git a/src/components/molecules/EmptyListContent/EmptyListContent.tsx b/src/components/molecules/EmptyListContent.tsx
similarity index 80%
rename from src/components/molecules/EmptyListContent/EmptyListContent.tsx
rename to src/components/molecules/EmptyListContent.tsx
index 7e1234e87..cfe8278b1 100644
--- a/src/components/molecules/EmptyListContent/EmptyListContent.tsx
+++ b/src/components/molecules/EmptyListContent.tsx
@@ -1,21 +1,23 @@
-import {PropsWithChildren, ReactElement, useContext} from 'react';
+import {FC, PropsWithChildren, ReactElement, useContext} from 'react';
 
 import {ReactComponent as CreateTestIcon} from '@assets/create-test.svg';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {ConfigContext, MainContext} from '@contexts';
+import {ConfigContext} from '@contexts/ConfigContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, Text, Title} from '@custom-antd';
-
-import {HelpCard} from '@molecules';
-import {StyledHelpCardsContainer, StyledLastHelpCardContainer} from '@molecules/HelpCard/HelpCard.styled';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
+import {Title} from '@custom-antd/Typography/Title';
 
 import {Permissions, usePermission} from '@permissions/base';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {StyledEmptyListContainer} from './EmptyListContent.styled';
+import {HelpCard} from './HelpCard';
+import {StyledHelpCardsContainer, StyledLastHelpCardContainer} from './HelpCard.styled';
 
 type EmptyListContentProps = {
   title: string;
@@ -32,7 +34,7 @@ const actionTypeToPermission: Record<EmptyListContentProps['actionType'], Permis
   run: Permissions.runEntity,
 };
 
-const EmptyListContent: React.FC<PropsWithChildren<EmptyListContentProps>> = props => {
+export const EmptyListContent: FC<PropsWithChildren<EmptyListContentProps>> = props => {
   const {
     title,
     description,
@@ -82,5 +84,3 @@ const EmptyListContent: React.FC<PropsWithChildren<EmptyListContentProps>> = pro
     </StyledEmptyListContainer>
   );
 };
-
-export default EmptyListContent;
diff --git a/src/components/molecules/EmptyListContent/index.ts b/src/components/molecules/EmptyListContent/index.ts
deleted file mode 100644
index a2cc1dfda..000000000
--- a/src/components/molecules/EmptyListContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EmptyListContent';
diff --git a/src/components/molecules/EndpointModal/EndpointModal.styled.tsx b/src/components/molecules/EndpointModal.styled.tsx
similarity index 100%
rename from src/components/molecules/EndpointModal/EndpointModal.styled.tsx
rename to src/components/molecules/EndpointModal.styled.tsx
diff --git a/src/components/molecules/EndpointModal/EndpointModal.tsx b/src/components/molecules/EndpointModal.tsx
similarity index 81%
rename from src/components/molecules/EndpointModal/EndpointModal.tsx
rename to src/components/molecules/EndpointModal.tsx
index 83fb19bdb..5ace2213c 100644
--- a/src/components/molecules/EndpointModal/EndpointModal.tsx
+++ b/src/components/molecules/EndpointModal.tsx
@@ -1,25 +1,28 @@
-import React, {useEffect, useState} from 'react';
+import {FC, FormEvent, useEffect, useState} from 'react';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {Button, FullWidthSpace, Input, Modal, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Input} from '@custom-antd/Input';
+import {CustomModal as Modal} from '@custom-antd/Modal';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useApiEndpoint, useUpdateApiEndpoint} from '@services/apiEndpoint';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 
-import notificationCall from '../Notification/Notification';
-
 import {StyledSearchUrlForm} from './EndpointModal.styled';
+import {notificationCall} from './Notification';
 
 type EndpointModalProps = {
   setModalState: (isVisible: boolean) => void;
   visible: boolean;
 };
 
-const EndpointModal: React.FC<EndpointModalProps> = props => {
+export const EndpointModal: FC<EndpointModalProps> = props => {
   const {setModalState, visible} = props;
 
   const currentApiEndpoint = useApiEndpoint();
@@ -28,7 +31,7 @@ const EndpointModal: React.FC<EndpointModalProps> = props => {
   const [value, setValue] = useState(currentApiEndpoint || '');
   const [isLoading, setLoading] = useState(false);
 
-  const updateEndpoint = async (event: React.FormEvent) => {
+  const updateEndpoint = async (event: FormEvent) => {
     event.preventDefault();
 
     setLoading(true);
@@ -93,5 +96,3 @@ const EndpointModal: React.FC<EndpointModalProps> = props => {
     />
   );
 };
-
-export default EndpointModal;
diff --git a/src/components/molecules/EndpointModal/index.ts b/src/components/molecules/EndpointModal/index.ts
deleted file mode 100644
index b033d6d90..000000000
--- a/src/components/molecules/EndpointModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EndpointModal';
diff --git a/src/components/molecules/EntityGrid/EntityGrid.styled.tsx b/src/components/molecules/EntityGrid.styled.tsx
similarity index 98%
rename from src/components/molecules/EntityGrid/EntityGrid.styled.tsx
rename to src/components/molecules/EntityGrid.styled.tsx
index d467c5819..94d070277 100644
--- a/src/components/molecules/EntityGrid/EntityGrid.styled.tsx
+++ b/src/components/molecules/EntityGrid.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
 export const StyledEntityGrid = styled.div<{$columns?: number; $itemWidth: number}>`
diff --git a/src/components/molecules/EntityGrid/EntityGrid.tsx b/src/components/molecules/EntityGrid.tsx
similarity index 88%
rename from src/components/molecules/EntityGrid/EntityGrid.tsx
rename to src/components/molecules/EntityGrid.tsx
index 7b823b2b0..4ee8fc92a 100644
--- a/src/components/molecules/EntityGrid/EntityGrid.tsx
+++ b/src/components/molecules/EntityGrid.tsx
@@ -2,11 +2,11 @@ import React, {FC, ReactElement, memo, useMemo} from 'react';
 
 import {get as getIn} from 'lodash';
 
-import {ScrollTrigger} from '@atoms';
+import {ScrollTrigger} from '@atoms/ScrollTrigger';
 
 import {StyledEntityGrid} from './EntityGrid.styled';
-import EntityGridLoader from './EntityGridLoader';
-import EntityGridSkeleton from './EntityGridSkeleton';
+import {EntityGridLoader} from './EntityGrid/EntityGridLoader';
+import {EntityGridSkeleton} from './EntityGrid/EntityGridSkeleton';
 
 type OptionalProp<T, U extends keyof T> = Omit<T, U> & Partial<Pick<T, U>>;
 
@@ -80,4 +80,4 @@ function EntityGridBase<T extends {item: any}>(props: EntityGridProps<T>): React
 }
 
 // Must be cast back, so generics will work
-export default memo(EntityGridBase) as typeof EntityGridBase;
+export const EntityGrid = memo(EntityGridBase) as typeof EntityGridBase;
diff --git a/src/components/molecules/EntityGrid/EntityGridItemExecutionTime.tsx b/src/components/molecules/EntityGrid/EntityGridItemExecutionTime.tsx
index 12bf42579..1294921e1 100644
--- a/src/components/molecules/EntityGrid/EntityGridItemExecutionTime.tsx
+++ b/src/components/molecules/EntityGrid/EntityGridItemExecutionTime.tsx
@@ -3,9 +3,9 @@ import {useInterval, useUpdate} from 'react-use';
 
 import {Tooltip} from 'antd';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {displayTimeBetweenDates} from '@utils/displayTimeBetweenDates';
 import {formatExecutionDate} from '@utils/formatDate';
@@ -23,7 +23,7 @@ const TimeAgo: FC<{time: Date | number | string}> = ({time}) => {
   return <>{displayTimeBetweenDates(now, then).long}</>;
 };
 
-const EntityGridItemExecutionTime: FC<{time?: Date | number | string}> = ({time}) => (
+export const EntityGridItemExecutionTime: FC<{time?: Date | number | string}> = memo(({time}) => (
   <Tooltip
     title={time ? formatExecutionDate(new Date(time)) : null}
     placement="bottomRight"
@@ -34,6 +34,4 @@ const EntityGridItemExecutionTime: FC<{time?: Date | number | string}> = ({time}
       {time ? <TimeAgo time={time} /> : null}
     </Text>
   </Tooltip>
-);
-
-export default memo(EntityGridItemExecutionTime);
+));
diff --git a/src/components/molecules/EntityGrid/EntityGridItemPure.tsx b/src/components/molecules/EntityGrid/EntityGridItemPure.tsx
index a91a5cd43..c5f37f0f4 100644
--- a/src/components/molecules/EntityGrid/EntityGridItemPure.tsx
+++ b/src/components/molecules/EntityGrid/EntityGridItemPure.tsx
@@ -1,21 +1,17 @@
-import React, {FC, forwardRef, memo, useCallback} from 'react';
+import {FC, MouseEvent, forwardRef, memo, useCallback} from 'react';
 
-import {ExecutorIcon, StatusIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
+import {StatusIcon} from '@atoms/StatusIcon';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useExecutorIcon from '@hooks/useExecutorIcon';
+import {useExecutorIcon} from '@hooks/useExecutorIcon';
 
 import type {Execution} from '@models/execution';
 import type {ExecutionMetrics} from '@models/metrics';
 import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
-import {DotsDropdown, LabelsList, MetricsBarChart} from '@molecules';
-
-import Colors from '@styles/Colors';
-
-import {formatDuration} from '@utils/formatDate';
-
+import {DotsDropdown} from '@molecules/DotsDropdown';
 import {
   DetailsWrapper,
   ExecutionTimeItemColumn,
@@ -24,8 +20,15 @@ import {
   ItemWrapper,
   RowsWrapper,
   StyledMetricItem,
-} from './EntityGrid.styled';
-import EntityGridItemExecutionTime from './EntityGridItemExecutionTime';
+} from '@molecules/EntityGrid.styled';
+import {LabelsList} from '@molecules/LabelsList';
+import {MetricsBarChart} from '@molecules/MetricsBarChart';
+
+import {Colors} from '@styles/Colors';
+
+import {formatDuration} from '@utils/formatDate';
+
+import {EntityGridItemExecutionTime} from './EntityGridItemExecutionTime';
 
 export interface Item {
   type?: string;
@@ -56,86 +59,86 @@ const EntityGridItemTestIcon: FC<{item: Item}> = memo(({item}) => {
 
 const isRunningStatus = (status: string) => ['running', 'queued'].includes(status);
 
-const EntityGridItemPure = forwardRef<HTMLDivElement, EntityGridItemPureProps>((props, ref) => {
-  const {item, latestExecution, onClick, onAbort, dataTest, metrics} = props;
-
-  const status =
-    (latestExecution as Execution)?.executionResult?.status ||
-    (latestExecution as TestSuiteExecution)?.status ||
-    'pending';
-  const executions = metrics?.executions;
-  const isRunning = isRunningStatus(status) || executions?.some(execution => isRunningStatus(execution.status));
-
-  const click = useCallback(() => {
-    onClick(item);
-  }, [onClick, item]);
-
-  const abort = useCallback(
-    (event: React.MouseEvent<HTMLSpanElement>) => {
-      event.stopPropagation();
-      onAbort(item);
-    },
-    [onAbort, item]
-  );
-
-  return (
-    <ItemWrapper onClick={click} ref={ref} data-test={dataTest}>
-      <DetailsWrapper>
-        <ItemRow $flex={0}>
-          <ItemColumn $isStretch>
-            <StatusIcon status={status} />
-            <EntityGridItemTestIcon item={item} />
-            <div style={{overflow: 'hidden', flex: 1, display: 'flex'}}>
-              <Text className="regular big" ellipsis title={item.name}>
-                {item.name}
-              </Text>
-            </div>
-          </ItemColumn>
-          <ExecutionTimeItemColumn>
-            <EntityGridItemExecutionTime time={latestExecution?.startTime} />
-            {isRunning ? (
-              <DotsDropdown
-                placement="bottomRight"
-                items={[{key: 1, label: <span onClick={abort}>Abort all executions</span>}]}
-              />
-            ) : null}
-          </ExecutionTimeItemColumn>
-        </ItemRow>
-        <RowsWrapper>
-          <ItemRow $flex={1}>
-            {item.labels ? <LabelsList labels={item.labels} shouldSkipLabels howManyLabelsToShow={2} /> : null}
-          </ItemRow>
-          <ItemRow $flex={1}>
-            <StyledMetricItem>
-              <Text className="small uppercase" color={Colors.slate500}>
-                pass/fail ratio
-              </Text>
-              <Text className="big regular">
-                {metrics?.passFailRatio ? `${metrics?.passFailRatio.toFixed(2)}%` : '0%'}
-              </Text>
-            </StyledMetricItem>
-            <StyledMetricItem>
-              <Text className="small uppercase" color={Colors.slate500}>
-                p50
-              </Text>
-              <Text className="big regular">
-                {metrics?.executionDurationP50ms ? formatDuration(metrics?.executionDurationP50ms / 1000) : '-'}
-              </Text>
-            </StyledMetricItem>
-            <StyledMetricItem>
-              <Text className="small uppercase" color={Colors.slate500}>
-                failed executions
-              </Text>
-              <Text className="big regular">{metrics?.failedExecutions || '-'}</Text>
-            </StyledMetricItem>
-            <StyledMetricItem>
-              <MetricsBarChart data={executions} chartHeight={38} barWidth={6} />
-            </StyledMetricItem>
+export const EntityGridItemPure = memo(
+  forwardRef<HTMLDivElement, EntityGridItemPureProps>((props, ref) => {
+    const {item, latestExecution, onClick, onAbort, dataTest, metrics} = props;
+
+    const status =
+      (latestExecution as Execution)?.executionResult?.status ||
+      (latestExecution as TestSuiteExecution)?.status ||
+      'pending';
+    const executions = metrics?.executions;
+    const isRunning = isRunningStatus(status) || executions?.some(execution => isRunningStatus(execution.status));
+
+    const click = useCallback(() => {
+      onClick(item);
+    }, [onClick, item]);
+
+    const abort = useCallback(
+      (event: MouseEvent<HTMLSpanElement>) => {
+        event.stopPropagation();
+        onAbort(item);
+      },
+      [onAbort, item]
+    );
+
+    return (
+      <ItemWrapper onClick={click} ref={ref} data-test={dataTest}>
+        <DetailsWrapper>
+          <ItemRow $flex={0}>
+            <ItemColumn $isStretch>
+              <StatusIcon status={status} />
+              <EntityGridItemTestIcon item={item} />
+              <div style={{overflow: 'hidden', flex: 1, display: 'flex'}}>
+                <Text className="regular big" ellipsis title={item.name}>
+                  {item.name}
+                </Text>
+              </div>
+            </ItemColumn>
+            <ExecutionTimeItemColumn>
+              <EntityGridItemExecutionTime time={latestExecution?.startTime} />
+              {isRunning ? (
+                <DotsDropdown
+                  placement="bottomRight"
+                  items={[{key: 1, label: <span onClick={abort}>Abort all executions</span>}]}
+                />
+              ) : null}
+            </ExecutionTimeItemColumn>
           </ItemRow>
-        </RowsWrapper>
-      </DetailsWrapper>
-    </ItemWrapper>
-  );
-});
-
-export default memo(EntityGridItemPure);
+          <RowsWrapper>
+            <ItemRow $flex={1}>
+              {item.labels ? <LabelsList labels={item.labels} shouldSkipLabels howManyLabelsToShow={2} /> : null}
+            </ItemRow>
+            <ItemRow $flex={1}>
+              <StyledMetricItem>
+                <Text className="small uppercase" color={Colors.slate500}>
+                  pass/fail ratio
+                </Text>
+                <Text className="big regular">
+                  {metrics?.passFailRatio ? `${metrics?.passFailRatio.toFixed(2)}%` : '0%'}
+                </Text>
+              </StyledMetricItem>
+              <StyledMetricItem>
+                <Text className="small uppercase" color={Colors.slate500}>
+                  p50
+                </Text>
+                <Text className="big regular">
+                  {metrics?.executionDurationP50ms ? formatDuration(metrics?.executionDurationP50ms / 1000) : '-'}
+                </Text>
+              </StyledMetricItem>
+              <StyledMetricItem>
+                <Text className="small uppercase" color={Colors.slate500}>
+                  failed executions
+                </Text>
+                <Text className="big regular">{metrics?.failedExecutions || '-'}</Text>
+              </StyledMetricItem>
+              <StyledMetricItem>
+                <MetricsBarChart data={executions} chartHeight={38} barWidth={6} />
+              </StyledMetricItem>
+            </ItemRow>
+          </RowsWrapper>
+        </DetailsWrapper>
+      </ItemWrapper>
+    );
+  })
+);
diff --git a/src/components/molecules/EntityGrid/EntityGridLoader.tsx b/src/components/molecules/EntityGrid/EntityGridLoader.tsx
index 9feb69e67..b835664c5 100644
--- a/src/components/molecules/EntityGrid/EntityGridLoader.tsx
+++ b/src/components/molecules/EntityGrid/EntityGridLoader.tsx
@@ -1,13 +1,11 @@
-import React, {memo} from 'react';
+import {FC, memo} from 'react';
 
 import {LoadingOutlined} from '@ant-design/icons';
 
-import {StyledEntityGridLoaderContainer} from './EntityGrid.styled';
+import {StyledEntityGridLoaderContainer} from '@molecules/EntityGrid.styled';
 
-const EntityGridLoader: React.FC = () => (
+export const EntityGridLoader: FC = memo(() => (
   <StyledEntityGridLoaderContainer>
     <LoadingOutlined />
   </StyledEntityGridLoaderContainer>
-);
-
-export default memo(EntityGridLoader);
+));
diff --git a/src/components/molecules/EntityGrid/EntityGridSkeleton.tsx b/src/components/molecules/EntityGrid/EntityGridSkeleton.tsx
index 7cd3a9ea5..6f619fdef 100644
--- a/src/components/molecules/EntityGrid/EntityGridSkeleton.tsx
+++ b/src/components/molecules/EntityGrid/EntityGridSkeleton.tsx
@@ -1,12 +1,14 @@
-import {Skeleton} from '@custom-antd';
+import {FC} from 'react';
 
-import {StyledEntityGridSkeletonWrapper} from './EntityGrid.styled';
+import {Skeleton} from '@custom-antd/Skeleton';
+
+import {StyledEntityGridSkeletonWrapper} from '@molecules/EntityGrid.styled';
 
 interface EntityGridSkeletonProps {
   height?: number;
 }
 
-const EntityGridSkeleton: React.FC<EntityGridSkeletonProps> = ({height = 120}) => {
+export const EntityGridSkeleton: FC<EntityGridSkeletonProps> = ({height = 120}) => {
   const skeletonConfig = {
     additionalStyles: {
       lineHeight: height,
@@ -23,5 +25,3 @@ const EntityGridSkeleton: React.FC<EntityGridSkeletonProps> = ({height = 120}) =
     </StyledEntityGridSkeletonWrapper>
   );
 };
-
-export default EntityGridSkeleton;
diff --git a/src/components/molecules/EntityGrid/index.ts b/src/components/molecules/EntityGrid/index.ts
deleted file mode 100644
index 79f4b6fa8..000000000
--- a/src/components/molecules/EntityGrid/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EntityGrid';
diff --git a/src/components/molecules/ExecutionName/ExecutionName.styled.tsx b/src/components/molecules/ExecutionName.styled.tsx
similarity index 81%
rename from src/components/molecules/ExecutionName/ExecutionName.styled.tsx
rename to src/components/molecules/ExecutionName.styled.tsx
index 90861aaee..c36c6f93c 100644
--- a/src/components/molecules/ExecutionName/ExecutionName.styled.tsx
+++ b/src/components/molecules/ExecutionName.styled.tsx
@@ -2,7 +2,7 @@ import {Typography} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledExecutionName = styled(Typography.Text)`
   color: ${Colors.whitePure};
diff --git a/src/components/molecules/ExecutionName/ExecutionName.tsx b/src/components/molecules/ExecutionName.tsx
similarity index 69%
rename from src/components/molecules/ExecutionName/ExecutionName.tsx
rename to src/components/molecules/ExecutionName.tsx
index 2ff702f4e..71b2586ca 100644
--- a/src/components/molecules/ExecutionName/ExecutionName.tsx
+++ b/src/components/molecules/ExecutionName.tsx
@@ -1,13 +1,13 @@
+import {FC} from 'react';
+
 import {StyledExecutionName} from './ExecutionName.styled';
 
 type ExecutionNameProps = {
   name: string;
 };
 
-const ExecutionName: React.FC<ExecutionNameProps> = props => {
+export const ExecutionName: FC<ExecutionNameProps> = props => {
   const {name} = props;
 
   return <StyledExecutionName ellipsis>{name}</StyledExecutionName>;
 };
-
-export default ExecutionName;
diff --git a/src/components/molecules/ExecutionName/index.ts b/src/components/molecules/ExecutionName/index.ts
deleted file mode 100644
index 00da4e76d..000000000
--- a/src/components/molecules/ExecutionName/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutionName';
diff --git a/src/components/molecules/ExecutionStepsList/ExecutionStepsList.styled.tsx b/src/components/molecules/ExecutionStepsList.styled.tsx
similarity index 97%
rename from src/components/molecules/ExecutionStepsList/ExecutionStepsList.styled.tsx
rename to src/components/molecules/ExecutionStepsList.styled.tsx
index f3d0c5402..eb5aeeae1 100644
--- a/src/components/molecules/ExecutionStepsList/ExecutionStepsList.styled.tsx
+++ b/src/components/molecules/ExecutionStepsList.styled.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 import {ReactComponent as ExternalLinkIcon} from '@assets/external.svg';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const ExecutionStepsListContainer = styled.ul`
   counter-reset: steps;
diff --git a/src/components/molecules/ExecutionStepsList/ExecutionStepsList.tsx b/src/components/molecules/ExecutionStepsList.tsx
similarity index 89%
rename from src/components/molecules/ExecutionStepsList/ExecutionStepsList.tsx
rename to src/components/molecules/ExecutionStepsList.tsx
index 8bff0d79c..e0f1cea71 100644
--- a/src/components/molecules/ExecutionStepsList/ExecutionStepsList.tsx
+++ b/src/components/molecules/ExecutionStepsList.tsx
@@ -4,18 +4,18 @@ import {ClockCircleOutlined} from '@ant-design/icons';
 
 import classNames from 'classnames';
 
-import {ExecutorIcon, StatusIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
+import {StatusIcon} from '@atoms/StatusIcon';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
-import {TestSuiteStepExecutionResult} from '@models/testSuite';
-
-import {ExecutionName} from '@molecules';
+import type {TestSuiteStepExecutionResult} from '@models/testSuite';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectExecutors} from '@redux/reducers/executorsSlice';
 import {getTestExecutorIcon} from '@redux/utils/executorIcon';
 
+import {ExecutionName} from './ExecutionName';
 import {
   ExecutionStepsListContainer,
   ExecutionStepsListItem,
@@ -28,7 +28,7 @@ type ExecutionStepsListProps = {
   executionSteps: TestSuiteStepExecutionResult[];
 };
 
-const ExecutionStepsList: FC<ExecutionStepsListProps> = props => {
+export const ExecutionStepsList: FC<ExecutionStepsListProps> = memo(props => {
   const {executionSteps} = props;
 
   const {navigate} = useContext(DashboardContext);
@@ -91,6 +91,4 @@ const ExecutionStepsList: FC<ExecutionStepsListProps> = props => {
   }, [executionSteps]);
 
   return <ExecutionStepsListContainer>{elements}</ExecutionStepsListContainer>;
-};
-
-export default memo(ExecutionStepsList);
+});
diff --git a/src/components/molecules/ExecutionStepsList/index.ts b/src/components/molecules/ExecutionStepsList/index.ts
deleted file mode 100644
index 7013a27a5..000000000
--- a/src/components/molecules/ExecutionStepsList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutionStepsList';
diff --git a/src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.styled.tsx b/src/components/molecules/FilterMenu/FilterMenuFooter.styled.tsx
similarity index 86%
rename from src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.styled.tsx
rename to src/components/molecules/FilterMenu/FilterMenuFooter.styled.tsx
index 8ad9fa67e..041d5ef05 100644
--- a/src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.styled.tsx
+++ b/src/components/molecules/FilterMenu/FilterMenuFooter.styled.tsx
@@ -2,7 +2,7 @@ import {Space} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledSpace = styled(Space)`
   width: 100%;
diff --git a/src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.tsx b/src/components/molecules/FilterMenu/FilterMenuFooter.tsx
similarity index 79%
rename from src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.tsx
rename to src/components/molecules/FilterMenu/FilterMenuFooter.tsx
index 98a7b6709..265dc052b 100644
--- a/src/components/molecules/FilterMenu/FilterMenuFooter/FilterMenuFooter.tsx
+++ b/src/components/molecules/FilterMenu/FilterMenuFooter.tsx
@@ -1,4 +1,6 @@
-import {Button} from '@custom-antd';
+import {FC} from 'react';
+
+import {Button} from '@custom-antd/Button';
 
 import {StyledSpace} from './FilterMenuFooter.styled';
 
@@ -8,7 +10,7 @@ type FilterMenuFooterProps = {
   onCancel?: () => void;
 };
 
-const FilterMenuFooter: React.FC<FilterMenuFooterProps> = props => {
+export const FilterMenuFooter: FC<FilterMenuFooterProps> = props => {
   const {onReset, onOk, onCancel} = props;
   return (
     <StyledSpace>
@@ -26,5 +28,3 @@ const FilterMenuFooter: React.FC<FilterMenuFooterProps> = props => {
     </StyledSpace>
   );
 };
-
-export default FilterMenuFooter;
diff --git a/src/components/molecules/FilterMenu/FilterMenuFooter/index.ts b/src/components/molecules/FilterMenu/FilterMenuFooter/index.ts
deleted file mode 100644
index 92763dde8..000000000
--- a/src/components/molecules/FilterMenu/FilterMenuFooter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './FilterMenuFooter';
diff --git a/src/components/molecules/FilterMenu/MenuFilter.styled.tsx b/src/components/molecules/FilterMenu/MenuFilter.styled.tsx
index 2537c7162..e821f4cd8 100644
--- a/src/components/molecules/FilterMenu/MenuFilter.styled.tsx
+++ b/src/components/molecules/FilterMenu/MenuFilter.styled.tsx
@@ -2,8 +2,8 @@ import {Checkbox, Dropdown, Menu} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
-import Shadows from '@styles/Shadows';
+import {Colors} from '@styles/Colors';
+import {Shadows} from '@styles/Shadows';
 
 export const StyledFilterMenu = styled(Menu)`
   border: 1px solid ${Colors.slate800};
diff --git a/src/components/molecules/FilterMenu/index.ts b/src/components/molecules/FilterMenu/index.ts
deleted file mode 100644
index 4aebe1f3e..000000000
--- a/src/components/molecules/FilterMenu/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export {
-  StyledFilterMenu,
-  StyledFilterCheckbox,
-  StyledFilterMenuItem,
-  StyledFilterDropdown,
-  AppliedFiltersNotification,
-  StyledFilterLabel,
-} from './MenuFilter.styled';
-export {default as FilterMenuFooter} from './FilterMenuFooter';
diff --git a/src/components/molecules/GitFormItems/Branch.tsx b/src/components/molecules/GitFormItems/Branch.tsx
index 4e5f20216..952845c5e 100644
--- a/src/components/molecules/GitFormItems/Branch.tsx
+++ b/src/components/molecules/GitFormItems/Branch.tsx
@@ -1,6 +1,9 @@
+import {FC} from 'react';
+
 import {Input} from 'antd';
 
-import {FormItem, FormItemLabel} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
 
 import {required} from '@utils/form';
 
@@ -11,7 +14,7 @@ type BranchProps = {
   message?: string;
 };
 
-const Branch: React.FC<BranchProps> = props => {
+export const Branch: FC<BranchProps> = props => {
   const {status = TooltipStatus.None, message} = props;
 
   return (
@@ -28,5 +31,3 @@ const Branch: React.FC<BranchProps> = props => {
     </FormItem>
   );
 };
-
-export default Branch;
diff --git a/src/components/molecules/GitFormItems/Commit.tsx b/src/components/molecules/GitFormItems/Commit.tsx
index 077a121a1..9795c8092 100644
--- a/src/components/molecules/GitFormItems/Commit.tsx
+++ b/src/components/molecules/GitFormItems/Commit.tsx
@@ -1,6 +1,9 @@
+import {FC} from 'react';
+
 import {Input} from 'antd';
 
-import {FormItem, FormItemLabel} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
 
 import {required} from '@utils/form';
 
@@ -11,7 +14,7 @@ type CommitProps = {
   message?: string;
 };
 
-const Commit: React.FC<CommitProps> = props => {
+export const Commit: FC<CommitProps> = props => {
   const {status = TooltipStatus.None, message} = props;
 
   return (
@@ -28,5 +31,3 @@ const Commit: React.FC<CommitProps> = props => {
     </FormItem>
   );
 };
-
-export default Commit;
diff --git a/src/components/molecules/GitFormItems/Path.tsx b/src/components/molecules/GitFormItems/Path.tsx
index 5628a0bce..5a1d090a5 100644
--- a/src/components/molecules/GitFormItems/Path.tsx
+++ b/src/components/molecules/GitFormItems/Path.tsx
@@ -1,6 +1,9 @@
+import {FC} from 'react';
+
 import {Input} from 'antd';
 
-import {FormItem, FormItemLabel} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
 
 import {TooltipStatus, getValidationTooltip} from './tooltipUtils';
 
@@ -25,7 +28,7 @@ type PathProps = {
   message?: string;
 };
 
-const Path: React.FC<PathProps> = props => {
+export const Path: FC<PathProps> = props => {
   const {testType, status = TooltipStatus.None, message} = props;
 
   return (
@@ -45,5 +48,3 @@ const Path: React.FC<PathProps> = props => {
     </FormItem>
   );
 };
-
-export default Path;
diff --git a/src/components/molecules/GitFormItems/Repository.tsx b/src/components/molecules/GitFormItems/Repository.tsx
index cde9f3d99..6a3b69a1a 100644
--- a/src/components/molecules/GitFormItems/Repository.tsx
+++ b/src/components/molecules/GitFormItems/Repository.tsx
@@ -1,6 +1,9 @@
+import {FC} from 'react';
+
 import {Input} from 'antd';
 
-import {FormItem, FormItemLabel} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
 
 import {required, url} from '@utils/form';
 
@@ -11,7 +14,7 @@ type RepositoryProps = {
   message?: string;
 };
 
-const Repository: React.FC<RepositoryProps> = props => {
+export const Repository: FC<RepositoryProps> = props => {
   const {status = TooltipStatus.None, message} = props;
 
   return (
@@ -35,5 +38,3 @@ const Repository: React.FC<RepositoryProps> = props => {
     </FormItem>
   );
 };
-
-export default Repository;
diff --git a/src/components/molecules/GitFormItems/Revision.tsx b/src/components/molecules/GitFormItems/Revision.tsx
index cd77ccef0..e01699a17 100644
--- a/src/components/molecules/GitFormItems/Revision.tsx
+++ b/src/components/molecules/GitFormItems/Revision.tsx
@@ -1,21 +1,22 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 import {useFirstMountState} from 'react-use';
 
-import {FormItem} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
 
-import {StyledFormSpace} from '../../organisms/TestConfigurationForm/TestConfigurationForm.styled';
+import {StyledFormSpace} from '@organisms/TestConfigurationForm.styled';
 
+import {Branch} from './Branch';
+import {Commit} from './Commit';
+import {RevisionSwitcher} from './RevisionSwitcher';
 import {TooltipStatus} from './tooltipUtils';
 
-import {Branch, Commit, RevisionSwitcher} from '.';
-
 type RevisionProps = {
   message?: string;
   branchStatus?: TooltipStatus;
   commitStatus?: TooltipStatus;
 };
 
-const Revision: React.FC<RevisionProps> = props => {
+export const Revision: FC<RevisionProps> = props => {
   const {message, branchStatus, commitStatus} = props;
   const [switcherValue, setSwitcherValue] = useState<string | number>('branch');
 
@@ -44,5 +45,3 @@ const Revision: React.FC<RevisionProps> = props => {
     </FormItem>
   );
 };
-
-export default Revision;
diff --git a/src/components/molecules/GitFormItems/RevisionSwitcher.tsx b/src/components/molecules/GitFormItems/RevisionSwitcher.tsx
index bb4bb5186..9021bca6f 100644
--- a/src/components/molecules/GitFormItems/RevisionSwitcher.tsx
+++ b/src/components/molecules/GitFormItems/RevisionSwitcher.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {Segmented} from 'antd';
 
 type RevisionSwitcherProps = {
@@ -5,7 +7,7 @@ type RevisionSwitcherProps = {
   onChange: (value: string | number) => void;
 };
 
-const RevisionSwitcher: React.FC<RevisionSwitcherProps> = props => {
+export const RevisionSwitcher: FC<RevisionSwitcherProps> = props => {
   const {value, onChange} = props;
 
   return (
@@ -19,5 +21,3 @@ const RevisionSwitcher: React.FC<RevisionSwitcherProps> = props => {
     />
   );
 };
-
-export default RevisionSwitcher;
diff --git a/src/components/molecules/GitFormItems/SecretFormItem.tsx b/src/components/molecules/GitFormItems/SecretFormItem.tsx
index c41c1c915..ce1f1d467 100644
--- a/src/components/molecules/GitFormItems/SecretFormItem.tsx
+++ b/src/components/molecules/GitFormItems/SecretFormItem.tsx
@@ -1,8 +1,12 @@
+import {FC} from 'react';
+
 import {Form, Input} from 'antd';
 
-import {FormItem, FormItemLabel, Text} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {dummySecret} from '@utils/sources';
 import {secretRegex} from '@utils/strings';
@@ -18,7 +22,7 @@ type SecretFormItemProps = {
   message?: string;
 };
 
-const SecretFormItem: React.FC<SecretFormItemProps> = props => {
+export const SecretFormItem: FC<SecretFormItemProps> = props => {
   const {isClearedValue = true, setIsClearedValue, name, label, status = TooltipStatus.None, message} = props;
 
   const rules = isClearedValue ? [{pattern: secretRegex, message: `Invalid ${name} value`}] : [];
@@ -58,5 +62,3 @@ const SecretFormItem: React.FC<SecretFormItemProps> = props => {
     </Form.Item>
   );
 };
-
-export default SecretFormItem;
diff --git a/src/components/molecules/GitFormItems/index.ts b/src/components/molecules/GitFormItems/index.ts
deleted file mode 100644
index 9de0edd90..000000000
--- a/src/components/molecules/GitFormItems/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export {default as Commit} from './Commit';
-export {default as Branch} from './Branch';
-export {default as Repository} from './Repository';
-export {default as SecretFormItem} from './SecretFormItem';
-export {default as Path} from './Path';
-export {default as RevisionSwitcher} from './RevisionSwitcher';
-export {default as Revision} from './Revision';
diff --git a/src/components/molecules/GitFormItems/tooltipUtils.tsx b/src/components/molecules/GitFormItems/tooltipUtils.tsx
index 80abb9917..3af16ba90 100644
--- a/src/components/molecules/GitFormItems/tooltipUtils.tsx
+++ b/src/components/molecules/GitFormItems/tooltipUtils.tsx
@@ -1,6 +1,6 @@
 import {CheckCircleFilled, LoadingOutlined, WarningFilled} from '@ant-design/icons';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export enum TooltipStatus {
   Loading = 'loading',
diff --git a/src/components/molecules/HelpCard/HelpCard.styled.tsx b/src/components/molecules/HelpCard.styled.tsx
similarity index 95%
rename from src/components/molecules/HelpCard/HelpCard.styled.tsx
rename to src/components/molecules/HelpCard.styled.tsx
index 7bbf0b7b0..99e715859 100644
--- a/src/components/molecules/HelpCard/HelpCard.styled.tsx
+++ b/src/components/molecules/HelpCard.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledHelpCardContainer = styled.div<{isLink?: boolean}>`
   display: flex;
diff --git a/src/components/molecules/HelpCard/HelpCard.tsx b/src/components/molecules/HelpCard.tsx
similarity index 88%
rename from src/components/molecules/HelpCard/HelpCard.tsx
rename to src/components/molecules/HelpCard.tsx
index 9239b98b0..0f6846e33 100644
--- a/src/components/molecules/HelpCard/HelpCard.tsx
+++ b/src/components/molecules/HelpCard.tsx
@@ -1,4 +1,4 @@
-import {PropsWithChildren} from 'react';
+import {FC, PropsWithChildren} from 'react';
 
 import {ReactComponent as HelpLinkIcon} from '@assets/helpLinkIcon.svg';
 import {ReactComponent as LinkIcon} from '@assets/linkIcon.svg';
@@ -12,7 +12,7 @@ type HelpCardTypes = {
   link?: string;
   customLinkIcon?: JSX.Element;
 };
-const HelpCard: React.FC<PropsWithChildren<HelpCardTypes>> = props => {
+export const HelpCard: FC<PropsWithChildren<HelpCardTypes>> = props => {
   const {isLink, isHelp, children, link, customLinkIcon: CustomLinkIcon} = props;
 
   const redirectToLink = () => {
@@ -36,5 +36,3 @@ const HelpCard: React.FC<PropsWithChildren<HelpCardTypes>> = props => {
     </StyledHelpCardContainer>
   );
 };
-
-export default HelpCard;
diff --git a/src/components/molecules/HelpCard/index.ts b/src/components/molecules/HelpCard/index.ts
deleted file mode 100644
index 24f3a1bad..000000000
--- a/src/components/molecules/HelpCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './HelpCard';
diff --git a/src/components/molecules/Hint/Hint.styled.tsx b/src/components/molecules/Hint.styled.tsx
similarity index 94%
rename from src/components/molecules/Hint/Hint.styled.tsx
rename to src/components/molecules/Hint.styled.tsx
index e078962ce..8e15dc296 100644
--- a/src/components/molecules/Hint/Hint.styled.tsx
+++ b/src/components/molecules/Hint.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
 export const StyledWizardHintContainer = styled.div`
diff --git a/src/components/molecules/Hint/Hint.tsx b/src/components/molecules/Hint.tsx
similarity index 77%
rename from src/components/molecules/Hint/Hint.tsx
rename to src/components/molecules/Hint.tsx
index 75c956c42..1249886d9 100644
--- a/src/components/molecules/Hint/Hint.tsx
+++ b/src/components/molecules/Hint.tsx
@@ -1,13 +1,15 @@
-import {memo} from 'react';
+import {FC, memo} from 'react';
 
 import {ReactComponent as WizardHintImage} from '@assets/wizardHint.svg';
 import {ReactComponent as WizardHintEmpty} from '@assets/wizardHintEmpty.svg';
 
-import {ExecutorIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
 
-import {Button, Text, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
+import {Title} from '@custom-antd/Typography/Title';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {AbsoluteExecutorIconContainer, StyledImageContainer, StyledWizardHintContainer} from './Hint.styled';
 
@@ -18,7 +20,7 @@ export type HintProps = {
   selectedExecutor?: string;
 };
 
-const Hint: React.FC<HintProps> = props => {
+export const Hint: FC<HintProps> = memo(props => {
   const {title, description, openLink, selectedExecutor} = props;
 
   return (
@@ -40,6 +42,4 @@ const Hint: React.FC<HintProps> = props => {
       </Button>
     </StyledWizardHintContainer>
   );
-};
-
-export default memo(Hint);
+});
diff --git a/src/components/molecules/Hint/index.ts b/src/components/molecules/Hint/index.ts
deleted file mode 100644
index a87722f0b..000000000
--- a/src/components/molecules/Hint/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Hint';
diff --git a/src/components/molecules/InlineNotification/InlineNotification.styled.tsx b/src/components/molecules/InlineNotification.styled.tsx
similarity index 95%
rename from src/components/molecules/InlineNotification/InlineNotification.styled.tsx
rename to src/components/molecules/InlineNotification.styled.tsx
index 2d238b103..5fead2317 100644
--- a/src/components/molecules/InlineNotification/InlineNotification.styled.tsx
+++ b/src/components/molecules/InlineNotification.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const InlineNotificationWrapper = styled.div`
   display: flex;
diff --git a/src/components/molecules/InlineNotification/InlineNotification.tsx b/src/components/molecules/InlineNotification.tsx
similarity index 76%
rename from src/components/molecules/InlineNotification/InlineNotification.tsx
rename to src/components/molecules/InlineNotification.tsx
index 638b1f4a5..ee2e6bd8b 100644
--- a/src/components/molecules/InlineNotification/InlineNotification.tsx
+++ b/src/components/molecules/InlineNotification.tsx
@@ -1,4 +1,6 @@
-import {Text} from '@custom-antd';
+import {FC} from 'react';
+
+import {Text} from '@custom-antd/Typography/Text';
 
 import {InlineNotificationWrapper} from './InlineNotification.styled';
 
@@ -7,7 +9,7 @@ interface InlineNotificationProps {
   description: JSX.Element;
   type: 'warning' | 'error';
 }
-const InlineNotification: React.FC<InlineNotificationProps> = props => {
+export const InlineNotification: FC<InlineNotificationProps> = props => {
   const {type = 'error', title, description} = props;
 
   return (
@@ -17,5 +19,3 @@ const InlineNotification: React.FC<InlineNotificationProps> = props => {
     </InlineNotificationWrapper>
   );
 };
-
-export default InlineNotification;
diff --git a/src/components/molecules/InlineNotification/index.ts b/src/components/molecules/InlineNotification/index.ts
deleted file mode 100644
index 815343847..000000000
--- a/src/components/molecules/InlineNotification/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './InlineNotification';
diff --git a/src/components/molecules/KubernetesResourceEditor/KubernetesResourceEditor.tsx b/src/components/molecules/KubernetesResourceEditor.tsx
similarity index 83%
rename from src/components/molecules/KubernetesResourceEditor/KubernetesResourceEditor.tsx
rename to src/components/molecules/KubernetesResourceEditor.tsx
index b446384a2..b10aba658 100644
--- a/src/components/molecules/KubernetesResourceEditor/KubernetesResourceEditor.tsx
+++ b/src/components/molecules/KubernetesResourceEditor.tsx
@@ -2,9 +2,9 @@ import {FC, useEffect} from 'react';
 
 import {JSONSchema4} from 'json-schema';
 
-import {MonacoEditor} from '@atoms';
+import {TkMonacoEditor as MonacoEditor} from '@atoms/MonacoEditor';
 
-import useCRD from '@hooks/useCRD';
+import {useCRD} from '@hooks/useCRD';
 
 interface KubernetesResourceEditorProps {
   disabled?: boolean;
@@ -14,7 +14,7 @@ interface KubernetesResourceEditorProps {
   overrideSchema?: (schema: JSONSchema4) => JSONSchema4;
 }
 
-const KubernetesResourceEditor: FC<KubernetesResourceEditorProps> = props => {
+export const KubernetesResourceEditor: FC<KubernetesResourceEditorProps> = props => {
   const {disabled, crdUrl, onChange, value, overrideSchema = x => x} = props;
 
   const {crd} = useCRD(crdUrl);
@@ -41,5 +41,3 @@ const KubernetesResourceEditor: FC<KubernetesResourceEditorProps> = props => {
 
   return <MonacoEditor language="yaml" onChange={onChange} value={value} disabled={disabled} />;
 };
-
-export default KubernetesResourceEditor;
diff --git a/src/components/molecules/KubernetesResourceEditor/index.ts b/src/components/molecules/KubernetesResourceEditor/index.ts
deleted file mode 100644
index 248b316c2..000000000
--- a/src/components/molecules/KubernetesResourceEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './KubernetesResourceEditor';
diff --git a/src/components/molecules/LabelsList/LabelsList.styled.ts b/src/components/molecules/LabelsList.styled.ts
similarity index 90%
rename from src/components/molecules/LabelsList/LabelsList.styled.ts
rename to src/components/molecules/LabelsList.styled.ts
index 6cd523788..2d7d7481c 100644
--- a/src/components/molecules/LabelsList/LabelsList.styled.ts
+++ b/src/components/molecules/LabelsList.styled.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledLabelsList = styled.ul`
   display: flex;
diff --git a/src/components/molecules/LabelsList/LabelsList.tsx b/src/components/molecules/LabelsList.tsx
similarity index 88%
rename from src/components/molecules/LabelsList/LabelsList.tsx
rename to src/components/molecules/LabelsList.tsx
index d36c33640..3465a4bdf 100644
--- a/src/components/molecules/LabelsList/LabelsList.tsx
+++ b/src/components/molecules/LabelsList.tsx
@@ -1,10 +1,10 @@
-import {memo} from 'react';
+import {FC, memo} from 'react';
 
 import {Popover} from 'antd';
 
-import {LabelListItem} from '@atoms';
+import {LabelListItem} from '@atoms/LabelListItem';
 
-import {EntityKey, EntityMap} from '@models/entityMap';
+import type {EntityKey, EntityMap} from '@models/entityMap';
 
 import {LabelsPopover, StyledLabelsList} from './LabelsList.styled';
 
@@ -15,7 +15,7 @@ type LabelsListProps = {
   className?: string;
 };
 
-const LabelsList: React.FC<LabelsListProps> = props => {
+export const LabelsList: FC<LabelsListProps> = memo(props => {
   const {labels, howManyLabelsToShow = 3, shouldSkipLabels = false, className = ''} = props;
 
   const labelKeys: EntityKey[] = Object.keys(labels);
@@ -63,6 +63,4 @@ const LabelsList: React.FC<LabelsListProps> = props => {
       ) : null}
     </StyledLabelsList>
   );
-};
-
-export default memo(LabelsList);
+});
diff --git a/src/components/molecules/LabelsList/index.ts b/src/components/molecules/LabelsList/index.ts
deleted file mode 100644
index 2c393fc6f..000000000
--- a/src/components/molecules/LabelsList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './LabelsList';
diff --git a/src/components/molecules/LabelsSelect/LabelsSelect.tsx b/src/components/molecules/LabelsSelect.tsx
similarity index 81%
rename from src/components/molecules/LabelsSelect/LabelsSelect.tsx
rename to src/components/molecules/LabelsSelect.tsx
index f51e23153..afaa76912 100644
--- a/src/components/molecules/LabelsSelect/LabelsSelect.tsx
+++ b/src/components/molecules/LabelsSelect.tsx
@@ -1,11 +1,12 @@
-import React, {useContext} from 'react';
+import {FC, useContext} from 'react';
 
-import {CreatableMultiSelect} from '@atoms';
-import {LabelsMultiValueLabel, LabelsOption} from '@atoms/CreatableMultiSelect/CustomComponents';
+import {CreatableMultiSelect} from '@atoms/CreatableMultiSelect';
+import {LabelsMultiValueLabel} from '@atoms/CreatableMultiSelect/CustomComponents/LabelsMultiValueLabel';
+import {LabelsOption} from '@atoms/CreatableMultiSelect/CustomComponents/LabelsOption';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -13,7 +14,7 @@ import {useGetLabelsQuery} from '@services/labels';
 
 import {PollingIntervals} from '@utils/numbers';
 
-import {composeLabels, labelRegex} from './utils';
+import {composeLabels, labelRegex} from './LabelsSelect/utils';
 
 type LabelsSelectProps = {
   onChange?: (value: readonly Option[]) => void;
@@ -28,7 +29,7 @@ const isValidLabel = (value?: string) => {
   return value != null && labelRegex.test(value);
 };
 
-const LabelsSelect: React.FC<LabelsSelectProps> = props => {
+export const LabelsSelect: FC<LabelsSelectProps> = props => {
   const {onChange, defaultLabels, options, placeholder = 'Add or create new labels', validation, menuPlacement} = props;
   // TODO: Check if it's actually expected, as it's used in multiple places
   const isSelectDisabled = !usePermission(Permissions.editEntity);
@@ -83,5 +84,3 @@ const LabelsSelect: React.FC<LabelsSelectProps> = props => {
     />
   );
 };
-
-export default LabelsSelect;
diff --git a/src/components/molecules/LabelsSelect/index.ts b/src/components/molecules/LabelsSelect/index.ts
deleted file mode 100644
index 16d9580ed..000000000
--- a/src/components/molecules/LabelsSelect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './LabelsSelect';
diff --git a/src/components/molecules/LabelsSelect/utils.ts b/src/components/molecules/LabelsSelect/utils.ts
index ae611e15e..31f47105d 100644
--- a/src/components/molecules/LabelsSelect/utils.ts
+++ b/src/components/molecules/LabelsSelect/utils.ts
@@ -1,4 +1,4 @@
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
 export const decomposeLabels = (labels: readonly Option[]): Record<string, string> => {
   return labels.reduce((previousValue, currentValue: Option) => {
diff --git a/src/components/molecules/LogOutput/LogOutput.styled.tsx b/src/components/molecules/LogOutput.styled.tsx
similarity index 94%
rename from src/components/molecules/LogOutput/LogOutput.styled.tsx
rename to src/components/molecules/LogOutput.styled.tsx
index 80b7245bc..b4a650862 100644
--- a/src/components/molecules/LogOutput/LogOutput.styled.tsx
+++ b/src/components/molecules/LogOutput.styled.tsx
@@ -2,9 +2,9 @@ import {ExpandAltOutlined, FullscreenExitOutlined} from '@ant-design/icons';
 
 import styled from 'styled-components';
 
-import {AnsiClassesMapping} from '@atoms';
+import {AnsiClassesMapping} from '@atoms/TestkubeTheme/AnsiClassesMapping';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {invisibleScroll} from '@styles/globalStyles';
 
 export const BaseLogOutputStyles = `
diff --git a/src/components/molecules/LogOutput/LogOutput.tsx b/src/components/molecules/LogOutput.tsx
similarity index 90%
rename from src/components/molecules/LogOutput/LogOutput.tsx
rename to src/components/molecules/LogOutput.tsx
index 3ebb10775..e51b0489d 100644
--- a/src/components/molecules/LogOutput/LogOutput.tsx
+++ b/src/components/molecules/LogOutput.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode, memo, useCallback, useEffect, useRef, useState} from 'react';
+import {FC, ReactNode, memo, useCallback, useEffect, useRef, useState} from 'react';
 import {createPortal} from 'react-dom';
 import {CSSTransition} from 'react-transition-group';
 import {useAsync, useInterval} from 'react-use';
@@ -6,7 +6,7 @@ import useWebSocket from 'react-use-websocket';
 
 import {isEqual} from 'lodash';
 
-import {Coordinates} from '@models/config';
+import type {Coordinates} from '@models/config';
 
 import {useWsEndpoint} from '@services/apiEndpoint';
 
@@ -14,10 +14,10 @@ import {useLogOutputPick} from '@store/logOutput';
 
 import {getRtkIdToken} from '@utils/rtk';
 
-import FullscreenLogOutput from './FullscreenLogOutput';
 import {DrawerBannerContainer, LogOutputWrapper} from './LogOutput.styled';
-import LogOutputPure from './LogOutputPure';
-import {useCountLines, useLastLines} from './utils';
+import {FullscreenLogOutput} from './LogOutput/FullscreenLogOutput';
+import {LogOutputPure} from './LogOutput/LogOutputPure';
+import {useCountLines, useLastLines} from './LogOutput/utils';
 
 export type LogOutputProps = {
   banner?: ReactNode;
@@ -27,7 +27,7 @@ export type LogOutputProps = {
   initialLines?: number;
 };
 
-const LogOutput: React.FC<LogOutputProps> = props => {
+export const LogOutput: FC<LogOutputProps> = memo(props => {
   const {logOutput = 'No logs', executionId, isRunning = false, initialLines = 300, banner} = props;
 
   const containerRef = useRef<HTMLDivElement>(null);
@@ -137,6 +137,4 @@ const LogOutput: React.FC<LogOutputProps> = props => {
       {createPortal(fullscreenLog, document.body)}
     </>
   );
-};
-
-export default memo(LogOutput);
+});
diff --git a/src/components/molecules/LogOutput/FullscreenAction.tsx b/src/components/molecules/LogOutput/FullscreenAction.tsx
index 2cba165e5..e5f49c43c 100644
--- a/src/components/molecules/LogOutput/FullscreenAction.tsx
+++ b/src/components/molecules/LogOutput/FullscreenAction.tsx
@@ -1,12 +1,12 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
 import {Tooltip} from 'antd';
 
-import {useLogOutputField} from '@store/logOutput';
+import {StyledExpandAltOutlined, StyledFullscreenExitOutlined} from '@molecules/LogOutput.styled';
 
-import {StyledExpandAltOutlined, StyledFullscreenExitOutlined} from './LogOutput.styled';
+import {useLogOutputField} from '@store/logOutput';
 
-const FullscreenAction: React.FC = () => {
+export const FullscreenAction: FC = () => {
   const [isFullscreen, setIsFullscreen] = useLogOutputField('isFullscreen');
 
   const [isTooltipOpen, setIsTooltipOpen] = useState(false);
@@ -28,5 +28,3 @@ const FullscreenAction: React.FC = () => {
     </Tooltip>
   );
 };
-
-export default FullscreenAction;
diff --git a/src/components/molecules/LogOutput/FullscreenLogOutput.tsx b/src/components/molecules/LogOutput/FullscreenLogOutput.tsx
index 1cce6a4cf..109de9dda 100644
--- a/src/components/molecules/LogOutput/FullscreenLogOutput.tsx
+++ b/src/components/molecules/LogOutput/FullscreenLogOutput.tsx
@@ -1,13 +1,13 @@
 import styled from 'styled-components';
 
-import {Coordinates} from '@models/config';
+import type {Coordinates} from '@models/config';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
-import LogOutputPure from './LogOutputPure';
+import {LogOutputPure} from './LogOutputPure';
 
-const FullscreenLogOutput = styled(LogOutputPure)<{$rect?: Coordinates}>`
+export const FullscreenLogOutput = styled(LogOutputPure)<{$rect?: Coordinates}>`
   position: fixed;
   z-index: 1001;
 
@@ -70,5 +70,3 @@ const FullscreenLogOutput = styled(LogOutputPure)<{$rect?: Coordinates}>`
     }
   }
 `;
-
-export default FullscreenLogOutput;
diff --git a/src/components/molecules/LogOutput/LogOutputActions.tsx b/src/components/molecules/LogOutput/LogOutputActions.tsx
index 6776b3b80..60026d5dd 100644
--- a/src/components/molecules/LogOutput/LogOutputActions.tsx
+++ b/src/components/molecules/LogOutput/LogOutputActions.tsx
@@ -1,20 +1,22 @@
-import {useCallback} from 'react';
+import {FC, useCallback} from 'react';
 
 import stripAnsi from 'strip-ansi';
 
-import {CopyButton, DownloadButton} from '@atoms';
+import {CopyButton} from '@atoms/CopyButton';
+import {DownloadButton} from '@atoms/DownloadButton';
 
-import useLocation from '@hooks/useLocation';
-import useSecureContext from '@hooks/useSecureContext';
+import {useLocation} from '@hooks/useLocation';
+import {useSecureContext} from '@hooks/useSecureContext';
 
-import FullscreenAction from './FullscreenAction';
-import {StyledLogOutputActionsContainer} from './LogOutput.styled';
+import {StyledLogOutputActionsContainer} from '@molecules/LogOutput.styled';
+
+import {FullscreenAction} from './FullscreenAction';
 
 type LogOutputActionsProps = {
   logOutput: string;
 };
 
-const LogOutputActions: React.FC<LogOutputActionsProps> = props => {
+export const LogOutputActions: FC<LogOutputActionsProps> = props => {
   const {logOutput} = props;
   const strippedLogOutput = useCallback(() => stripAnsi(logOutput), [logOutput]);
   const isSecureContext = useSecureContext();
@@ -31,5 +33,3 @@ const LogOutputActions: React.FC<LogOutputActionsProps> = props => {
     </StyledLogOutputActionsContainer>
   );
 };
-
-export default LogOutputActions;
diff --git a/src/components/molecules/LogOutput/LogOutputHeader.tsx b/src/components/molecules/LogOutput/LogOutputHeader.tsx
index 62f0cfdd4..614f7eace 100644
--- a/src/components/molecules/LogOutput/LogOutputHeader.tsx
+++ b/src/components/molecules/LogOutput/LogOutputHeader.tsx
@@ -1,7 +1,10 @@
-import {StyledLogOutputHeaderContainer} from './LogOutput.styled';
-import LogOutputActions from './LogOutputActions';
+import {FC} from 'react';
 
-const LogOutputHeader: React.FC<any> = props => {
+import {StyledLogOutputHeaderContainer} from '@molecules/LogOutput.styled';
+
+import {LogOutputActions} from './LogOutputActions';
+
+export const LogOutputHeader: FC<any> = props => {
   const {logOutput, isFullscreen = false} = props;
 
   return (
@@ -10,5 +13,3 @@ const LogOutputHeader: React.FC<any> = props => {
     </StyledLogOutputHeaderContainer>
   );
 };
-
-export default LogOutputHeader;
diff --git a/src/components/molecules/LogOutput/LogOutputPure.tsx b/src/components/molecules/LogOutput/LogOutputPure.tsx
index 50686e644..3c5dd1557 100644
--- a/src/components/molecules/LogOutput/LogOutputPure.tsx
+++ b/src/components/molecules/LogOutput/LogOutputPure.tsx
@@ -4,8 +4,9 @@ import Ansi from 'ansi-to-react';
 
 import {useScrolledToBottom} from '@hooks/useScrolledToBottom';
 
-import {StyledLogOutputContainer, StyledLogTextContainer, StyledPreLogText} from './LogOutput.styled';
-import LogOutputHeader from './LogOutputHeader';
+import {StyledLogOutputContainer, StyledLogTextContainer, StyledPreLogText} from '@molecules/LogOutput.styled';
+
+import {LogOutputHeader} from './LogOutputHeader';
 
 /* eslint-disable react/no-unused-prop-types */
 interface LogOutputPureProps {
@@ -18,7 +19,7 @@ interface LogOutputPureProps {
   onExpand: () => void;
 }
 
-const LogOutputPure = memo(
+export const LogOutputPure = memo(
   forwardRef<HTMLDivElement, LogOutputPureProps>(
     ({className, logs, visibleLogs, expanded, lines, initialLines, onExpand}, ref) => {
       const scrollableRef = useRef<HTMLDivElement | null>(null);
@@ -62,5 +63,3 @@ const LogOutputPure = memo(
     }
   )
 );
-
-export default LogOutputPure;
diff --git a/src/components/molecules/LogOutput/index.ts b/src/components/molecules/LogOutput/index.ts
deleted file mode 100644
index baebf19b2..000000000
--- a/src/components/molecules/LogOutput/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './LogOutput';
diff --git a/src/components/molecules/MessagePanel/MessagePanel.styled.tsx b/src/components/molecules/MessagePanel.styled.tsx
similarity index 93%
rename from src/components/molecules/MessagePanel/MessagePanel.styled.tsx
rename to src/components/molecules/MessagePanel.styled.tsx
index 80cb55bfe..3f55694b6 100644
--- a/src/components/molecules/MessagePanel/MessagePanel.styled.tsx
+++ b/src/components/molecules/MessagePanel.styled.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
 export const MessagePanelWrapper = styled.div`
diff --git a/src/components/molecules/MessagePanel/MessagePanel.tsx b/src/components/molecules/MessagePanel.tsx
similarity index 86%
rename from src/components/molecules/MessagePanel/MessagePanel.tsx
rename to src/components/molecules/MessagePanel.tsx
index 9b9e2f403..2fe56ed00 100644
--- a/src/components/molecules/MessagePanel/MessagePanel.tsx
+++ b/src/components/molecules/MessagePanel.tsx
@@ -1,9 +1,13 @@
+import {FC, ReactNode} from 'react';
+
 import {CloseOutlined} from '@ant-design/icons';
 
-import {Button, FullWidthSpace, Text} from '@custom-antd';
-import {ICustomButtonProps} from '@custom-antd/Button/Button.styled';
+import {Button} from '@custom-antd/Button';
+import type {ICustomButtonProps} from '@custom-antd/Button.styled';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {
   CloseButtonWrapper,
@@ -27,7 +31,7 @@ interface ButtonWithLinkConfig extends ButtonConfig {
 
 interface MessagePanelProps {
   title: string;
-  description: React.ReactNode;
+  description: ReactNode;
   type?: 'warning' | 'error' | 'default';
   position?: 'inline';
   buttons?: (ButtonConfig | ButtonWithLinkConfig)[];
@@ -50,7 +54,7 @@ const textColorForType: Record<string, Record<string, Colors>> = {
   },
 };
 
-const MessagePanel: React.FC<MessagePanelProps> = props => {
+export const MessagePanel: FC<MessagePanelProps> = props => {
   const {type = 'error', title, description, position, buttons, isClosable, onClose} = props;
 
   return (
@@ -92,5 +96,3 @@ const MessagePanel: React.FC<MessagePanelProps> = props => {
     </MessagePanelWrapper>
   );
 };
-
-export default MessagePanel;
diff --git a/src/components/molecules/MessagePanel/index.ts b/src/components/molecules/MessagePanel/index.ts
deleted file mode 100644
index 140d83f75..000000000
--- a/src/components/molecules/MessagePanel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './MessagePanel';
diff --git a/src/components/molecules/MetricsBarChart/MetricsBarChart.styled.tsx b/src/components/molecules/MetricsBarChart.styled.tsx
similarity index 97%
rename from src/components/molecules/MetricsBarChart/MetricsBarChart.styled.tsx
rename to src/components/molecules/MetricsBarChart.styled.tsx
index 90fafdcff..d9ac4dfdd 100644
--- a/src/components/molecules/MetricsBarChart/MetricsBarChart.styled.tsx
+++ b/src/components/molecules/MetricsBarChart.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors, {SecondaryStatusColors, StatusColors} from '@styles/Colors';
+import {Colors, SecondaryStatusColors, StatusColors} from '@styles/Colors';
 import {invisibleScroll} from '@styles/globalStyles';
 
 export const MetricsBarChartWrapper = styled.div<{
diff --git a/src/components/molecules/MetricsBarChart/MetricsBarChart.tsx b/src/components/molecules/MetricsBarChart.tsx
similarity index 91%
rename from src/components/molecules/MetricsBarChart/MetricsBarChart.tsx
rename to src/components/molecules/MetricsBarChart.tsx
index 88c58085a..dbd399521 100644
--- a/src/components/molecules/MetricsBarChart/MetricsBarChart.tsx
+++ b/src/components/molecules/MetricsBarChart.tsx
@@ -1,13 +1,19 @@
-import {memo, useCallback, useEffect, useRef} from 'react';
+import {FC, memo, useCallback, useEffect, useRef} from 'react';
 
 import debounce from 'lodash.debounce';
 
 import type {ExecutionMetrics} from '@models/metrics';
 
 import {BarsWrapper, ChartWrapper, MetricsBarChartWrapper} from './MetricsBarChart.styled';
-import Chart, {BarChartConfig} from './components/Chart';
-import PAxisLine from './components/PAxisLine';
-import {getAxisPosition, getMaximumValue, getMinimumValue, metricsLogarithmization, secondInMs} from './utils';
+import {BarChartConfig, Chart} from './MetricsBarChart/components/Chart';
+import {PAxisLine} from './MetricsBarChart/components/PAxisLine';
+import {
+  getAxisPosition,
+  getMaximumValue,
+  getMinimumValue,
+  metricsLogarithmization,
+  secondInMs,
+} from './MetricsBarChart/utils';
 
 type MetricsBarChartProps = {
   data?: ExecutionMetrics[];
@@ -20,7 +26,7 @@ type MetricsBarChartProps = {
 
 const visibleDifferenctBetweenAxes = 17;
 
-const MetricsBarChart: React.FC<MetricsBarChartProps> = props => {
+export const MetricsBarChart: FC<MetricsBarChartProps> = memo(props => {
   const {
     data = [],
     executionDurationP50ms,
@@ -161,6 +167,4 @@ const MetricsBarChart: React.FC<MetricsBarChartProps> = props => {
       </ChartWrapper>
     </MetricsBarChartWrapper>
   );
-};
-
-export default memo(MetricsBarChart);
+});
diff --git a/src/components/molecules/MetricsBarChart/components/BarWithTooltip.tsx b/src/components/molecules/MetricsBarChart/components/BarWithTooltip.tsx
index 90249efb1..650e6311b 100644
--- a/src/components/molecules/MetricsBarChart/components/BarWithTooltip.tsx
+++ b/src/components/molecules/MetricsBarChart/components/BarWithTooltip.tsx
@@ -1,9 +1,11 @@
+import {FC} from 'react';
+
 import {useEntityDetailsPick} from '@store/entityDetails';
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
 import {SecondaryStatusColors, StatusColors} from '@styles/Colors';
 
-import BarWithTooltipPure from './BarWithTooltipPure';
+import {BarWithTooltipPure} from './BarWithTooltipPure';
 
 export type BarConfig = {
   width: number;
@@ -15,10 +17,8 @@ export type BarConfig = {
   chartHeight: number;
 };
 
-const BarWithTooltip: React.FC<BarConfig> = props => {
+export const BarWithTooltip: FC<BarConfig> = props => {
   const {executions} = useEntityDetailsPick('executions');
   const {open} = useExecutionDetailsPick('open');
   return <BarWithTooltipPure {...props} executions={executions} onSelect={open} />;
 };
-
-export default BarWithTooltip;
diff --git a/src/components/molecules/MetricsBarChart/components/BarWithTooltipPure.tsx b/src/components/molecules/MetricsBarChart/components/BarWithTooltipPure.tsx
index dd9df8853..d6cd327c9 100644
--- a/src/components/molecules/MetricsBarChart/components/BarWithTooltipPure.tsx
+++ b/src/components/molecules/MetricsBarChart/components/BarWithTooltipPure.tsx
@@ -1,14 +1,10 @@
-import {memo, useCallback, useMemo} from 'react';
+import {FC, memo, useCallback, useMemo} from 'react';
 
 import {Popover} from 'antd';
 
-import {StatusIcon} from '@atoms';
+import {StatusIcon} from '@atoms/StatusIcon';
 
-import {Text} from '@custom-antd';
-
-import Colors from '@styles/Colors';
-
-import {formatExecutionDate} from '@utils/formatDate';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {
   BarDate,
@@ -17,7 +13,11 @@ import {
   StyledPopoverContainer,
   StyledPopoverContent,
   StyledPopoverHeader,
-} from '../MetricsBarChart.styled';
+} from '@molecules/MetricsBarChart.styled';
+
+import {Colors} from '@styles/Colors';
+
+import {formatExecutionDate} from '@utils/formatDate';
 
 import type {BarConfig} from './BarWithTooltip';
 
@@ -28,7 +28,7 @@ type BarConfigPure = BarConfig & {
   onSelect: (id: string) => void;
 };
 
-const BarWithTooltipPure: React.FC<BarConfigPure> = memo(props => {
+export const BarWithTooltipPure: FC<BarConfigPure> = memo(props => {
   const {width, height, color, tooltipData, hoverColor, date, chartHeight, executions, onSelect} = props;
   const {status, duration, name, startTime} = tooltipData;
 
@@ -75,5 +75,3 @@ const BarWithTooltipPure: React.FC<BarConfigPure> = memo(props => {
     </Popover>
   );
 });
-
-export default BarWithTooltipPure;
diff --git a/src/components/molecules/MetricsBarChart/components/Chart.tsx b/src/components/molecules/MetricsBarChart/components/Chart.tsx
index 09e302d49..41cdd3b30 100644
--- a/src/components/molecules/MetricsBarChart/components/Chart.tsx
+++ b/src/components/molecules/MetricsBarChart/components/Chart.tsx
@@ -1,14 +1,14 @@
-import {useMemo} from 'react';
+import {FC, MutableRefObject, useMemo} from 'react';
 
 import {format, getDayOfYear} from 'date-fns';
 
+import {BarWrapper as Bar, SvgWrapper} from '@molecules/MetricsBarChart.styled';
+
 import {SecondaryStatusColors, StatusColors} from '@styles/Colors';
 
 import {formatDuration} from '@utils/formatDate';
 
-import {BarWrapper as Bar, SvgWrapper} from '../MetricsBarChart.styled';
-
-import BarWithTooltip from './BarWithTooltip';
+import {BarWithTooltip} from './BarWithTooltip';
 
 export type BarChartConfig = {
   barWidth: number;
@@ -21,10 +21,10 @@ type ChartProps = {
   chartConfig: BarChartConfig;
   maxValue: number;
   isDetailsView?: boolean;
-  scrollRef?: React.MutableRefObject<null>;
+  scrollRef?: MutableRefObject<null>;
 };
 
-const Chart: React.FC<ChartProps> = props => {
+export const Chart: FC<ChartProps> = props => {
   const {chartConfig, maxValue, isDetailsView = false, scrollRef} = props;
 
   const {chartData, barWidth, chartHeight, barMargin} = chartConfig;
@@ -90,5 +90,3 @@ const Chart: React.FC<ChartProps> = props => {
     </SvgWrapper>
   );
 };
-
-export default Chart;
diff --git a/src/components/molecules/MetricsBarChart/components/PAxisLine.tsx b/src/components/molecules/MetricsBarChart/components/PAxisLine.tsx
index 576d43504..2f3ab94f2 100644
--- a/src/components/molecules/MetricsBarChart/components/PAxisLine.tsx
+++ b/src/components/molecules/MetricsBarChart/components/PAxisLine.tsx
@@ -1,12 +1,12 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {intervalToDuration} from 'date-fns';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {AxisLabel, HorizontalAxis} from '@molecules/MetricsBarChart.styled';
 
-import {AxisLabel, HorizontalAxis} from '../MetricsBarChart.styled';
+import {Colors} from '@styles/Colors';
 
 type PAxisLineProps = {
   axisTop: number;
@@ -18,7 +18,7 @@ type PAxisLineProps = {
 
 const margin = 3;
 
-const PAxisLine: React.FC<PAxisLineProps> = props => {
+export const PAxisLine: FC<PAxisLineProps> = props => {
   const {axisTop, durationMs, label, dontApplyMargin, isLabelVisible} = props;
 
   const finalTopValue = dontApplyMargin ? axisTop : axisTop + margin;
@@ -49,5 +49,3 @@ const PAxisLine: React.FC<PAxisLineProps> = props => {
     </>
   );
 };
-
-export default PAxisLine;
diff --git a/src/components/molecules/MetricsBarChart/index.ts b/src/components/molecules/MetricsBarChart/index.ts
deleted file mode 100644
index 71a48fd15..000000000
--- a/src/components/molecules/MetricsBarChart/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './MetricsBarChart';
diff --git a/src/components/molecules/MetricsBarChart/utils.ts b/src/components/molecules/MetricsBarChart/utils.ts
index 0db3d00bf..a882ff637 100644
--- a/src/components/molecules/MetricsBarChart/utils.ts
+++ b/src/components/molecules/MetricsBarChart/utils.ts
@@ -1,4 +1,4 @@
-import {ExecutionMetrics} from '@models/metrics';
+import type {ExecutionMetrics} from '@models/metrics';
 
 const hundredPercent = 100;
 export const secondInMs = 1000;
diff --git a/src/components/molecules/Notification/Notification.styled.tsx b/src/components/molecules/Notification.styled.tsx
similarity index 100%
rename from src/components/molecules/Notification/Notification.styled.tsx
rename to src/components/molecules/Notification.styled.tsx
diff --git a/src/components/molecules/Notification/Notification.tsx b/src/components/molecules/Notification.tsx
similarity index 55%
rename from src/components/molecules/Notification/Notification.tsx
rename to src/components/molecules/Notification.tsx
index fca7f3773..000bb8ca5 100644
--- a/src/components/molecules/Notification/Notification.tsx
+++ b/src/components/molecules/Notification.tsx
@@ -1,8 +1,8 @@
 import {notification} from 'antd';
 
-import NotificationContent from './NotificationContent';
+import {NotificationContent} from './Notification/NotificationContent';
 
-function notificationCall(status: string, title: string, message: string = '', duration: number = 4.5) {
+export function notificationCall(status: string, title: string, message: string = '', duration: number = 4.5) {
   notification.open({
     message: null,
     placement: 'bottomRight',
@@ -11,5 +11,3 @@ function notificationCall(status: string, title: string, message: string = '', d
     duration,
   });
 }
-
-export default notificationCall;
diff --git a/src/components/molecules/Notification/NotificationContent.tsx b/src/components/molecules/Notification/NotificationContent.tsx
index ea6a530d7..4991939bf 100644
--- a/src/components/molecules/Notification/NotificationContent.tsx
+++ b/src/components/molecules/Notification/NotificationContent.tsx
@@ -1,10 +1,16 @@
-import {Text} from '@custom-antd';
+import {FC} from 'react';
 
-import {ErrorNotificationConfig} from '@models/notifications';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import type {ErrorNotificationConfig} from '@models/notifications';
 
-import {StyledNotificationContainer, StyledNotificationHeader, StyledNotificationMessage} from './Notification.styled';
+import {
+  StyledNotificationContainer,
+  StyledNotificationHeader,
+  StyledNotificationMessage,
+} from '@molecules/Notification.styled';
+
+import {Colors} from '@styles/Colors';
 
 type NotificationContentProps = {
   status: string;
@@ -19,7 +25,7 @@ const statusBGColorMap: {[key: string]: string} = {
   info: Colors.sky600,
 };
 
-const NotificationContent: React.FC<NotificationContentProps> = props => {
+export const NotificationContent: FC<NotificationContentProps> = props => {
   const {status, title, message} = props;
   return (
     <StyledNotificationContainer $bg={statusBGColorMap[status]}>
@@ -34,5 +40,3 @@ const NotificationContent: React.FC<NotificationContentProps> = props => {
     </StyledNotificationContainer>
   );
 };
-
-export default NotificationContent;
diff --git a/src/components/molecules/Notification/index.ts b/src/components/molecules/Notification/index.ts
deleted file mode 100644
index 801257d37..000000000
--- a/src/components/molecules/Notification/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as notificationCall} from './Notification';
-export {default as NotificationContent} from './NotificationContent';
diff --git a/src/components/molecules/RunningContext/RunningContext.tsx b/src/components/molecules/RunningContext.tsx
similarity index 84%
rename from src/components/molecules/RunningContext/RunningContext.tsx
rename to src/components/molecules/RunningContext.tsx
index 4c91869f1..d88977869 100644
--- a/src/components/molecules/RunningContext/RunningContext.tsx
+++ b/src/components/molecules/RunningContext.tsx
@@ -1,17 +1,17 @@
-import React, {memo} from 'react';
+import {FC, memo} from 'react';
 import {Link} from 'react-router-dom';
 
 import {Tooltip} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {Entity} from '@models/entity';
+import type {Entity} from '@models/entity';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {hasProtocol} from '@utils/strings';
 
@@ -31,7 +31,7 @@ type RunningContextProps = {
   entity: Entity;
 };
 
-const RunningContext: React.FC<RunningContextProps> = props => {
+export const RunningContext: FC<RunningContextProps> = memo(props => {
   const {id, type = RunningContextType.default, context = '', entity} = props;
   const onOpenSchedule = useDashboardNavigate(`/${entity}/${id}/settings/scheduling`);
 
@@ -70,6 +70,4 @@ const RunningContext: React.FC<RunningContextProps> = props => {
       <Text color={Colors.slate50}>{runContextMap[type]}</Text>
     </Tooltip>
   );
-};
-
-export default memo(RunningContext);
+});
diff --git a/src/components/molecules/RunningContext/index.ts b/src/components/molecules/RunningContext/index.ts
deleted file mode 100644
index 2ca04aac1..000000000
--- a/src/components/molecules/RunningContext/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default} from './RunningContext';
-export {RunningContextType} from './RunningContext';
diff --git a/src/components/molecules/SettingsLayout/SettingsLayout.styled.tsx b/src/components/molecules/SettingsLayout.styled.tsx
similarity index 100%
rename from src/components/molecules/SettingsLayout/SettingsLayout.styled.tsx
rename to src/components/molecules/SettingsLayout.styled.tsx
diff --git a/src/components/molecules/SettingsLayout/SettingsLayout.tsx b/src/components/molecules/SettingsLayout.tsx
similarity index 85%
rename from src/components/molecules/SettingsLayout/SettingsLayout.tsx
rename to src/components/molecules/SettingsLayout.tsx
index 80ba62675..2f537ceaf 100644
--- a/src/components/molecules/SettingsLayout/SettingsLayout.tsx
+++ b/src/components/molecules/SettingsLayout.tsx
@@ -1,8 +1,9 @@
 import {FC, ReactElement, createElement, memo, useCallback, useLayoutEffect, useMemo, useState} from 'react';
 
-import {SettingsLeftNavigation, StyledTabContentContainer} from '@molecules';
+import {StyledSettingsContainer, StyledTabContentContainer} from './SettingsLayout.styled';
+import {SettingsLeftNavigation} from './SettingsLeftNavigation';
 
-import {StyledSettingsContainer} from './SettingsLayout.styled';
+undefined;
 
 export interface SettingsLayoutTab {
   id: string;
@@ -21,7 +22,7 @@ const getActiveId = (tabs: SettingsLayoutTab[], id?: string) => {
   return index === -1 ? tabs[0]?.id : tabs[index].id;
 };
 
-const SettingsLayout: FC<SettingsLayoutProps> = ({tabs, active, onChange}) => {
+export const SettingsLayout: FC<SettingsLayoutProps> = memo(({tabs, active, onChange}) => {
   const [id, setId] = useState(getActiveId(tabs, active));
   const labels = useMemo(() => tabs.map(tab => tab.label), [tabs]);
 
@@ -54,6 +55,4 @@ const SettingsLayout: FC<SettingsLayoutProps> = ({tabs, active, onChange}) => {
       </StyledTabContentContainer>
     </StyledSettingsContainer>
   );
-};
-
-export default memo(SettingsLayout);
+});
diff --git a/src/components/molecules/SettingsLayout/index.ts b/src/components/molecules/SettingsLayout/index.ts
deleted file mode 100644
index 822c11410..000000000
--- a/src/components/molecules/SettingsLayout/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export {StyledTabContentContainer} from './SettingsLayout.styled';
-export {StyledSettingsContainer} from './SettingsLayout.styled';
-export {default, type SettingsLayoutTab} from './SettingsLayout';
diff --git a/src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.styled.tsx b/src/components/molecules/SettingsLeftNavigation.styled.tsx
similarity index 92%
rename from src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.styled.tsx
rename to src/components/molecules/SettingsLeftNavigation.styled.tsx
index 1c18dd4f9..29ed0dcec 100644
--- a/src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.styled.tsx
+++ b/src/components/molecules/SettingsLeftNavigation.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
 export const StyledNavigationOptionContainer = styled.div`
diff --git a/src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.tsx b/src/components/molecules/SettingsLeftNavigation.tsx
similarity index 75%
rename from src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.tsx
rename to src/components/molecules/SettingsLeftNavigation.tsx
index 227832e20..2bd8e15d0 100644
--- a/src/components/molecules/SettingsLeftNavigation/SettingsLeftNavigation.tsx
+++ b/src/components/molecules/SettingsLeftNavigation.tsx
@@ -1,8 +1,8 @@
-import {memo} from 'react';
+import {FC, memo} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {StyledNavigationContainer, StyledNavigationOptionContainer} from './SettingsLeftNavigation.styled';
 
@@ -12,7 +12,7 @@ type SettingsLeftNavigationProps = {
   setSelectedOption: (index: number) => void;
 };
 
-const SettingsLeftNavigation: React.FC<SettingsLeftNavigationProps> = props => {
+export const SettingsLeftNavigation: FC<SettingsLeftNavigationProps> = memo(props => {
   const {options, selectedOption, setSelectedOption} = props;
 
   return (
@@ -26,6 +26,4 @@ const SettingsLeftNavigation: React.FC<SettingsLeftNavigationProps> = props => {
       ))}
     </StyledNavigationContainer>
   );
-};
-
-export default memo(SettingsLeftNavigation);
+});
diff --git a/src/components/molecules/SettingsLeftNavigation/index.ts b/src/components/molecules/SettingsLeftNavigation/index.ts
deleted file mode 100644
index 54868fbd9..000000000
--- a/src/components/molecules/SettingsLeftNavigation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsLeftNavigation';
diff --git a/src/components/molecules/SummaryGrid/SummaryGrid.styled.tsx b/src/components/molecules/SummaryGrid.styled.tsx
similarity index 89%
rename from src/components/molecules/SummaryGrid/SummaryGrid.styled.tsx
rename to src/components/molecules/SummaryGrid.styled.tsx
index 05cfeeadd..1689efa11 100644
--- a/src/components/molecules/SummaryGrid/SummaryGrid.styled.tsx
+++ b/src/components/molecules/SummaryGrid.styled.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import {StyledText} from '@custom-antd/Typography/Text/Text.styled';
+import {StyledText} from '@custom-antd/Typography/Text.styled';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const SummaryGridWrapper = styled.div`
   display: grid;
diff --git a/src/components/molecules/SummaryGrid/SummaryGrid.tsx b/src/components/molecules/SummaryGrid.tsx
similarity index 89%
rename from src/components/molecules/SummaryGrid/SummaryGrid.tsx
rename to src/components/molecules/SummaryGrid.tsx
index 06a17b71c..ddb0b168b 100644
--- a/src/components/molecules/SummaryGrid/SummaryGrid.tsx
+++ b/src/components/molecules/SummaryGrid.tsx
@@ -2,18 +2,18 @@ import React, {FC, memo} from 'react';
 
 import {LoadingOutlined} from '@ant-design/icons';
 
-import {Metrics} from '@models/metrics';
+import type {Metrics} from '@models/metrics';
 
 import {formatDuration} from '@utils/formatDate';
 
 import {SummaryGridWrapper} from './SummaryGrid.styled';
-import SummaryGridItem from './SummaryGridItem';
+import {SummaryGridItem} from './SummaryGrid/SummaryGridItem';
 
 type SummaryGridProps = {
   metrics?: Metrics;
 };
 
-const SummaryGrid: FC<SummaryGridProps> = memo(({metrics}) => {
+export const SummaryGrid: FC<SummaryGridProps> = memo(({metrics}) => {
   if (!metrics) {
     return (
       <SummaryGridWrapper>
@@ -45,5 +45,3 @@ const SummaryGrid: FC<SummaryGridProps> = memo(({metrics}) => {
     </SummaryGridWrapper>
   );
 });
-
-export default SummaryGrid;
diff --git a/src/components/molecules/SummaryGrid/SummaryGridItem.tsx b/src/components/molecules/SummaryGrid/SummaryGridItem.tsx
index 3e149fa68..c498a2914 100644
--- a/src/components/molecules/SummaryGrid/SummaryGridItem.tsx
+++ b/src/components/molecules/SummaryGrid/SummaryGridItem.tsx
@@ -1,17 +1,17 @@
 import React, {FC, ReactNode, memo} from 'react';
 
-import {Title} from '@custom-antd';
+import {Title} from '@custom-antd/Typography/Title';
 
-import Colors from '@styles/Colors';
+import {CustomText, SummaryGridItem as ItemContainer} from '@molecules/SummaryGrid.styled';
 
-import {CustomText, SummaryGridItem as ItemContainer} from './SummaryGrid.styled';
+import {Colors} from '@styles/Colors';
 
 type SummaryGridProps = {
   title: string;
   value?: ReactNode;
 };
 
-const SummaryGridItem: FC<SummaryGridProps> = memo(({title, value}) => (
+export const SummaryGridItem: FC<SummaryGridProps> = memo(({title, value}) => (
   <ItemContainer>
     <CustomText title={title} className="uppercase middle" $color={Colors.slate500}>
       {title}
@@ -19,5 +19,3 @@ const SummaryGridItem: FC<SummaryGridProps> = memo(({title, value}) => (
     <Title level={3}>{value ?? '-'}</Title>
   </ItemContainer>
 ));
-
-export default SummaryGridItem;
diff --git a/src/components/molecules/SummaryGrid/index.ts b/src/components/molecules/SummaryGrid/index.ts
deleted file mode 100644
index e56d2a390..000000000
--- a/src/components/molecules/SummaryGrid/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SummaryGrid';
diff --git a/src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.styled.tsx b/src/components/molecules/Variables/ExecutionsVariablesList.styled.tsx
similarity index 92%
rename from src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.styled.tsx
rename to src/components/molecules/Variables/ExecutionsVariablesList.styled.tsx
index 392fe79e3..511fc3143 100644
--- a/src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.styled.tsx
+++ b/src/components/molecules/Variables/ExecutionsVariablesList.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const VariablesList = styled.ul`
   display: flex;
diff --git a/src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.tsx b/src/components/molecules/Variables/ExecutionsVariablesList.tsx
similarity index 88%
rename from src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.tsx
rename to src/components/molecules/Variables/ExecutionsVariablesList.tsx
index a8056599a..482684c97 100644
--- a/src/components/molecules/Variables/ExecutionsVariablesList/ExecutionsVariablesList.tsx
+++ b/src/components/molecules/Variables/ExecutionsVariablesList.tsx
@@ -1,12 +1,12 @@
-import {memo, useEffect, useState} from 'react';
+import {FC, memo, useEffect, useState} from 'react';
 
 import {Popover} from 'antd';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {
   VariableDetailWrapper,
@@ -23,7 +23,7 @@ const arePropsEqual = (prevProps: ExecutionsVariablesListProps, nextProps: Execu
   return JSON.stringify(prevProps.variables) === JSON.stringify(nextProps.variables);
 };
 
-const ExecutionsVariablesList: React.FC<ExecutionsVariablesListProps> = props => {
+export const ExecutionsVariablesList: FC<ExecutionsVariablesListProps> = memo(props => {
   const {variables} = props;
 
   const [secretValuesVisibility, setSecretValuesVisibility] = useState(Array(variables.length).fill(false));
@@ -79,6 +79,4 @@ const ExecutionsVariablesList: React.FC<ExecutionsVariablesListProps> = props =>
       })}
     </VariablesList>
   );
-};
-
-export default memo(ExecutionsVariablesList, arePropsEqual);
+}, arePropsEqual);
diff --git a/src/components/molecules/Variables/ExecutionsVariablesList/index.ts b/src/components/molecules/Variables/ExecutionsVariablesList/index.ts
deleted file mode 100644
index ea80bea2d..000000000
--- a/src/components/molecules/Variables/ExecutionsVariablesList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutionsVariablesList';
diff --git a/src/components/molecules/Variables/TestsVariablesList/TestsVariablesList.tsx b/src/components/molecules/Variables/TestsVariablesList.tsx
similarity index 50%
rename from src/components/molecules/Variables/TestsVariablesList/TestsVariablesList.tsx
rename to src/components/molecules/Variables/TestsVariablesList.tsx
index 248d331cb..b65a74e29 100644
--- a/src/components/molecules/Variables/TestsVariablesList/TestsVariablesList.tsx
+++ b/src/components/molecules/Variables/TestsVariablesList.tsx
@@ -1,18 +1,18 @@
+import {FC} from 'react';
+
 import {FormInstance} from 'antd';
 
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
-import VariablesFormList from '../../VariablesFormList';
+import {VariablesFormList} from '@molecules/VariablesFormList';
 
 type VariablesListProps = {
   data: VariableInForm[];
   form: FormInstance;
 };
 
-const VariablesList: React.FC<VariablesListProps> = props => {
+export const VariablesList: FC<VariablesListProps> = props => {
   const {data, form} = props;
 
   return <VariablesFormList data={data} form={form} />;
 };
-
-export default VariablesList;
diff --git a/src/components/molecules/Variables/TestsVariablesList/index.ts b/src/components/molecules/Variables/TestsVariablesList/index.ts
deleted file mode 100644
index b9a7272ce..000000000
--- a/src/components/molecules/Variables/TestsVariablesList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestsVariablesList';
diff --git a/src/components/molecules/Variables/index.ts b/src/components/molecules/Variables/index.ts
deleted file mode 100644
index 45d45240e..000000000
--- a/src/components/molecules/Variables/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as TestsVariablesList} from './TestsVariablesList';
-export {default as ExecutionsVariablesList} from './ExecutionsVariablesList';
diff --git a/src/components/molecules/VariablesFormList/VariablesFormList.styled.tsx b/src/components/molecules/VariablesFormList.styled.tsx
similarity index 94%
rename from src/components/molecules/VariablesFormList/VariablesFormList.styled.tsx
rename to src/components/molecules/VariablesFormList.styled.tsx
index a9f4a2a92..23ca9bfe0 100644
--- a/src/components/molecules/VariablesFormList/VariablesFormList.styled.tsx
+++ b/src/components/molecules/VariablesFormList.styled.tsx
@@ -2,7 +2,7 @@ import {Form} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledLabelsSpace = styled.div<{noGap?: boolean}>`
   display: flex;
diff --git a/src/components/molecules/VariablesFormList/VariablesFormList.tsx b/src/components/molecules/VariablesFormList.tsx
similarity index 90%
rename from src/components/molecules/VariablesFormList/VariablesFormList.tsx
rename to src/components/molecules/VariablesFormList.tsx
index ce4cf16bc..54c540ce7 100644
--- a/src/components/molecules/VariablesFormList/VariablesFormList.tsx
+++ b/src/components/molecules/VariablesFormList.tsx
@@ -1,19 +1,25 @@
+import {FC} from 'react';
+
 import {DeleteOutlined, EyeInvisibleOutlined, EyeOutlined, PauseOutlined, RightOutlined} from '@ant-design/icons';
 import {Form, FormInstance, Input, Select} from 'antd';
 
-import {Button, FormIconWrapper, FormRow, FullWidthSpace, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FormIconWrapper} from '@custom-antd/Form.styled';
+import {FormRow} from '@custom-antd/Form/FormRow';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
 import {Permissions, usePermission} from '@permissions/base';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-import {validateDuplicateValueByKey} from '@utils';
 import {required} from '@utils/form';
+import {validateDuplicateValueByKey} from '@utils/validate';
 
-import {duplicateKeyMessage, emptyVariableObject, typeOptions} from './VariablesFormList.constants';
 import {StyledButtonsContainer, StyledKeyFormItem} from './VariablesFormList.styled';
+import {duplicateKeyMessage, emptyVariableObject, typeOptions} from './VariablesFormList/VariablesFormList.constants';
 
 type VariablesFormListProps = {
   data: VariableInForm[];
@@ -21,7 +27,7 @@ type VariablesFormListProps = {
   isSaveable?: boolean;
 };
 
-const VariablesFormList: React.FC<VariablesFormListProps> = props => {
+export const VariablesFormList: FC<VariablesFormListProps> = props => {
   const {data, form} = props;
 
   const isButtonVisible = usePermission(Permissions.editEntity);
@@ -136,5 +142,3 @@ const VariablesFormList: React.FC<VariablesFormListProps> = props => {
     </Form.List>
   );
 };
-
-export default VariablesFormList;
diff --git a/src/components/molecules/VariablesFormList/VariablesFormList.constants.tsx b/src/components/molecules/VariablesFormList/VariablesFormList.constants.tsx
index 02ca105ef..39dbaed9d 100644
--- a/src/components/molecules/VariablesFormList/VariablesFormList.constants.tsx
+++ b/src/components/molecules/VariablesFormList/VariablesFormList.constants.tsx
@@ -1,4 +1,4 @@
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
 export const emptyVariableObject: VariableInForm = {
   type: 0,
diff --git a/src/components/molecules/VariablesFormList/index.ts b/src/components/molecules/VariablesFormList/index.ts
deleted file mode 100644
index c0d324ea2..000000000
--- a/src/components/molecules/VariablesFormList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './VariablesFormList';
diff --git a/src/components/molecules/index.ts b/src/components/molecules/index.ts
deleted file mode 100644
index a36a16375..000000000
--- a/src/components/molecules/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export {default as CLICommands} from './CLICommands';
-export {default as CopyCommand} from './CLICommands/CopyCommand';
-export {default as LabelsList} from './LabelsList';
-export {default as ExecutionStepsList} from './ExecutionStepsList';
-export {default as ExecutionName} from './ExecutionName';
-export {default as LogOutput} from './LogOutput';
-export {TestsVariablesList, ExecutionsVariablesList} from './Variables';
-export {default as EntityGrid} from './EntityGrid';
-export {notificationCall, NotificationContent} from './Notification';
-export {default as EndpointModal} from './EndpointModal';
-export {default as ConfigurationCard} from './ConfigurationCard';
-export {default as ArtifactsList} from './ArtifactsList';
-export {default as HelpCard} from './HelpCard';
-export {default as EmptyListContent} from './EmptyListContent';
-export {default as MetricsBarChart} from './MetricsBarChart';
-export {default as LabelsSelect} from './LabelsSelect';
-export {default as Hint} from './Hint';
-export {default as SettingsLeftNavigation} from './SettingsLeftNavigation';
-export {
-  default as SettingsLayout,
-  type SettingsLayoutTab,
-  StyledSettingsContainer,
-  StyledTabContentContainer,
-} from './SettingsLayout';
-export {default as DeleteEntityModal} from './DeleteEntityModal';
-export {default as Definition} from './Definition';
-export {default as DotsDropdown} from './DotsDropdown';
-export {Commit} from './GitFormItems';
-export {Branch} from './GitFormItems';
-export {Repository} from './GitFormItems';
-export {SecretFormItem} from './GitFormItems';
-export {Path} from './GitFormItems';
-export {RevisionSwitcher} from './GitFormItems';
-export {Revision} from './GitFormItems';
-export {default as RunningContext} from './RunningContext';
-export {RunningContextType} from './RunningContext';
-export {default as MessagePanel} from './MessagePanel';
-export {default as InlineNotification} from './InlineNotification';
-export {default as AiInsightsTab} from './AiInsightsTab';
-export {default as SummaryGrid} from './SummaryGrid';
diff --git a/src/components/organisms/EntityDetails/EntityDetails.styled.tsx b/src/components/organisms/EntityDetails.styled.tsx
similarity index 100%
rename from src/components/organisms/EntityDetails/EntityDetails.styled.tsx
rename to src/components/organisms/EntityDetails.styled.tsx
diff --git a/src/components/organisms/EntityDetails/EntityDetailsHeader.tsx b/src/components/organisms/EntityDetails/EntityDetailsHeader.tsx
index 660b82ab3..afa0ef6cc 100644
--- a/src/components/organisms/EntityDetails/EntityDetailsHeader.tsx
+++ b/src/components/organisms/EntityDetails/EntityDetailsHeader.tsx
@@ -5,25 +5,27 @@ import {Select, Space} from 'antd';
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {ExecutorIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
 
-import {Button, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useExecutorIcon from '@hooks/useExecutorIcon';
+import {useExecutorIcon} from '@hooks/useExecutorIcon';
 
-import {Option as OptionType} from '@models/form';
+import type {Option as OptionType} from '@models/form';
 
-import {DotsDropdown, LabelsList, notificationCall} from '@molecules';
+import {DotsDropdown} from '@molecules/DotsDropdown';
+import {LabelsList} from '@molecules/LabelsList';
+import {notificationCall} from '@molecules/Notification';
 
-import {PageHeader} from '@organisms';
+import {EntityDetailsHeaderIcon} from '@organisms/EntityDetails.styled';
+import {PageHeader} from '@organisms/PageBlueprint/PageHeader';
 
 import {Permissions, usePermission} from '@permissions/base';
 
 import {useEntityDetailsField, useEntityDetailsPick} from '@store/entityDetails';
 
-import Colors from '@styles/Colors';
-
-import {EntityDetailsHeaderIcon} from './EntityDetails.styled';
+import {Colors} from '@styles/Colors';
 
 const filterOptions: OptionType[] = [
   {value: 7, label: 'Timeframe: last 7 days', key: 'last7Days'},
@@ -40,7 +42,12 @@ interface EntityDetailsHeaderProps {
   useAbortAllExecutions: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const EntityDetailsHeader: FC<EntityDetailsHeaderProps> = ({isRunning, onRun, onBack, useAbortAllExecutions}) => {
+export const EntityDetailsHeader: FC<EntityDetailsHeaderProps> = ({
+  isRunning,
+  onRun,
+  onBack,
+  useAbortAllExecutions,
+}) => {
   const mayRun = usePermission(Permissions.runEntity);
   const {entity, details} = useEntityDetailsPick('entity', 'details');
   const [daysFilterValue, setDaysFilterValue] = useEntityDetailsField('daysFilterValue');
@@ -106,5 +113,3 @@ const EntityDetailsHeader: FC<EntityDetailsHeaderProps> = ({isRunning, onRun, on
     </PageHeader>
   );
 };
-
-export default EntityDetailsHeader;
diff --git a/src/components/organisms/EntityDetails/EntityDetailsLayer.tsx b/src/components/organisms/EntityDetails/EntityDetailsLayer.tsx
index e4c75c905..d9550a19f 100644
--- a/src/components/organisms/EntityDetails/EntityDetailsLayer.tsx
+++ b/src/components/organisms/EntityDetails/EntityDetailsLayer.tsx
@@ -5,12 +5,13 @@ import useWebSocket from 'react-use-websocket';
 import {UseQuery} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {QueryDefinition} from '@reduxjs/toolkit/query';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {Entity} from '@models/entity';
-import {ExecutionMetrics} from '@models/metrics';
-import {Test} from '@models/test';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {Entity} from '@models/entity';
+import type {ExecutionMetrics} from '@models/metrics';
+import type {Test} from '@models/test';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 import {WSDataWithTestExecution, WSDataWithTestSuiteExecution, WSEventType} from '@models/websocket';
 
 import {useWsEndpoint} from '@services/apiEndpoint';
@@ -31,7 +32,7 @@ interface EntityDetailsLayerProps {
   useGetExecutions: UseQuery<QueryDefinition<any, any, any, any, any>>;
 }
 
-const EntityDetailsLayer: FC<PropsWithChildren<EntityDetailsLayerProps>> = ({
+export const EntityDetailsLayer: FC<PropsWithChildren<EntityDetailsLayerProps>> = ({
   entity,
   id,
   execId,
@@ -221,5 +222,3 @@ const EntityDetailsLayer: FC<PropsWithChildren<EntityDetailsLayerProps>> = ({
 
   return <EntityStoreProvider>{children}</EntityStoreProvider>;
 };
-
-export default EntityDetailsLayer;
diff --git a/src/components/organisms/EntityDetails/ExecutionDetailsLayer.tsx b/src/components/organisms/EntityDetails/ExecutionDetailsLayer.tsx
index 538d7f748..db61d7b6c 100644
--- a/src/components/organisms/EntityDetails/ExecutionDetailsLayer.tsx
+++ b/src/components/organisms/EntityDetails/ExecutionDetailsLayer.tsx
@@ -3,13 +3,13 @@ import React, {FC, PropsWithChildren, useContext, useEffect, useMemo} from 'reac
 import {UseQuery} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {QueryDefinition} from '@reduxjs/toolkit/query';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {Entity} from '@models/entity';
+import type {Entity} from '@models/entity';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
 import {initializeExecutionDetailsStore} from '@store/executionDetails';
 
@@ -24,7 +24,7 @@ export interface ExecutionDetailsLayerProps {
   useGetExecutionDetails: UseQuery<QueryDefinition<any, any, any, any, any>>;
 }
 
-const ExecutionDetailsLayer: FC<PropsWithChildren<ExecutionDetailsLayerProps>> = ({
+export const ExecutionDetailsLayer: FC<PropsWithChildren<ExecutionDetailsLayerProps>> = ({
   entity,
   id,
   execId,
@@ -67,5 +67,3 @@ const ExecutionDetailsLayer: FC<PropsWithChildren<ExecutionDetailsLayerProps>> =
 
   return <ExecutionStoreProvider>{children}</ExecutionStoreProvider>;
 };
-
-export default ExecutionDetailsLayer;
diff --git a/src/components/organisms/EntityDetails/RecentExecutionsTab.tsx b/src/components/organisms/EntityDetails/RecentExecutionsTab.tsx
index 3f4e780fc..5a516142e 100644
--- a/src/components/organisms/EntityDetails/RecentExecutionsTab.tsx
+++ b/src/components/organisms/EntityDetails/RecentExecutionsTab.tsx
@@ -3,9 +3,9 @@ import {FC} from 'react';
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {MetricsBarChart} from '@molecules';
+import {MetricsBarChart} from '@molecules/MetricsBarChart';
 
-import {ExecutionsTable} from '@organisms';
+import {ExecutionsTable} from '@organisms/ExecutionsTable';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
@@ -14,7 +14,7 @@ interface RecentExecutionsTabProps {
   useAbortExecution: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const RecentExecutionsTab: FC<RecentExecutionsTabProps> = ({onRun, useAbortExecution}) => {
+export const RecentExecutionsTab: FC<RecentExecutionsTabProps> = ({onRun, useAbortExecution}) => {
   const {metrics} = useEntityDetailsPick('metrics');
   return (
     <>
@@ -28,5 +28,3 @@ const RecentExecutionsTab: FC<RecentExecutionsTabProps> = ({onRun, useAbortExecu
     </>
   );
 };
-
-export default RecentExecutionsTab;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsGeneral/Labels.tsx b/src/components/organisms/EntityDetails/Settings/SettingsGeneral/Labels.tsx
index 11c5b5c02..7b41b833a 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsGeneral/Labels.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsGeneral/Labels.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
 import {Form} from 'antd';
 
@@ -8,10 +8,12 @@ import {MutationDefinition} from '@reduxjs/toolkit/query';
 
 import {capitalize} from 'lodash';
 
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
-import {ConfigurationCard, LabelsSelect, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {LabelsSelect} from '@molecules/LabelsSelect';
 import {decomposeLabels} from '@molecules/LabelsSelect/utils';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -24,7 +26,7 @@ interface LabelsProps {
   useUpdateEntity: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const Labels: React.FC<LabelsProps> = ({label, useUpdateEntity}) => {
+export const Labels: FC<LabelsProps> = ({label, useUpdateEntity}) => {
   const {details} = useEntityDetailsPick('details');
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -82,5 +84,3 @@ const Labels: React.FC<LabelsProps> = ({label, useUpdateEntity}) => {
     </Form>
   );
 };
-
-export default Labels;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription.tsx b/src/components/organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription.tsx
index fcfc01528..b397b0a0b 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {Form, Input} from 'antd';
 
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
@@ -5,9 +7,11 @@ import {MutationDefinition} from '@reduxjs/toolkit/query';
 
 import {capitalize} from 'lodash';
 
-import {FormItem, FullWidthSpace} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -28,7 +32,7 @@ interface NameNDescriptionProps {
   useUpdateEntity: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const NameNDescription: React.FC<NameNDescriptionProps> = ({label, useUpdateEntity}) => {
+export const NameNDescription: FC<NameNDescriptionProps> = ({label, useUpdateEntity}) => {
   const {details} = useEntityDetailsPick('details');
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -84,5 +88,3 @@ const NameNDescription: React.FC<NameNDescriptionProps> = ({label, useUpdateEnti
     </Form>
   );
 };
-
-export default NameNDescription;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/CronInput.tsx b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/CronInput.tsx
index f933f2b60..0eb31231f 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/CronInput.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/CronInput.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {Input, Tooltip} from 'antd';
 
 type CronInputProps = {
@@ -7,7 +9,7 @@ type CronInputProps = {
   onChange: (value: string) => void;
 };
 
-const CronInput: React.FC<CronInputProps> = props => {
+export const CronInput: FC<CronInputProps> = props => {
   const {value, title, disabled, onChange} = props;
 
   return (
@@ -27,5 +29,3 @@ const CronInput: React.FC<CronInputProps> = props => {
     </Tooltip>
   );
 };
-
-export default CronInput;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/NextExecution.tsx b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/NextExecution.tsx
index c2e78a67b..62f4abbc2 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/NextExecution.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/NextExecution.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 import {useInterval} from 'react-use';
 
 import {formatDuration, intervalToDuration} from 'date-fns';
@@ -7,7 +7,7 @@ type NextExecutionProps = {
   value: string | Date;
 };
 
-const NextExecution: React.FC<NextExecutionProps> = props => {
+export const NextExecution: FC<NextExecutionProps> = props => {
   const {value} = props;
   const [duration, setDuration] = useState('Not scheduled');
 
@@ -22,5 +22,3 @@ const NextExecution: React.FC<NextExecutionProps> = props => {
 
   return <>{duration}</>;
 };
-
-export default NextExecution;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/Schedule.tsx b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/Schedule.tsx
index 5e6afc89b..0119b929a 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/Schedule.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/Schedule.tsx
@@ -1,4 +1,4 @@
-import {useMemo, useState} from 'react';
+import {FC, useMemo, useState} from 'react';
 
 import {WarningOutlined} from '@ant-design/icons';
 import {Form, Select, Tooltip} from 'antd';
@@ -9,21 +9,23 @@ import {MutationDefinition} from '@reduxjs/toolkit/query';
 import parser from 'cron-parser';
 import {capitalize} from 'lodash';
 
-import {FullWidthSpace, Text} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-import Colors from '@styles/Colors';
-import Fonts from '@styles/Fonts';
+import {Colors} from '@styles/Colors';
+import {Fonts} from '@styles/Fonts';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import CronInput from './CronInput';
-import NextExecution from './NextExecution';
+import {CronInput} from './CronInput';
+import {NextExecution} from './NextExecution';
 import {StyledColumn, StyledCronFormat, StyledRow} from './Schedule.styled';
 import {custom, quickOptions} from './utils';
 
@@ -32,7 +34,7 @@ interface ScheduleProps {
   useUpdateEntity: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const Schedule: React.FC<ScheduleProps> = ({label, useUpdateEntity}) => {
+export const Schedule: FC<ScheduleProps> = ({label, useUpdateEntity}) => {
   const {details} = useEntityDetailsPick('details');
   const enabled = usePermission(Permissions.editEntity);
 
@@ -175,5 +177,3 @@ const Schedule: React.FC<ScheduleProps> = ({label, useUpdateEntity}) => {
     </Form>
   );
 };
-
-export default Schedule;
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/index.ts b/src/components/organisms/EntityDetails/Settings/SettingsScheduling/index.ts
deleted file mode 100644
index 73b437229..000000000
--- a/src/components/organisms/EntityDetails/Settings/SettingsScheduling/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Schedule';
diff --git a/src/components/organisms/EntityDetails/Settings/SettingsVariables/Variables.tsx b/src/components/organisms/EntityDetails/Settings/SettingsVariables/Variables.tsx
index 4222f2acf..fc91d0319 100644
--- a/src/components/organisms/EntityDetails/Settings/SettingsVariables/Variables.tsx
+++ b/src/components/organisms/EntityDetails/Settings/SettingsVariables/Variables.tsx
@@ -1,15 +1,17 @@
-import React, {useEffect, useMemo} from 'react';
+import {FC, useEffect, useMemo} from 'react';
 
 import {Form} from 'antd';
 
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
-import {ConfigurationCard, TestsVariablesList, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
+import {VariablesList as TestsVariablesList} from '@molecules/Variables/TestsVariablesList';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -28,7 +30,7 @@ interface VariablesProps {
   useUpdateEntity: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const Variables: React.FC<VariablesProps> = ({description, useUpdateEntity}) => {
+export const Variables: FC<VariablesProps> = ({description, useUpdateEntity}) => {
   const {details} = useEntityDetailsPick('details');
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -117,5 +119,3 @@ const Variables: React.FC<VariablesProps> = ({description, useUpdateEntity}) =>
     </Form>
   );
 };
-
-export default Variables;
diff --git a/src/components/organisms/EntityDetails/index.ts b/src/components/organisms/EntityDetails/index.ts
deleted file mode 100644
index 4ec95a1b7..000000000
--- a/src/components/organisms/EntityDetails/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export {default as Labels} from './Settings/SettingsGeneral/Labels';
-export {default as NameNDescription} from './Settings/SettingsGeneral/NameNDescription';
-export {default as SettingsScheduling} from './Settings/SettingsScheduling';
-export {default as Variables} from './Settings/SettingsVariables/Variables';
-export {default as EntityDetailsLayer} from './EntityDetailsLayer';
-export {default as ExecutionDetailsLayer} from './ExecutionDetailsLayer';
-export {default as EntityDetailsHeader} from './EntityDetailsHeader';
-export {default as RecentExecutionsTab} from './RecentExecutionsTab';
-export {EntityDetailsWrapper} from './EntityDetails.styled';
diff --git a/src/components/organisms/EntityList/EntityListContent/EntityListContent.styled.tsx b/src/components/organisms/EntityList/EntityListContent.styled.tsx
similarity index 93%
rename from src/components/organisms/EntityList/EntityListContent/EntityListContent.styled.tsx
rename to src/components/organisms/EntityList/EntityListContent.styled.tsx
index 64ac54ea8..2997ac68e 100644
--- a/src/components/organisms/EntityList/EntityListContent/EntityListContent.styled.tsx
+++ b/src/components/organisms/EntityList/EntityListContent.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const HeaderContainer = styled.div`
   padding-bottom: 20px;
diff --git a/src/components/organisms/EntityList/EntityListContent/EntityListContent.tsx b/src/components/organisms/EntityList/EntityListContent.tsx
similarity index 84%
rename from src/components/organisms/EntityList/EntityListContent/EntityListContent.tsx
rename to src/components/organisms/EntityList/EntityListContent.tsx
index 1272d3f16..395bf3a56 100644
--- a/src/components/organisms/EntityList/EntityListContent/EntityListContent.tsx
+++ b/src/components/organisms/EntityList/EntityListContent.tsx
@@ -1,21 +1,24 @@
-import React, {memo, useContext, useEffect, useState} from 'react';
+import {FC, memo, useContext, useEffect, useState} from 'react';
 import {useSearchParams} from 'react-router-dom';
 
 import {isEqual, merge} from 'lodash';
 
-import {MainContext, ModalContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
+import {ModalContext} from '@contexts/ModalContext';
 
-import {Button} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
 
-import useTrackTimeAnalytics from '@hooks/useTrackTimeAnalytics';
+import {useTrackTimeAnalytics} from '@hooks/useTrackTimeAnalytics';
 
-import {EntityListBlueprint} from '@models/entity';
+import type {EntityListBlueprint} from '@models/entity';
 
-import {EntityGrid} from '@molecules';
+import {EntityGrid} from '@molecules/EntityGrid';
 
-import {PageHeader, PageToolbar, PageWrapper} from '@organisms';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
+import {PageHeader} from '@organisms/PageBlueprint/PageHeader';
+import {PageToolbar} from '@organisms/PageBlueprint/PageToolbar';
 
-import PageMetadata from '@pages/PageMetadata';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -23,12 +26,11 @@ import {initialPageSize} from '@redux/initialState';
 
 import {useApiEndpoint} from '@services/apiEndpoint';
 
-import Filters from '../EntityListFilters';
-
-import EmptyDataWithFilters from './EmptyDataWithFilters';
 import {StyledFiltersSection} from './EntityListContent.styled';
+import {EmptyDataWithFilters} from './EntityListContent/EmptyDataWithFilters';
+import {EntityListFilters as Filters} from './EntityListFilters';
 
-const EntityListContent: React.FC<EntityListBlueprint> = props => {
+export const EntityListContent: FC<EntityListBlueprint> = memo(props => {
   const {
     itemKey,
     pageTitle,
@@ -176,6 +178,4 @@ const EntityListContent: React.FC<EntityListBlueprint> = props => {
       />
     </PageWrapper>
   );
-};
-
-export default memo(EntityListContent);
+});
diff --git a/src/components/organisms/EntityList/EntityListContent/EmptyDataWithFilters.tsx b/src/components/organisms/EntityList/EntityListContent/EmptyDataWithFilters.tsx
index 282b12e5d..97620943f 100644
--- a/src/components/organisms/EntityList/EntityListContent/EmptyDataWithFilters.tsx
+++ b/src/components/organisms/EntityList/EntityListContent/EmptyDataWithFilters.tsx
@@ -1,4 +1,4 @@
-import {useContext} from 'react';
+import {FC, useContext} from 'react';
 
 import {Space} from 'antd';
 
@@ -6,13 +6,15 @@ import styled from 'styled-components';
 
 import {ReactComponent as EmptySearch} from '@assets/empty-search.svg';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, Text, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
+import {Title} from '@custom-antd/Typography/Title';
 
-import Colors from '@styles/Colors';
+import {StyledButtonContainer} from '@organisms/EntityList/EntityListContent.styled';
 
-import {StyledButtonContainer} from './EntityListContent.styled';
+import {Colors} from '@styles/Colors';
 
 const StyledEmptyTestsDataContainer = styled(Space)`
   display: flex;
@@ -22,7 +24,7 @@ const StyledEmptyTestsDataContainer = styled(Space)`
   justify-content: center;
 `;
 
-const EmptyDataWithFilters: React.FC<any> = props => {
+export const EmptyDataWithFilters: FC<any> = props => {
   const {resetFilters} = props;
 
   const {isClusterAvailable} = useContext(MainContext);
@@ -42,5 +44,3 @@ const EmptyDataWithFilters: React.FC<any> = props => {
     </StyledEmptyTestsDataContainer>
   );
 };
-
-export default EmptyDataWithFilters;
diff --git a/src/components/organisms/EntityList/EntityListContent/index.ts b/src/components/organisms/EntityList/EntityListContent/index.ts
deleted file mode 100644
index a8e20ccd8..000000000
--- a/src/components/organisms/EntityList/EntityListContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EntityListContent';
diff --git a/src/components/organisms/EntityList/EntityListFilters/EntityListFilters.styled.tsx b/src/components/organisms/EntityList/EntityListFilters.styled.tsx
similarity index 100%
rename from src/components/organisms/EntityList/EntityListFilters/EntityListFilters.styled.tsx
rename to src/components/organisms/EntityList/EntityListFilters.styled.tsx
diff --git a/src/components/organisms/EntityList/EntityListFilters/EntityListFilters.tsx b/src/components/organisms/EntityList/EntityListFilters.tsx
similarity index 57%
rename from src/components/organisms/EntityList/EntityListFilters/EntityListFilters.tsx
rename to src/components/organisms/EntityList/EntityListFilters.tsx
index 2ad5be3aa..bab9674bf 100644
--- a/src/components/organisms/EntityList/EntityListFilters/EntityListFilters.tsx
+++ b/src/components/organisms/EntityList/EntityListFilters.tsx
@@ -1,13 +1,13 @@
 import {FC, memo} from 'react';
 
-import {FilterProps} from '@models/filters';
+import type {FilterProps} from '@models/filters';
 
 import {FiltersContainer} from './EntityListFilters.styled';
-import LabelsFilter from './LabelsFilter';
-import StatusFilter from './StatusFilter';
-import TextSearchFilter from './TextSearchFilter';
+import {LabelsFilter} from './EntityListFilters/LabelsFilter';
+import {StatusFilter} from './EntityListFilters/StatusFilter';
+import {TextSearchFilter} from './EntityListFilters/TextSearchFilter';
 
-const EntityListFilters: FC<FilterProps> = props => {
+export const EntityListFilters: FC<FilterProps> = memo(props => {
   const {isFiltersDisabled, ...rest} = props;
 
   return (
@@ -17,6 +17,4 @@ const EntityListFilters: FC<FilterProps> = props => {
       <StatusFilter {...rest} isFiltersDisabled={isFiltersDisabled} />
     </FiltersContainer>
   );
-};
-
-export default memo(EntityListFilters);
+});
diff --git a/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/LabelsFilter.styled.ts b/src/components/organisms/EntityList/EntityListFilters/LabelsFilter.styled.ts
similarity index 100%
rename from src/components/organisms/EntityList/EntityListFilters/LabelsFilter/LabelsFilter.styled.ts
rename to src/components/organisms/EntityList/EntityListFilters/LabelsFilter.styled.ts
diff --git a/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/LabelsFilter.tsx b/src/components/organisms/EntityList/EntityListFilters/LabelsFilter.tsx
similarity index 87%
rename from src/components/organisms/EntityList/EntityListFilters/LabelsFilter/LabelsFilter.tsx
rename to src/components/organisms/EntityList/EntityListFilters/LabelsFilter.tsx
index ed0f536f7..282b14a79 100644
--- a/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/LabelsFilter.tsx
+++ b/src/components/organisms/EntityList/EntityListFilters/LabelsFilter.tsx
@@ -1,20 +1,23 @@
-import {useEffect, useState} from 'react';
+import {FC, useEffect, useState} from 'react';
 
 import {FilterFilled} from '@ant-design/icons';
 
-import {Button, Input, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Input} from '@custom-antd/Input';
+import {Title} from '@custom-antd/Typography/Title';
 
-import usePressEnter from '@hooks/usePressEnter';
+import {usePressEnter} from '@hooks/usePressEnter';
 
-import {Entity, EntityArray} from '@models/entityMap';
-import {FilterProps} from '@models/filters';
+import type {Entity, EntityArray} from '@models/entityMap';
+import type {FilterProps} from '@models/filters';
 
-import {notificationCall} from '@molecules';
-import {FilterMenuFooter, StyledFilterDropdown, StyledFilterLabel, StyledFilterMenu} from '@molecules/FilterMenu';
+import {FilterMenuFooter} from '@molecules/FilterMenu/FilterMenuFooter';
+import {StyledFilterDropdown, StyledFilterLabel, StyledFilterMenu} from '@molecules/FilterMenu/MenuFilter.styled';
+import {notificationCall} from '@molecules/Notification';
 
 import {initialPageSize} from '@redux/initialState';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {EmptyButton, StyledKeyValueRow, StyledLabelsMenuContainer} from './LabelsFilter.styled';
 
@@ -23,7 +26,7 @@ const defaultKeyValuePair: Entity = {
   value: '',
 };
 
-const LabelsFilter: React.FC<FilterProps> = props => {
+export const LabelsFilter: FC<FilterProps> = props => {
   const {setFilters, filters, isFiltersDisabled, width} = props;
 
   const [isVisible, setVisibilityState] = useState(false);
@@ -178,5 +181,3 @@ const LabelsFilter: React.FC<FilterProps> = props => {
     </StyledFilterDropdown>
   );
 };
-
-export default LabelsFilter;
diff --git a/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/index.ts b/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/index.ts
deleted file mode 100644
index 4dcb7e350..000000000
--- a/src/components/organisms/EntityList/EntityListFilters/LabelsFilter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './LabelsFilter';
diff --git a/src/components/organisms/EntityList/EntityListFilters/StatusFilter/StatusFilter.tsx b/src/components/organisms/EntityList/EntityListFilters/StatusFilter.tsx
similarity index 87%
rename from src/components/organisms/EntityList/EntityListFilters/StatusFilter/StatusFilter.tsx
rename to src/components/organisms/EntityList/EntityListFilters/StatusFilter.tsx
index 2507807dd..e9bb423e8 100644
--- a/src/components/organisms/EntityList/EntityListFilters/StatusFilter/StatusFilter.tsx
+++ b/src/components/organisms/EntityList/EntityListFilters/StatusFilter.tsx
@@ -1,27 +1,27 @@
-import {useCallback, useMemo, useState} from 'react';
+import {FC, useCallback, useMemo, useState} from 'react';
 
 import {FilterFilled} from '@ant-design/icons';
 
 import {capitalize} from 'lodash';
 
-import {FilterProps} from '@models/filters';
+import type {FilterProps} from '@models/filters';
 
+import {FilterMenuFooter} from '@molecules/FilterMenu/FilterMenuFooter';
 import {
-  FilterMenuFooter,
   StyledFilterCheckbox,
   StyledFilterDropdown,
   StyledFilterLabel,
   StyledFilterMenu,
   StyledFilterMenuItem,
-} from '@molecules/FilterMenu';
+} from '@molecules/FilterMenu/MenuFilter.styled';
 
 import {initialPageSize} from '@redux/initialState';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 const statusList = ['queued', 'running', 'passed', 'failed', 'aborted'];
 
-const StatusFilter: React.FC<FilterProps> = props => {
+export const StatusFilter: FC<FilterProps> = props => {
   const {filters, setFilters, isFiltersDisabled} = props;
 
   const [isVisible, setVisibilityState] = useState(false);
@@ -95,5 +95,3 @@ const StatusFilter: React.FC<FilterProps> = props => {
     </StyledFilterDropdown>
   );
 };
-
-export default StatusFilter;
diff --git a/src/components/organisms/EntityList/EntityListFilters/StatusFilter/index.ts b/src/components/organisms/EntityList/EntityListFilters/StatusFilter/index.ts
deleted file mode 100644
index 1bfb51c27..000000000
--- a/src/components/organisms/EntityList/EntityListFilters/StatusFilter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './StatusFilter';
diff --git a/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/TextSearchFilter.tsx b/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter.tsx
similarity index 75%
rename from src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/TextSearchFilter.tsx
rename to src/components/organisms/EntityList/EntityListFilters/TextSearchFilter.tsx
index c721801c5..e09636697 100644
--- a/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/TextSearchFilter.tsx
+++ b/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter.tsx
@@ -1,21 +1,21 @@
-import {useEffect, useState} from 'react';
+import {ChangeEvent, FC, useEffect, useState} from 'react';
 import {useDebounce} from 'react-use';
 
 import {SearchOutlined} from '@ant-design/icons';
 import {Input} from 'antd';
 
-import {FilterProps} from '@models/filters';
+import type {FilterProps} from '@models/filters';
 
 import {initialPageSize} from '@redux/initialState';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-const TextSearchFilter: React.FC<FilterProps> = props => {
+export const TextSearchFilter: FC<FilterProps> = props => {
   const {filters, setFilters, isFiltersDisabled} = props;
 
   const [inputValue, setInputValue] = useState(filters.textSearch);
 
-  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onChange = (e: ChangeEvent<HTMLInputElement>) => {
     setInputValue(e.target.value);
   };
 
@@ -43,5 +43,3 @@ const TextSearchFilter: React.FC<FilterProps> = props => {
     />
   );
 };
-
-export default TextSearchFilter;
diff --git a/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/index.ts b/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/index.ts
deleted file mode 100644
index ab95d29e9..000000000
--- a/src/components/organisms/EntityList/EntityListFilters/TextSearchFilter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TextSearchFilter';
diff --git a/src/components/organisms/EntityList/EntityListFilters/index.ts b/src/components/organisms/EntityList/EntityListFilters/index.ts
deleted file mode 100644
index 44e23b01c..000000000
--- a/src/components/organisms/EntityList/EntityListFilters/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EntityListFilters';
diff --git a/src/components/organisms/ExecutionDrawer/ExecutionDrawer.styled.tsx b/src/components/organisms/ExecutionDrawer.styled.tsx
similarity index 100%
rename from src/components/organisms/ExecutionDrawer/ExecutionDrawer.styled.tsx
rename to src/components/organisms/ExecutionDrawer.styled.tsx
diff --git a/src/components/organisms/ExecutionDrawer/ExecutionDrawer.tsx b/src/components/organisms/ExecutionDrawer.tsx
similarity index 89%
rename from src/components/organisms/ExecutionDrawer/ExecutionDrawer.tsx
rename to src/components/organisms/ExecutionDrawer.tsx
index fa4638b62..8aad07edc 100644
--- a/src/components/organisms/ExecutionDrawer/ExecutionDrawer.tsx
+++ b/src/components/organisms/ExecutionDrawer.tsx
@@ -2,7 +2,7 @@ import {FC, PropsWithChildren, ReactElement} from 'react';
 
 import {LoadingOutlined} from '@ant-design/icons';
 
-import useIsMobile from '@hooks/useIsMobile';
+import {useIsMobile} from '@hooks/useIsMobile';
 
 import {useLogOutputPick} from '@store/logOutput';
 
@@ -23,7 +23,13 @@ interface ExecutionDrawerProps {
   onClose: () => void;
 }
 
-const ExecutionDrawer: FC<PropsWithChildren<ExecutionDrawerProps>> = ({header, open, loading, onClose, children}) => {
+export const ExecutionDrawer: FC<PropsWithChildren<ExecutionDrawerProps>> = ({
+  header,
+  open,
+  loading,
+  onClose,
+  children,
+}) => {
   const {isFullscreen: isFullscreenLogOutput} = useLogOutputPick('isFullscreen');
   const isMobile = useIsMobile();
 
@@ -76,5 +82,3 @@ const ExecutionDrawer: FC<PropsWithChildren<ExecutionDrawerProps>> = ({header, o
     </StyledDrawer>
   );
 };
-
-export default ExecutionDrawer;
diff --git a/src/components/organisms/ExecutionDrawer/ExecutionDrawerHeader.tsx b/src/components/organisms/ExecutionDrawer/ExecutionDrawerHeader.tsx
index e3b821391..34613edca 100644
--- a/src/components/organisms/ExecutionDrawer/ExecutionDrawerHeader.tsx
+++ b/src/components/organisms/ExecutionDrawer/ExecutionDrawerHeader.tsx
@@ -5,31 +5,32 @@ import {CloseOutlined} from '@ant-design/icons';
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {StatusIcon} from '@atoms';
+import {StatusIcon} from '@atoms/StatusIcon';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Execution} from '@models/execution';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {Execution} from '@models/execution';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
-import {DotsDropdown, RunningContext} from '@molecules';
+import {DotsDropdown} from '@molecules/DotsDropdown';
+import {RunningContext} from '@molecules/RunningContext';
+
+import {DrawerHeader, HeaderContent, ItemColumn, ItemRow} from '@organisms/ExecutionDrawer.styled';
 
 import {Permissions, usePermission} from '@permissions/base';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {formatDuration, formatExecutionDate} from '@utils/formatDate';
 
-import {DrawerHeader, HeaderContent, ItemColumn, ItemRow} from './ExecutionDrawer.styled';
-
 interface ExecutionDrawerHeaderProps {
   useAbortExecution: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const ExecutionDrawerHeader: FC<ExecutionDrawerHeaderProps> = ({useAbortExecution}) => {
+export const ExecutionDrawerHeader: FC<ExecutionDrawerHeaderProps> = ({useAbortExecution}) => {
   const {entity, id} = useEntityDetailsPick('entity', 'id');
   const {close, data, id: execId} = useExecutionDetailsPick('close', 'data', 'id');
   const mayManageExecution = usePermission(Permissions.manageEntityExecution);
@@ -104,5 +105,3 @@ const ExecutionDrawerHeader: FC<ExecutionDrawerHeaderProps> = ({useAbortExecutio
     </DrawerHeader>
   );
 };
-
-export default ExecutionDrawerHeader;
diff --git a/src/components/organisms/ExecutionDrawer/index.ts b/src/components/organisms/ExecutionDrawer/index.ts
deleted file mode 100644
index 7377c8554..000000000
--- a/src/components/organisms/ExecutionDrawer/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default} from './ExecutionDrawer';
-export {default as ExecutionDrawerHeader} from './ExecutionDrawerHeader';
diff --git a/src/components/organisms/ExecutionsTable/ExecutionsTable.tsx b/src/components/organisms/ExecutionsTable.tsx
similarity index 87%
rename from src/components/organisms/ExecutionsTable/ExecutionsTable.tsx
rename to src/components/organisms/ExecutionsTable.tsx
index 7d84cbbbe..5f3df707e 100644
--- a/src/components/organisms/ExecutionsTable/ExecutionsTable.tsx
+++ b/src/components/organisms/ExecutionsTable.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react';
+import {FC, useCallback} from 'react';
 
 import {Table} from 'antd';
 import {TableRowSelection} from 'antd/lib/table/interface';
@@ -6,20 +6,20 @@ import {TableRowSelection} from 'antd/lib/table/interface';
 import {UseMutation} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import {Skeleton} from '@custom-antd';
+import {Skeleton} from '@custom-antd/Skeleton';
 
 import {useEntityDetailsField, useEntityDetailsPick} from '@store/entityDetails';
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
-import EmptyExecutionsListContent from './EmptyExecutionsListContent';
-import TableRow from './TableRow';
+import {EmptyExecutionsListContent} from './ExecutionsTable/EmptyExecutionsListContent';
+import {TableRow} from './ExecutionsTable/TableRow';
 
 interface ExecutionsTableProps {
   onRun: () => void;
   useAbortExecution: UseMutation<MutationDefinition<any, any, any, any, any>>;
 }
 
-const ExecutionsTable: React.FC<ExecutionsTableProps> = ({onRun, useAbortExecution}) => {
+export const ExecutionsTable: FC<ExecutionsTableProps> = ({onRun, useAbortExecution}) => {
   const [currentPage, setCurrentPage] = useEntityDetailsField('currentPage');
   const {executions, id, isFirstTimeLoading} = useEntityDetailsPick('executions', 'id', 'isFirstTimeLoading');
   const {id: execId, open} = useExecutionDetailsPick('id', 'open');
@@ -87,5 +87,3 @@ const ExecutionsTable: React.FC<ExecutionsTableProps> = ({onRun, useAbortExecuti
     />
   );
 };
-
-export default ExecutionsTable;
diff --git a/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/EmptyExecutionsListContent.tsx b/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent.tsx
similarity index 90%
rename from src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/EmptyExecutionsListContent.tsx
rename to src/components/organisms/ExecutionsTable/EmptyExecutionsListContent.tsx
index 40ff3ba5d..1e8aa7423 100644
--- a/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/EmptyExecutionsListContent.tsx
+++ b/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -14,7 +15,7 @@ type EmptyExecutionsListContentProps = {
   onRun: () => void;
 };
 
-const EmptyExecutionsListContent: React.FC<EmptyExecutionsListContentProps> = props => {
+export const EmptyExecutionsListContent: FC<EmptyExecutionsListContentProps> = props => {
   const {onRun} = props;
 
   const {id, entity, details} = useEntityDetailsPick('id', 'entity', 'details');
@@ -80,5 +81,3 @@ const EmptyExecutionsListContent: React.FC<EmptyExecutionsListContentProps> = pr
     />
   );
 };
-
-export default EmptyExecutionsListContent;
diff --git a/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/index.ts b/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/index.ts
deleted file mode 100644
index e7ccab472..000000000
--- a/src/components/organisms/ExecutionsTable/EmptyExecutionsListContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EmptyExecutionsListContent';
diff --git a/src/components/organisms/ExecutionsTable/TableRow/TableRow.styled.tsx b/src/components/organisms/ExecutionsTable/TableRow.styled.tsx
similarity index 91%
rename from src/components/organisms/ExecutionsTable/TableRow/TableRow.styled.tsx
rename to src/components/organisms/ExecutionsTable/TableRow.styled.tsx
index c735af54a..767110afc 100644
--- a/src/components/organisms/ExecutionsTable/TableRow/TableRow.styled.tsx
+++ b/src/components/organisms/ExecutionsTable/TableRow.styled.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
 export const ItemWrapper = styled.div`
diff --git a/src/components/organisms/ExecutionsTable/TableRow/TableRow.tsx b/src/components/organisms/ExecutionsTable/TableRow.tsx
similarity index 56%
rename from src/components/organisms/ExecutionsTable/TableRow/TableRow.tsx
rename to src/components/organisms/ExecutionsTable/TableRow.tsx
index a604971e0..382b009d7 100644
--- a/src/components/organisms/ExecutionsTable/TableRow/TableRow.tsx
+++ b/src/components/organisms/ExecutionsTable/TableRow.tsx
@@ -1,12 +1,10 @@
-import React from 'react';
+import {FC} from 'react';
 
 import {Permissions, usePermission} from '@permissions/base';
 
-import TableRowPure from './TableRowPure';
+import {TableRowPure} from './TableRow/TableRowPure';
 
-const TableRow: React.FC<{data: any; onAbortExecution: any}> = props => {
+export const TableRow: FC<{data: any; onAbortExecution: any}> = props => {
   const mayManageExecution = usePermission(Permissions.manageEntityExecution);
   return <TableRowPure {...props} mayManageExecution={mayManageExecution} />;
 };
-
-export default TableRow;
diff --git a/src/components/organisms/ExecutionsTable/TableRow/TableRowPure.tsx b/src/components/organisms/ExecutionsTable/TableRow/TableRowPure.tsx
index 72b1fef02..71847eaca 100644
--- a/src/components/organisms/ExecutionsTable/TableRow/TableRowPure.tsx
+++ b/src/components/organisms/ExecutionsTable/TableRow/TableRowPure.tsx
@@ -1,23 +1,30 @@
-import React, {memo, useCallback, useMemo} from 'react';
+import {FC, memo, useCallback, useMemo} from 'react';
 
 import {Tooltip} from 'antd';
 
-import {StatusIcon} from '@atoms';
+import {StatusIcon} from '@atoms/StatusIcon';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useIsRunning from '@hooks/useIsRunning';
+import {useIsRunning} from '@hooks/useIsRunning';
 
-import {DotsDropdown} from '@molecules';
+import {DotsDropdown} from '@molecules/DotsDropdown';
 
-import Colors from '@styles/Colors';
+import {
+  DetailsWrapper,
+  DotsWrapper,
+  ItemColumn,
+  ItemRow,
+  ItemWrapper,
+  StatusText,
+} from '@organisms/ExecutionsTable/TableRow.styled';
+
+import {Colors} from '@styles/Colors';
 
 import {displayTimeBetweenDates} from '@utils/displayTimeBetweenDates';
 import {formatDuration, formatExecutionDate} from '@utils/formatDate';
 
-import {DetailsWrapper, DotsWrapper, ItemColumn, ItemRow, ItemWrapper, StatusText} from './TableRow.styled';
-
-const TableRowPure: React.FC<{data: any; onAbortExecution: any; mayManageExecution: boolean}> = memo(props => {
+export const TableRowPure: FC<{data: any; onAbortExecution: any; mayManageExecution: boolean}> = memo(props => {
   const {data, onAbortExecution, mayManageExecution} = props;
   const {status, number, startTime, name, id, durationMs} = data;
 
@@ -88,5 +95,3 @@ const TableRowPure: React.FC<{data: any; onAbortExecution: any; mayManageExecuti
     </ItemWrapper>
   );
 });
-
-export default TableRowPure;
diff --git a/src/components/organisms/ExecutionsTable/TableRow/index.ts b/src/components/organisms/ExecutionsTable/TableRow/index.ts
deleted file mode 100644
index 654a135c2..000000000
--- a/src/components/organisms/ExecutionsTable/TableRow/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TableRow';
diff --git a/src/components/organisms/ExecutionsTable/index.ts b/src/components/organisms/ExecutionsTable/index.ts
deleted file mode 100644
index 33fe8e535..000000000
--- a/src/components/organisms/ExecutionsTable/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutionsTable';
diff --git a/src/components/organisms/PageBlueprint/PageBlueprint.styled.tsx b/src/components/organisms/PageBlueprint.styled.tsx
similarity index 100%
rename from src/components/organisms/PageBlueprint/PageBlueprint.styled.tsx
rename to src/components/organisms/PageBlueprint.styled.tsx
diff --git a/src/components/organisms/PageBlueprint/PageBlueprint.tsx b/src/components/organisms/PageBlueprint.tsx
similarity index 58%
rename from src/components/organisms/PageBlueprint/PageBlueprint.tsx
rename to src/components/organisms/PageBlueprint.tsx
index cf510603b..c18cce9fa 100644
--- a/src/components/organisms/PageBlueprint/PageBlueprint.tsx
+++ b/src/components/organisms/PageBlueprint.tsx
@@ -1,17 +1,17 @@
-import {PropsWithChildren} from 'react';
+import {FC, PropsWithChildren, ReactNode} from 'react';
 
-import PageMetadata from '@pages/PageMetadata';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {PageWrapper} from './PageBlueprint.styled';
-import PageHeader from './PageHeader';
+import {PageHeader} from './PageBlueprint/PageHeader';
 
 type PageBlueprintProps = {
   title: string;
-  description: React.ReactNode;
-  headerButton?: React.ReactNode;
+  description: ReactNode;
+  headerButton?: ReactNode;
 };
 
-const PageBlueprint: React.FC<PropsWithChildren<PageBlueprintProps>> = props => {
+export const PageBlueprint: FC<PropsWithChildren<PageBlueprintProps>> = props => {
   const {children, title, description, headerButton} = props;
 
   return (
@@ -22,5 +22,3 @@ const PageBlueprint: React.FC<PropsWithChildren<PageBlueprintProps>> = props =>
     </PageWrapper>
   );
 };
-
-export default PageBlueprint;
diff --git a/src/components/organisms/PageBlueprint/PageHeader.tsx b/src/components/organisms/PageBlueprint/PageHeader.tsx
index 685a67e5d..cd02fab1b 100644
--- a/src/components/organisms/PageBlueprint/PageHeader.tsx
+++ b/src/components/organisms/PageBlueprint/PageHeader.tsx
@@ -1,13 +1,14 @@
-import React, {FC, ReactNode, memo} from 'react';
+import {Children, FC, ReactNode, memo} from 'react';
 
 import {LoadingOutlined} from '@ant-design/icons';
 import {PageHeaderProps as AntdPageHeaderProps} from 'antd';
 
-import {FullWidthSpace, Text} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {PageTitle, StyledPageHeader} from '@organisms/PageBlueprint.styled';
 
-import {PageTitle, StyledPageHeader} from './PageBlueprint.styled';
+import {Colors} from '@styles/Colors';
 
 type PageHeaderProps = {
   pageTitleAddon?: ReactNode;
@@ -15,32 +16,32 @@ type PageHeaderProps = {
   loading?: boolean;
 } & AntdPageHeaderProps;
 
-const PageHeader: FC<PageHeaderProps> = ({title, pageTitleAddon, description, loading, children, ...props}) => (
-  <StyledPageHeader
-    {...props}
-    title={
-      loading ? (
-        <>
-          {title} <LoadingOutlined />
-        </>
-      ) : (
-        <PageTitle>
-          {title} {pageTitleAddon}
-        </PageTitle>
-      )
-    }
-  >
-    {React.Children.count(children) > 0 || description ? (
-      <FullWidthSpace direction="vertical" size={15}>
-        {description ? (
-          <Text className="regular middle" color={Colors.slate400}>
-            {description}
-          </Text>
-        ) : null}
-        {children}
-      </FullWidthSpace>
-    ) : null}
-  </StyledPageHeader>
+export const PageHeader: FC<PageHeaderProps> = memo(
+  ({title, pageTitleAddon, description, loading, children, ...props}) => (
+    <StyledPageHeader
+      {...props}
+      title={
+        loading ? (
+          <>
+            {title} <LoadingOutlined />
+          </>
+        ) : (
+          <PageTitle>
+            {title} {pageTitleAddon}
+          </PageTitle>
+        )
+      }
+    >
+      {Children.count(children) > 0 || description ? (
+        <FullWidthSpace direction="vertical" size={15}>
+          {description ? (
+            <Text className="regular middle" color={Colors.slate400}>
+              {description}
+            </Text>
+          ) : null}
+          {children}
+        </FullWidthSpace>
+      ) : null}
+    </StyledPageHeader>
+  )
 );
-
-export default memo(PageHeader);
diff --git a/src/components/organisms/PageBlueprint/PageToolbar.tsx b/src/components/organisms/PageBlueprint/PageToolbar.tsx
index cf3a346ab..62a90b0a9 100644
--- a/src/components/organisms/PageBlueprint/PageToolbar.tsx
+++ b/src/components/organisms/PageBlueprint/PageToolbar.tsx
@@ -1,16 +1,14 @@
-import React, {FC, PropsWithChildren, ReactElement, memo} from 'react';
+import {Children, FC, PropsWithChildren, ReactElement, memo} from 'react';
 
-import {ToolbarContainer, ToolbarContent, ToolbarExtra} from './PageBlueprint.styled';
+import {ToolbarContainer, ToolbarContent, ToolbarExtra} from '@organisms/PageBlueprint.styled';
 
 interface PageToolbarProps {
   extra?: ReactElement<any, any> | null;
 }
 
-const PageToolbar: FC<PropsWithChildren<PageToolbarProps>> = ({extra, children}) => (
+export const PageToolbar: FC<PropsWithChildren<PageToolbarProps>> = memo(({extra, children}) => (
   <ToolbarContainer>
     <ToolbarContent>{children}</ToolbarContent>
-    {React.Children.count(extra) ? <ToolbarExtra>{extra}</ToolbarExtra> : null}
+    {Children.count(extra) ? <ToolbarExtra>{extra}</ToolbarExtra> : null}
   </ToolbarContainer>
-);
-
-export default memo(PageToolbar);
+));
diff --git a/src/components/organisms/PageBlueprint/index.ts b/src/components/organisms/PageBlueprint/index.ts
deleted file mode 100644
index a1236ab8f..000000000
--- a/src/components/organisms/PageBlueprint/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {default} from './PageBlueprint';
-export {PageWrapper} from './PageBlueprint.styled';
-export {default as PageHeader} from './PageHeader';
-export {default as PageToolbar} from './PageToolbar';
diff --git a/src/components/organisms/Sider/Sider.styled.tsx b/src/components/organisms/Sider.styled.tsx
similarity index 96%
rename from src/components/organisms/Sider/Sider.styled.tsx
rename to src/components/organisms/Sider.styled.tsx
index 7e77a0375..131620419 100644
--- a/src/components/organisms/Sider/Sider.styled.tsx
+++ b/src/components/organisms/Sider.styled.tsx
@@ -2,10 +2,10 @@ import {Layout, Space} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 import {maxDevice} from '@styles/MediaQueries';
 
-import SiderLink from './SiderLink';
+import {SiderLink} from './Sider/SiderLink';
 
 export const StyledLogo = styled.div`
   display: flex;
diff --git a/src/components/organisms/Sider/Sider.tsx b/src/components/organisms/Sider.tsx
similarity index 93%
rename from src/components/organisms/Sider/Sider.tsx
rename to src/components/organisms/Sider.tsx
index fa615cea9..e617fc4ec 100644
--- a/src/components/organisms/Sider/Sider.tsx
+++ b/src/components/organisms/Sider.tsx
@@ -1,4 +1,4 @@
-import {useContext, useMemo} from 'react';
+import {FC, useContext, useMemo} from 'react';
 
 import {QuestionCircleOutlined} from '@ant-design/icons';
 import {Popover, Tooltip} from 'antd';
@@ -10,17 +10,18 @@ import {ReactComponent as Logo} from '@assets/testkube-symbol-color.svg';
 import {ReactComponent as TestsIcon} from '@assets/tests-icon.svg';
 import {ReactComponent as TriggersIcon} from '@assets/triggers.svg';
 
-import {Icon} from '@atoms';
+import {Icon} from '@atoms/Icon';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
-import {FullWidthSpace, Text} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
 import {ReactComponent as SettingIcon} from '@icons/setting.svg';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -34,7 +35,7 @@ import {
   StyledSiderChildContainer,
   StyledSiderLink,
 } from './Sider.styled';
-import SiderLink from './SiderLink';
+import {SiderLink} from './Sider/SiderLink';
 
 const DEFAULT_ICON_STYLE = {
   fontSize: 24,
@@ -97,7 +98,7 @@ const getRoutes = (showSocialLinksInSider: boolean) => [
       ]),
 ];
 
-const Sider: React.FC = () => {
+export const Sider: FC = () => {
   const {showLogoInSider, showSocialLinksInSider} = useContext(DashboardContext);
   const openSettings = useDashboardNavigate('/settings');
 
@@ -221,5 +222,3 @@ const Sider: React.FC = () => {
     </StyledSider>
   );
 };
-
-export default Sider;
diff --git a/src/components/organisms/Sider/SiderLink.tsx b/src/components/organisms/Sider/SiderLink.tsx
index 240c6e700..7f2a85636 100644
--- a/src/components/organisms/Sider/SiderLink.tsx
+++ b/src/components/organisms/Sider/SiderLink.tsx
@@ -1,15 +1,15 @@
-import {AnchorHTMLAttributes, MouseEvent, useCallback, useContext} from 'react';
+import {AnchorHTMLAttributes, FC, MouseEvent, useCallback, useContext} from 'react';
 
 import classNames from 'classnames';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
 export interface SiderLinkProps {
   href: string;
   active?: RegExp;
 }
 
-const SiderLink: React.FC<SiderLinkProps & AnchorHTMLAttributes<HTMLAnchorElement>> = ({
+export const SiderLink: FC<SiderLinkProps & AnchorHTMLAttributes<HTMLAnchorElement>> = ({
   href,
   active,
   className,
@@ -38,5 +38,3 @@ const SiderLink: React.FC<SiderLinkProps & AnchorHTMLAttributes<HTMLAnchorElemen
     </a>
   );
 };
-
-export default SiderLink;
diff --git a/src/components/organisms/Sider/index.ts b/src/components/organisms/Sider/index.ts
deleted file mode 100644
index 794279d44..000000000
--- a/src/components/organisms/Sider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Sider';
diff --git a/src/components/organisms/TestConfigurationForm/TestConfigurationForm.styled.ts b/src/components/organisms/TestConfigurationForm.styled.ts
similarity index 100%
rename from src/components/organisms/TestConfigurationForm/TestConfigurationForm.styled.ts
rename to src/components/organisms/TestConfigurationForm.styled.ts
diff --git a/src/components/organisms/TestConfigurationForm/Custom/CreationFormFields.tsx b/src/components/organisms/TestConfigurationForm/Custom/CreationFormFields.tsx
index 192fbef4c..74ec3c568 100644
--- a/src/components/organisms/TestConfigurationForm/Custom/CreationFormFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/Custom/CreationFormFields.tsx
@@ -1,9 +1,12 @@
-import {Branch, Path} from '@molecules';
+import {FC} from 'react';
 
-import {StyledFormSpace} from '../TestConfigurationForm.styled';
-import {Props} from '../utils';
+import {Branch} from '@molecules/GitFormItems/Branch';
+import {Path} from '@molecules/GitFormItems/Path';
 
-const CustomFormFields: React.FC<Partial<Props>> = props => {
+import {StyledFormSpace} from '@organisms/TestConfigurationForm.styled';
+import type {Props} from '@organisms/TestConfigurationForm/utils';
+
+export const CustomFormFields: FC<Partial<Props>> = props => {
   const {executorType} = props as Pick<Props, 'executorType'>;
 
   return (
@@ -13,5 +16,3 @@ const CustomFormFields: React.FC<Partial<Props>> = props => {
     </StyledFormSpace>
   );
 };
-
-export default CustomFormFields;
diff --git a/src/components/organisms/TestConfigurationForm/Custom/SourceEditFormFields.tsx b/src/components/organisms/TestConfigurationForm/Custom/SourceEditFormFields.tsx
index 917a76f1f..e5afb5908 100644
--- a/src/components/organisms/TestConfigurationForm/Custom/SourceEditFormFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/Custom/SourceEditFormFields.tsx
@@ -1,9 +1,12 @@
-import {Path, Revision} from '@molecules';
+import {FC} from 'react';
 
-import {StyledFormSpace} from '../TestConfigurationForm.styled';
-import {Props} from '../utils';
+import {Path} from '@molecules/GitFormItems/Path';
+import {Revision} from '@molecules/GitFormItems/Revision';
 
-const CustomFormFields: React.FC<Partial<Props>> = props => {
+import {StyledFormSpace} from '@organisms/TestConfigurationForm.styled';
+import type {Props} from '@organisms/TestConfigurationForm/utils';
+
+export const CustomFormFields: FC<Partial<Props>> = props => {
   const {executorType} = props as Pick<Props, 'executorType'>;
 
   return (
@@ -13,5 +16,3 @@ const CustomFormFields: React.FC<Partial<Props>> = props => {
     </StyledFormSpace>
   );
 };
-
-export default CustomFormFields;
diff --git a/src/components/organisms/TestConfigurationForm/Custom/index.ts b/src/components/organisms/TestConfigurationForm/Custom/index.ts
deleted file mode 100644
index 8eb176d57..000000000
--- a/src/components/organisms/TestConfigurationForm/Custom/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as CreationFormFields} from './CreationFormFields';
-export {default as SourceEditFormFields} from './SourceEditFormFields';
diff --git a/src/components/organisms/TestConfigurationForm/FileContentFields/FileContentFields.tsx b/src/components/organisms/TestConfigurationForm/FileContentFields.tsx
similarity index 71%
rename from src/components/organisms/TestConfigurationForm/FileContentFields/FileContentFields.tsx
rename to src/components/organisms/TestConfigurationForm/FileContentFields.tsx
index 217fcb068..76afc25ef 100644
--- a/src/components/organisms/TestConfigurationForm/FileContentFields/FileContentFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/FileContentFields.tsx
@@ -1,15 +1,17 @@
+import {FC} from 'react';
+
 import {FormInstance} from 'antd';
 import {UploadChangeParam} from 'antd/lib/upload';
 
-import {UploadWithInput} from '@atoms';
+import {UploadWithInput} from '@atoms/UploadWithInput';
 
-import {FormItem} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
 
 import {required} from '@utils/form';
 
-import {onFileChange} from './utils';
+import {onFileChange} from './FileContentFields/utils';
 
-const FileContentFields: React.FC = () => {
+export const FileContentFields: FC = () => {
   return (
     <FormItem noStyle shouldUpdate={(prevValues, currentValues) => prevValues.testSource !== currentValues.testSource}>
       {form => {
@@ -24,5 +26,3 @@ const FileContentFields: React.FC = () => {
     </FormItem>
   );
 };
-
-export default FileContentFields;
diff --git a/src/components/organisms/TestConfigurationForm/FileContentFields/index.ts b/src/components/organisms/TestConfigurationForm/FileContentFields/index.ts
deleted file mode 100644
index 2a56cf8fd..000000000
--- a/src/components/organisms/TestConfigurationForm/FileContentFields/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './FileContentFields';
diff --git a/src/components/organisms/TestConfigurationForm/Git/CreationFormFields.tsx b/src/components/organisms/TestConfigurationForm/Git/CreationFormFields.tsx
index af4ff1da0..0ad235738 100644
--- a/src/components/organisms/TestConfigurationForm/Git/CreationFormFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/Git/CreationFormFields.tsx
@@ -1,15 +1,18 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
-import useValidateRepository from '@hooks/useValidateRepository';
+import {useValidateRepository} from '@hooks/useValidateRepository';
 
-import {Branch, Path, Repository, SecretFormItem} from '@molecules';
+import {Branch} from '@molecules/GitFormItems/Branch';
+import {Path} from '@molecules/GitFormItems/Path';
+import {Repository} from '@molecules/GitFormItems/Repository';
+import {SecretFormItem} from '@molecules/GitFormItems/SecretFormItem';
 
-import {useValidateRepositoryMutation} from '@services/repository';
+import {StyledFormSpace} from '@organisms/TestConfigurationForm.styled';
+import type {Props} from '@organisms/TestConfigurationForm/utils';
 
-import {StyledFormSpace} from '../TestConfigurationForm.styled';
-import {Props} from '../utils';
+import {useValidateRepositoryMutation} from '@services/repository';
 
-const GitFormFields: React.FC<Partial<Props>> = props => {
+export const GitFormFields: FC<Partial<Props>> = props => {
   const {executorType, getFieldValue} = props as Pick<Props, 'executorType' | 'getFieldValue'>;
 
   const [validationState, setValidationState] = useState<any>({message: ''});
@@ -33,5 +36,3 @@ const GitFormFields: React.FC<Partial<Props>> = props => {
     </StyledFormSpace>
   );
 };
-
-export default GitFormFields;
diff --git a/src/components/organisms/TestConfigurationForm/Git/SourceEditFormFields.tsx b/src/components/organisms/TestConfigurationForm/Git/SourceEditFormFields.tsx
index 0f1ef6613..dbc896117 100644
--- a/src/components/organisms/TestConfigurationForm/Git/SourceEditFormFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/Git/SourceEditFormFields.tsx
@@ -1,15 +1,18 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
-import useValidateRepository, {ValidationState} from '@hooks/useValidateRepository';
+import {ValidationState, useValidateRepository} from '@hooks/useValidateRepository';
 
-import {Path, Repository, Revision, SecretFormItem} from '@molecules';
+import {Path} from '@molecules/GitFormItems/Path';
+import {Repository} from '@molecules/GitFormItems/Repository';
+import {Revision} from '@molecules/GitFormItems/Revision';
+import {SecretFormItem} from '@molecules/GitFormItems/SecretFormItem';
 
-import {useValidateRepositoryMutation} from '@services/repository';
+import {StyledFormSpace} from '@organisms/TestConfigurationForm.styled';
+import type {Props} from '@organisms/TestConfigurationForm/utils';
 
-import {StyledFormSpace} from '../TestConfigurationForm.styled';
-import {Props} from '../utils';
+import {useValidateRepositoryMutation} from '@services/repository';
 
-const SourceEdit: React.FC<Partial<Props>> = props => {
+export const SourceEdit: FC<Partial<Props>> = props => {
   const {executorType, isClearedToken, setIsClearedToken, isClearedUsername, setIsClearedUsername, getFieldValue} =
     props as Props;
 
@@ -49,5 +52,3 @@ const SourceEdit: React.FC<Partial<Props>> = props => {
     </StyledFormSpace>
   );
 };
-
-export default SourceEdit;
diff --git a/src/components/organisms/TestConfigurationForm/Git/index.ts b/src/components/organisms/TestConfigurationForm/Git/index.ts
deleted file mode 100644
index b368d3c89..000000000
--- a/src/components/organisms/TestConfigurationForm/Git/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as CreationForm} from './CreationFormFields';
-export {default as SourceEdit} from './SourceEditFormFields';
diff --git a/src/components/organisms/TestConfigurationForm/StringContentFields/StringContentFields.tsx b/src/components/organisms/TestConfigurationForm/StringContentFields.tsx
similarity index 78%
rename from src/components/organisms/TestConfigurationForm/StringContentFields/StringContentFields.tsx
rename to src/components/organisms/TestConfigurationForm/StringContentFields.tsx
index b596d9e20..6040131de 100644
--- a/src/components/organisms/TestConfigurationForm/StringContentFields/StringContentFields.tsx
+++ b/src/components/organisms/TestConfigurationForm/StringContentFields.tsx
@@ -1,12 +1,14 @@
+import {FC} from 'react';
+
 import TextArea from 'antd/lib/input/TextArea';
 
-import {FormItem} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
 
-import Fonts from '@styles/Fonts';
+import {Fonts} from '@styles/Fonts';
 
 import {required} from '@utils/form';
 
-import {Props} from '../utils';
+import type {Props} from './utils';
 
 export const stringPlaceholders: Record<string, string> = {
   curl: `e.g.:
@@ -30,7 +32,7 @@ export default function () {
 }`,
 };
 
-const StringContentFields: React.FC<Partial<Props>> = props => {
+export const StringContentFields: FC<Partial<Props>> = props => {
   const {executorType} = props;
 
   const placeholder = stringPlaceholders[executorType!] || 'String...';
@@ -40,5 +42,3 @@ const StringContentFields: React.FC<Partial<Props>> = props => {
     </FormItem>
   );
 };
-
-export default StringContentFields;
diff --git a/src/components/organisms/TestConfigurationForm/StringContentFields/index.ts b/src/components/organisms/TestConfigurationForm/StringContentFields/index.ts
deleted file mode 100644
index c3d63d5d5..000000000
--- a/src/components/organisms/TestConfigurationForm/StringContentFields/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './StringContentFields';
diff --git a/src/components/organisms/TestConfigurationForm/index.ts b/src/components/organisms/TestConfigurationForm/index.ts
deleted file mode 100644
index 9f284bdf5..000000000
--- a/src/components/organisms/TestConfigurationForm/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export {
-  CreationFormFields as CustomCreationFormFields,
-  SourceEditFormFields as CustomSourceEditFormFields,
-} from './Custom';
-export {default as FileContentFields} from './FileContentFields';
-export {default as StringContentFields} from './StringContentFields';
-export {CreationForm as GitCreationFormFields, SourceEdit as SourceEditFormFields} from './Git';
diff --git a/src/components/organisms/TestConfigurationForm/utils.tsx b/src/components/organisms/TestConfigurationForm/utils.tsx
index 12bdc5ced..89b694c3c 100644
--- a/src/components/organisms/TestConfigurationForm/utils.tsx
+++ b/src/components/organisms/TestConfigurationForm/utils.tsx
@@ -1,16 +1,18 @@
+import {Dispatch, FC, SetStateAction} from 'react';
+
 import {NamePath} from 'antd/lib/form/interface';
 
 export type SourceType = 'git' | 'custom' | 'file-uri' | 'string';
 
-export type SourceFields = Record<SourceType, React.FC<Partial<Props>>>;
+export type SourceFields = Record<SourceType, FC<Partial<Props>>>;
 
 export type Props = {
   executorType: string;
   getFieldValue: (name: NamePath) => string;
   isClearedToken: boolean;
   isClearedUsername: boolean;
-  setIsClearedToken: React.Dispatch<React.SetStateAction<boolean>>;
-  setIsClearedUsername: React.Dispatch<React.SetStateAction<boolean>>;
+  setIsClearedToken: Dispatch<SetStateAction<boolean>>;
+  setIsClearedUsername: Dispatch<SetStateAction<boolean>>;
 };
 
 export const getAdditionalFieldsComponent: (
diff --git a/src/components/organisms/TriggersFormItems/ActionFormItems.tsx b/src/components/organisms/TriggersFormItems/ActionFormItems.tsx
index d11d49221..d1e94a7c6 100644
--- a/src/components/organisms/TriggersFormItems/ActionFormItems.tsx
+++ b/src/components/organisms/TriggersFormItems/ActionFormItems.tsx
@@ -2,16 +2,16 @@ import {useEffect, useState} from 'react';
 
 import {Form, Select, Space} from 'antd';
 
-import {LabelsSelect} from '@molecules';
+import {LabelsSelect} from '@molecules/LabelsSelect';
 
 import {useTriggersPick} from '@store/triggers';
 
 import {required} from '@utils/form';
 
-import ResourceTriggerSelect from './ResourceTriggerSelect';
-import TriggerSelectorSwitcher from './TriggerSelectorSwitcher';
+import {ResourceTriggerSelect} from './ResourceTriggerSelect';
+import {TriggerSelectorSwitcher} from './TriggerSelectorSwitcher';
 
-const ActionFormItems = () => {
+export const ActionFormItems = () => {
   const {keyMap} = useTriggersPick('keyMap');
 
   const [switcherValue, setSwitcherValue] = useState('label');
@@ -60,5 +60,3 @@ const ActionFormItems = () => {
     </>
   );
 };
-
-export default ActionFormItems;
diff --git a/src/components/organisms/TriggersFormItems/ConditionFormItems.tsx b/src/components/organisms/TriggersFormItems/ConditionFormItems.tsx
index c6a11b377..97ebdf0ce 100644
--- a/src/components/organisms/TriggersFormItems/ConditionFormItems.tsx
+++ b/src/components/organisms/TriggersFormItems/ConditionFormItems.tsx
@@ -2,15 +2,15 @@ import {useEffect, useState} from 'react';
 
 import {Form, Input, Select, Space} from 'antd';
 
-import {LabelsSelect} from '@molecules';
+import {LabelsSelect} from '@molecules/LabelsSelect';
 
 import {useTriggersPick} from '@store/triggers';
 
 import {required} from '@utils/form';
 
-import TriggerSelectorSwitcher from './TriggerSelectorSwitcher';
+import {TriggerSelectorSwitcher} from './TriggerSelectorSwitcher';
 
-const ConditionFormItems = () => {
+export const ConditionFormItems = () => {
   const {keyMap} = useTriggersPick('keyMap');
 
   const [switcherValue, setSwitcherValue] = useState('label');
@@ -69,5 +69,3 @@ const ConditionFormItems = () => {
     </>
   );
 };
-
-export default ConditionFormItems;
diff --git a/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/ResourceTriggerSelect.styled.tsx b/src/components/organisms/TriggersFormItems/ResourceTriggerSelect.styled.tsx
similarity index 100%
rename from src/components/organisms/TriggersFormItems/ResourceTriggerSelect/ResourceTriggerSelect.styled.tsx
rename to src/components/organisms/TriggersFormItems/ResourceTriggerSelect.styled.tsx
diff --git a/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/ResourceTriggerSelect.tsx b/src/components/organisms/TriggersFormItems/ResourceTriggerSelect.tsx
similarity index 89%
rename from src/components/organisms/TriggersFormItems/ResourceTriggerSelect/ResourceTriggerSelect.tsx
rename to src/components/organisms/TriggersFormItems/ResourceTriggerSelect.tsx
index 56ab549c1..4f6175b5d 100644
--- a/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/ResourceTriggerSelect.tsx
+++ b/src/components/organisms/TriggersFormItems/ResourceTriggerSelect.tsx
@@ -4,11 +4,11 @@ import {Select} from 'antd';
 
 import {ReactComponent as TestSuitesIcon} from '@assets/test-suites-icon.svg';
 
-import {ExecutorIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectExecutors} from '@redux/reducers/executorsSlice';
@@ -17,7 +17,7 @@ import {getTestExecutorIcon} from '@redux/utils/executorIcon';
 import {useGetAllTestSuitesQuery} from '@services/testSuites';
 import {useGetAllTestsQuery} from '@services/tests';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {StyledResourceOptionWrapper} from './ResourceTriggerSelect.styled';
 
@@ -29,7 +29,7 @@ interface ResourceTriggerSelectProps {
   onChange?: (value: string) => void;
 }
 
-const ResourceTriggerSelect: FC<ResourceTriggerSelectProps> = ({...props}) => {
+export const ResourceTriggerSelect: FC<ResourceTriggerSelectProps> = ({...props}) => {
   const {isClusterAvailable} = useContext(MainContext);
 
   const executors = useAppSelector(selectExecutors);
@@ -83,5 +83,3 @@ const ResourceTriggerSelect: FC<ResourceTriggerSelectProps> = ({...props}) => {
     </Select>
   );
 };
-
-export default ResourceTriggerSelect;
diff --git a/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/index.ts b/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/index.ts
deleted file mode 100644
index f5477995e..000000000
--- a/src/components/organisms/TriggersFormItems/ResourceTriggerSelect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ResourceTriggerSelect';
diff --git a/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/TriggerSelectorSwitcher.tsx b/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher.tsx
similarity index 75%
rename from src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/TriggerSelectorSwitcher.tsx
rename to src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher.tsx
index 14ffcb8bf..ab905fceb 100644
--- a/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/TriggerSelectorSwitcher.tsx
+++ b/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher.tsx
@@ -1,3 +1,5 @@
+import {FC} from 'react';
+
 import {Segmented} from 'antd';
 
 type TriggerSelectorSwitcherProps = {
@@ -5,7 +7,7 @@ type TriggerSelectorSwitcherProps = {
   onChange: (value: string) => void;
 };
 
-const TriggerSelectorSwitcher: React.FC<TriggerSelectorSwitcherProps> = props => {
+export const TriggerSelectorSwitcher: FC<TriggerSelectorSwitcherProps> = props => {
   const {value, onChange} = props;
 
   return (
@@ -19,5 +21,3 @@ const TriggerSelectorSwitcher: React.FC<TriggerSelectorSwitcherProps> = props =>
     />
   );
 };
-
-export default TriggerSelectorSwitcher;
diff --git a/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/index.ts b/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/index.ts
deleted file mode 100644
index ebc22f53d..000000000
--- a/src/components/organisms/TriggersFormItems/TriggerSelectorSwitcher/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggerSelectorSwitcher';
diff --git a/src/components/organisms/TriggersFormItems/index.ts b/src/components/organisms/TriggersFormItems/index.ts
deleted file mode 100644
index 45d124ad0..000000000
--- a/src/components/organisms/TriggersFormItems/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {default as ConditionFormItems} from './ConditionFormItems';
-export {default as ActionFormItems} from './ActionFormItems';
diff --git a/src/components/organisms/index.ts b/src/components/organisms/index.ts
deleted file mode 100644
index d9bcdbe71..000000000
--- a/src/components/organisms/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export {default as Sider} from './Sider';
-export {default as EntityListContent} from './EntityList/EntityListContent';
-export {default as PageBlueprint, PageHeader, PageWrapper, PageToolbar} from './PageBlueprint';
-export {ConditionFormItems} from './TriggersFormItems';
-export {ActionFormItems} from './TriggersFormItems';
-export {default as ExecutionDrawer, ExecutionDrawerHeader} from './ExecutionDrawer';
-export {default as ExecutionsTable} from './ExecutionsTable';
diff --git a/src/components/pages/EndpointProcessing/EndpointProcessing.styled.ts b/src/components/pages/EndpointProcessing.styled.ts
similarity index 100%
rename from src/components/pages/EndpointProcessing/EndpointProcessing.styled.ts
rename to src/components/pages/EndpointProcessing.styled.ts
diff --git a/src/components/pages/EndpointProcessing/EndpointProcessing.tsx b/src/components/pages/EndpointProcessing.tsx
similarity index 73%
rename from src/components/pages/EndpointProcessing/EndpointProcessing.tsx
rename to src/components/pages/EndpointProcessing.tsx
index dca80ca61..ed7cfd3ef 100644
--- a/src/components/pages/EndpointProcessing/EndpointProcessing.tsx
+++ b/src/components/pages/EndpointProcessing.tsx
@@ -1,15 +1,15 @@
-import {useEffect} from 'react';
+import {FC, useEffect} from 'react';
 
-import {Title} from '@custom-antd';
+import {Title} from '@custom-antd/Typography/Title';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useURLSearchParams from '@hooks/useURLSearchParams';
+import {useURLSearchParams} from '@hooks/useURLSearchParams';
 
 import {saveApiEndpoint} from '@services/apiEndpoint';
 
 import {EndpointProcessingContainer} from './EndpointProcessing.styled';
 
-const EndpointProcessing: React.FC = () => {
+export const EndpointProcessing: FC = () => {
   const searchParams = useURLSearchParams();
   const openMainPage = useDashboardNavigate('/');
 
@@ -26,5 +26,3 @@ const EndpointProcessing: React.FC = () => {
     </EndpointProcessingContainer>
   );
 };
-
-export default EndpointProcessing;
diff --git a/src/components/pages/EndpointProcessing/index.ts b/src/components/pages/EndpointProcessing/index.ts
deleted file mode 100644
index f5f27fab4..000000000
--- a/src/components/pages/EndpointProcessing/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './EndpointProcessing';
diff --git a/src/components/pages/Error/Error.styled.ts b/src/components/pages/Error.styled.ts
similarity index 91%
rename from src/components/pages/Error/Error.styled.ts
rename to src/components/pages/Error.styled.ts
index d01a99d48..4d7fb68b1 100644
--- a/src/components/pages/Error/Error.styled.ts
+++ b/src/components/pages/Error.styled.ts
@@ -2,7 +2,7 @@ import {Space} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledErrorContainer = styled(Space)`
   display: flex;
diff --git a/src/components/pages/Error/Error.tsx b/src/components/pages/Error.tsx
similarity index 80%
rename from src/components/pages/Error/Error.tsx
rename to src/components/pages/Error.tsx
index e4e930860..316c94bbb 100644
--- a/src/components/pages/Error/Error.tsx
+++ b/src/components/pages/Error.tsx
@@ -5,11 +5,12 @@ import {Image} from 'antd';
 
 import notFoundImage from '@assets/not-found-image.svg';
 
-import {Button, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Title} from '@custom-antd/Typography/Title';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {StyledErrorContainer, StyledErrorDescription} from './Error.styled';
 
@@ -20,7 +21,7 @@ interface ErrorProps {
   buttonLabel?: ReactNode;
 }
 
-const Error: FC<ErrorProps> = ({title, description, buttonUrl, buttonLabel}) => {
+export const Error: FC<ErrorProps> = ({title, description, buttonUrl, buttonLabel}) => {
   const back = useDashboardNavigate(buttonUrl ?? -1);
   return (
     <StyledErrorContainer size={32}>
@@ -35,5 +36,3 @@ const Error: FC<ErrorProps> = ({title, description, buttonUrl, buttonLabel}) =>
     </StyledErrorContainer>
   );
 };
-
-export default Error;
diff --git a/src/components/pages/Error/index.ts b/src/components/pages/Error/index.ts
deleted file mode 100644
index de801561e..000000000
--- a/src/components/pages/Error/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Error';
diff --git a/src/components/pages/ErrorBoundary/ErrorBoundary.styled.tsx b/src/components/pages/ErrorBoundary.styled.tsx
similarity index 92%
rename from src/components/pages/ErrorBoundary/ErrorBoundary.styled.tsx
rename to src/components/pages/ErrorBoundary.styled.tsx
index 272e3a34a..de864d1d1 100644
--- a/src/components/pages/ErrorBoundary/ErrorBoundary.styled.tsx
+++ b/src/components/pages/ErrorBoundary.styled.tsx
@@ -2,7 +2,7 @@ import {Image, Space} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const StyledErrorImage = styled(Image)``;
 
diff --git a/src/components/pages/ErrorBoundary/ErrorBoundary.tsx b/src/components/pages/ErrorBoundary.tsx
similarity index 61%
rename from src/components/pages/ErrorBoundary/ErrorBoundary.tsx
rename to src/components/pages/ErrorBoundary.tsx
index f9a1df1f9..2c26c6b56 100644
--- a/src/components/pages/ErrorBoundary/ErrorBoundary.tsx
+++ b/src/components/pages/ErrorBoundary.tsx
@@ -1,10 +1,10 @@
-import React, {useContext, useEffect, useState} from 'react';
+import {ReactNode, useContext, useEffect, useState} from 'react';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
-import ErrorBoundaryInner from './ErrorBoundaryInner';
+import {ErrorBoundary as ErrorBoundaryInner} from './ErrorBoundary/ErrorBoundaryInner';
 
-export default function ErrorBoundary({children}: {children: React.ReactNode}) {
+export function ErrorBoundary({children}: {children: ReactNode}) {
   const {location} = useContext(DashboardContext);
   const [hasError, setHasError] = useState(false);
 
diff --git a/src/components/pages/ErrorBoundary/ErrorBoundaryFallback.tsx b/src/components/pages/ErrorBoundary/ErrorBoundaryFallback.tsx
index acff9a9ea..4d8348726 100644
--- a/src/components/pages/ErrorBoundary/ErrorBoundaryFallback.tsx
+++ b/src/components/pages/ErrorBoundary/ErrorBoundaryFallback.tsx
@@ -1,20 +1,21 @@
-import {useContext} from 'react';
+import {FC, useContext} from 'react';
 
 import notFoundImage from '@assets/not-found-image.svg';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {ConfigContext} from '@contexts';
+import {ConfigContext} from '@contexts/ConfigContext';
 
-import {Button, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Title} from '@custom-antd/Typography/Title';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import Colors from '@styles/Colors';
+import {StyledErrorContainer, StyledErrorDescription, StyledErrorImage} from '@pages/ErrorBoundary.styled';
 
-import {StyledErrorContainer, StyledErrorDescription, StyledErrorImage} from './ErrorBoundary.styled';
+import {Colors} from '@styles/Colors';
 
-const ErrorBoundaryFallback: React.FC = () => {
+export const ErrorBoundaryFallback: FC = () => {
   const {discordUrl} = useContext(ConfigContext);
   const back = useDashboardNavigate('/');
 
@@ -38,5 +39,3 @@ const ErrorBoundaryFallback: React.FC = () => {
     </StyledErrorContainer>
   );
 };
-
-export default ErrorBoundaryFallback;
diff --git a/src/components/pages/ErrorBoundary/ErrorBoundaryInner.tsx b/src/components/pages/ErrorBoundary/ErrorBoundaryInner.tsx
index 745eaab61..dc3dc71c8 100644
--- a/src/components/pages/ErrorBoundary/ErrorBoundaryInner.tsx
+++ b/src/components/pages/ErrorBoundary/ErrorBoundaryInner.tsx
@@ -1,13 +1,13 @@
-import React, {PropsWithChildren} from 'react';
+import {Component, PropsWithChildren} from 'react';
 
-import ErrorBoundaryFallback from './ErrorBoundaryFallback';
+import {ErrorBoundaryFallback} from './ErrorBoundaryFallback';
 
 type ErrorBoundaryInnerProps = {
   hasError: boolean;
   setHasError: (has: boolean) => void;
 };
 
-class ErrorBoundary extends React.Component<PropsWithChildren<ErrorBoundaryInnerProps>, {hasError: boolean}> {
+export class ErrorBoundary extends Component<PropsWithChildren<ErrorBoundaryInnerProps>, {hasError: boolean}> {
   constructor(props: any) {
     super(props);
     this.state = {hasError: false};
@@ -44,5 +44,3 @@ class ErrorBoundary extends React.Component<PropsWithChildren<ErrorBoundaryInner
     return children;
   }
 }
-
-export default ErrorBoundary;
diff --git a/src/components/pages/ErrorBoundary/index.ts b/src/components/pages/ErrorBoundary/index.ts
deleted file mode 100644
index 57f320c35..000000000
--- a/src/components/pages/ErrorBoundary/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ErrorBoundary';
diff --git a/src/components/pages/Executors/Executors.tsx b/src/components/pages/Executors.tsx
similarity index 64%
rename from src/components/pages/Executors/Executors.tsx
rename to src/components/pages/Executors.tsx
index 90504d3a9..c4761bd47 100644
--- a/src/components/pages/Executors/Executors.tsx
+++ b/src/components/pages/Executors.tsx
@@ -1,11 +1,11 @@
+import {FC} from 'react';
 import {Outlet, Route, Routes} from 'react-router-dom';
 
-import {NotFound} from '@pages';
+import {ExecutorDetails} from './Executors/ExecutorDetails';
+import {Executors as ExecutorsList} from './Executors/ExecutorsList';
+import {NotFound} from './NotFound';
 
-import ExecutorDetails from './ExecutorDetails';
-import ExecutorsList from './ExecutorsList';
-
-const Executors: React.FC = () => {
+export const Executors: FC = () => {
   return (
     <>
       <Routes>
@@ -20,5 +20,3 @@ const Executors: React.FC = () => {
     </>
   );
 };
-
-export default Executors;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorDetails.tsx b/src/components/pages/Executors/ExecutorDetails.tsx
similarity index 79%
rename from src/components/pages/Executors/ExecutorDetails/ExecutorDetails.tsx
rename to src/components/pages/Executors/ExecutorDetails.tsx
index f56bd664e..0b77d4b1f 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorDetails.tsx
+++ b/src/components/pages/Executors/ExecutorDetails.tsx
@@ -1,16 +1,18 @@
-import {useCallback, useContext, useEffect} from 'react';
+import {FC, useCallback, useContext, useEffect} from 'react';
 import {useParams} from 'react-router-dom';
 
 import {Tabs} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {PageHeader, PageWrapper} from '@organisms';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
+import {PageHeader} from '@organisms/PageBlueprint/PageHeader';
 
-import {Error, Loading} from '@pages';
-import PageMetadata from '@pages/PageMetadata';
+import {Error} from '@pages/Error';
+import {Loading} from '@pages/Loading';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectCurrentExecutor, setCurrentExecutor, setExecutorData} from '@redux/reducers/executorsSlice';
@@ -19,9 +21,9 @@ import {useGetExecutorDetailsQuery} from '@services/executors';
 
 import {safeRefetch} from '@utils/fetchUtils';
 
-import ExecutorSettings from './ExecutorSettings';
+import {ExecutorSettings} from './ExecutorDetails/ExecutorSettings';
 
-const ExecutorDetails: React.FC = () => {
+export const ExecutorDetails: FC = () => {
   const {dispatch, isClusterAvailable} = useContext(MainContext);
   const {id: name, settingsTab = 'general'} = useParams() as {id: string; settingsTab?: string};
 
@@ -71,5 +73,3 @@ const ExecutorDetails: React.FC = () => {
     </PageWrapper>
   );
 };
-
-export default ExecutorDetails;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorSettings.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings.tsx
similarity index 56%
rename from src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorSettings.tsx
rename to src/components/pages/Executors/ExecutorDetails/ExecutorSettings.tsx
index cd536f4d6..fc94968a1 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorSettings.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings.tsx
@@ -1,11 +1,11 @@
 import {FC, memo} from 'react';
 
-import {SettingsLayout} from '@molecules';
+import {SettingsLayout} from '@molecules/SettingsLayout';
 
-import CommandAndArguments from './CommandAndArguments';
-import ContainerImage from './ContainerImage';
-import ExecutorDefinition from './ExecutorDefinition';
-import General from './General';
+import {CommandAndArguments} from './ExecutorSettings/CommandAndArguments';
+import {ContainerImage} from './ExecutorSettings/ContainerImage';
+import {ExecutorDefinition} from './ExecutorSettings/ExecutorDefinition';
+import {General} from './ExecutorSettings/General';
 
 interface ExecutorSettingsProps {
   reload: () => void;
@@ -13,7 +13,7 @@ interface ExecutorSettingsProps {
   onTabChange: (tab: string) => void;
 }
 
-const ExecutorSettings: FC<ExecutorSettingsProps> = ({reload, tab, onTabChange}) => (
+export const ExecutorSettings: FC<ExecutorSettingsProps> = memo(({reload, tab, onTabChange}) => (
   <SettingsLayout
     active={tab}
     onChange={onTabChange}
@@ -24,6 +24,4 @@ const ExecutorSettings: FC<ExecutorSettingsProps> = ({reload, tab, onTabChange})
       {id: 'definition', label: 'Definition', children: <ExecutorDefinition reload={reload} />},
     ]}
   />
-);
-
-export default memo(ExecutorSettings);
+));
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments.tsx
new file mode 100644
index 000000000..d2979dae1
--- /dev/null
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments.tsx
@@ -0,0 +1,11 @@
+import {FC} from 'react';
+
+import {Arguments} from './CommandAndArguments/Arguments';
+import {Command} from './CommandAndArguments/Command';
+
+export const CommandAndArguments: FC = () => (
+  <>
+    <Command />
+    <Arguments />
+  </>
+);
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.styled.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.styled.tsx
index eb400746d..95460764b 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.styled.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.styled.tsx
@@ -2,8 +2,8 @@ import {Button, Form} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
-import Fonts from '@styles/Fonts';
+import {Colors} from '@styles/Colors';
+import {Fonts} from '@styles/Fonts';
 
 export const VariablesListContainer = styled.div`
   display: flex;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.tsx
index 5a5b3d827..c6b1e97cc 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Arguments.tsx
@@ -1,13 +1,18 @@
-import {useContext, useEffect} from 'react';
+import {FC, useContext, useEffect} from 'react';
 
 import {DeleteOutlined} from '@ant-design/icons';
 import {Form, Input} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, FormIconWrapper, FormItem, FormRow, FullWidthSpace} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FormIconWrapper} from '@custom-antd/Form.styled';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormRow} from '@custom-antd/Form/FormRow';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -25,7 +30,7 @@ type ArgumentsFormFields = {
   arguments: string[];
 };
 
-const Arguments: React.FC = () => {
+export const Arguments: FC = () => {
   const {executor, name: executorName} = useAppSelector(selectCurrentExecutor);
   const {args} = executor;
 
@@ -104,5 +109,3 @@ const Arguments: React.FC = () => {
     </Form>
   );
 };
-
-export default Arguments;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Command.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Command.tsx
index a9f4fb491..430c7fdda 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Command.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/Command.tsx
@@ -1,14 +1,15 @@
-import {useContext, useEffect} from 'react';
+import {FC, useContext, useEffect} from 'react';
 
 import {Form} from 'antd';
 
-import {CommandInput} from '@atoms';
+import {CommandInput} from '@atoms/CommandInput';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
 import {Executor} from '@models/executors';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -23,7 +24,7 @@ type CommandFormFields = {
   command: string;
 };
 
-const Command: React.FC = () => {
+export const Command: FC = () => {
   const {dispatch} = useContext(MainContext);
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -82,5 +83,3 @@ const Command: React.FC = () => {
     </Form>
   );
 };
-
-export default Command;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/CommandAndArguments.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/CommandAndArguments.tsx
deleted file mode 100644
index ffeca0c52..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/CommandAndArguments.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import Arguments from './Arguments';
-import Command from './Command';
-
-const CommandAndArguments: React.FC = () => (
-  <>
-    <Command />
-    <Arguments />
-  </>
-);
-
-export default CommandAndArguments;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/index.ts b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/index.ts
deleted file mode 100644
index 76c5b10be..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/CommandAndArguments/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './CommandAndArguments';
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage.tsx
new file mode 100644
index 000000000..f675c92f6
--- /dev/null
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage.tsx
@@ -0,0 +1,11 @@
+import {FC} from 'react';
+
+import {ContainerImagePanel} from './ContainerImage/ContainerImagePanel';
+import {PrivateRegistry} from './ContainerImage/PrivateRegistry';
+
+export const ContainerImage: FC = () => (
+  <>
+    <ContainerImagePanel />
+    <PrivateRegistry />
+  </>
+);
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImage.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImage.tsx
deleted file mode 100644
index cd108ab96..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImage.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import ContainerImagePanel from './ContainerImagePanel';
-import PrivateRegistry from './PrivateRegistry';
-
-const ContainerImage: React.FC = () => (
-  <>
-    <ContainerImagePanel />
-    <PrivateRegistry />
-  </>
-);
-
-export default ContainerImage;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImagePanel.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImagePanel.tsx
index 8e23f2276..251da5621 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImagePanel.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/ContainerImagePanel.tsx
@@ -1,12 +1,13 @@
-import {useContext, useEffect} from 'react';
+import {FC, useContext, useEffect} from 'react';
 
 import {Form, Input} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
 import {Executor} from '@models/executors';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -22,7 +23,7 @@ export type ContainerImageFormFields = {
   image: Executor['executor']['image'];
 };
 
-const ContainerImagePanel: React.FC = () => {
+export const ContainerImagePanel: FC = () => {
   const {executor, name} = useAppSelector(selectCurrentExecutor);
   const image = executor?.image;
 
@@ -81,5 +82,3 @@ const ContainerImagePanel: React.FC = () => {
     </Form>
   );
 };
-
-export default ContainerImagePanel;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/PrivateRegistry.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/PrivateRegistry.tsx
index 7a628d4ce..54a96857e 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/PrivateRegistry.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/PrivateRegistry.tsx
@@ -1,10 +1,11 @@
-import {useContext, useEffect} from 'react';
+import {FC, useContext, useEffect} from 'react';
 
 import {Form, Input} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -19,7 +20,7 @@ export type PrivateRegistryFormFields = {
   privateRegistry: string;
 };
 
-const PrivateRegistry: React.FC = () => {
+export const PrivateRegistry: FC = () => {
   const {executor, name} = useAppSelector(selectCurrentExecutor);
   const {imagePullSecrets} = executor;
 
@@ -81,5 +82,3 @@ const PrivateRegistry: React.FC = () => {
     </Form>
   );
 };
-
-export default PrivateRegistry;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/index.ts b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/index.ts
deleted file mode 100644
index 32138efdd..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ContainerImage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ContainerImage';
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/ExecutorDefinition.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition.tsx
similarity index 87%
rename from src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/ExecutorDefinition.tsx
rename to src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition.tsx
index d70d0ce62..f7977a217 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/ExecutorDefinition.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition.tsx
@@ -1,6 +1,6 @@
 import {FC} from 'react';
 
-import {Definition} from '@molecules';
+import {Definition} from '@molecules/Definition';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectCurrentExecutor} from '@redux/reducers/executorsSlice';
@@ -14,7 +14,7 @@ interface ExecutorDefinitionProps {
   reload: () => void;
 }
 
-const ExecutorDefinition: FC<ExecutorDefinitionProps> = ({reload}) => {
+export const ExecutorDefinition: FC<ExecutorDefinitionProps> = ({reload}) => {
   const executor = useAppSelector(selectCurrentExecutor)!;
   return (
     <Definition
@@ -33,5 +33,3 @@ const ExecutorDefinition: FC<ExecutorDefinitionProps> = ({reload}) => {
     />
   );
 };
-
-export default ExecutorDefinition;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/index.ts b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/index.ts
deleted file mode 100644
index 206346f3a..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/ExecutorDefinition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutorDefinition';
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/General.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General.tsx
similarity index 83%
rename from src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/General.tsx
rename to src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General.tsx
index 65b003767..2e4635360 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/General.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General.tsx
@@ -1,4 +1,6 @@
-import {Delete} from '@molecules/CommonSettings';
+import {FC} from 'react';
+
+import {Delete} from '@molecules/CommonSettings/Delete';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -7,9 +9,9 @@ import {selectCurrentExecutor} from '@redux/reducers/executorsSlice';
 
 import {useDeleteExecutorMutation} from '@services/executors';
 
-import NameNType from './NameNType';
+import {NameNType} from './General/NameNType';
 
-const General: React.FC = () => {
+export const General: FC = () => {
   const mayDelete = usePermission(Permissions.deleteEntity);
   const executor = useAppSelector(selectCurrentExecutor);
 
@@ -28,5 +30,3 @@ const General: React.FC = () => {
     </>
   );
 };
-
-export default General;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/NameNType.tsx b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/NameNType.tsx
index eaef38130..931a4c3a9 100644
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/NameNType.tsx
+++ b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/NameNType.tsx
@@ -1,10 +1,10 @@
-import React, {useEffect} from 'react';
+import {FC, useEffect} from 'react';
 
 import {Form} from 'antd';
 
-import {Input} from '@custom-antd';
+import {Input} from '@custom-antd/Input';
 
-import {ConfigurationCard} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectCurrentExecutor} from '@redux/reducers/executorsSlice';
@@ -14,7 +14,7 @@ type NameNTypeFormValues = {
   type: string;
 };
 
-const NameNType: React.FC = () => {
+export const NameNType: FC = () => {
   const [form] = Form.useForm<NameNTypeFormValues>();
 
   const {name, executor} = useAppSelector(selectCurrentExecutor);
@@ -52,5 +52,3 @@ const NameNType: React.FC = () => {
     </Form>
   );
 };
-
-export default NameNType;
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/index.ts b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/index.ts
deleted file mode 100644
index 0d5590eb6..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/General/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './General';
diff --git a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/index.ts b/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/index.ts
deleted file mode 100644
index 3f15d7016..000000000
--- a/src/components/pages/Executors/ExecutorDetails/ExecutorSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutorSettings';
diff --git a/src/components/pages/Executors/ExecutorDetails/index.ts b/src/components/pages/Executors/ExecutorDetails/index.ts
deleted file mode 100644
index 983a8a6df..000000000
--- a/src/components/pages/Executors/ExecutorDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutorDetails';
diff --git a/src/components/pages/Executors/ExecutorsList/ExecutorsList.styled.tsx b/src/components/pages/Executors/ExecutorsList.styled.tsx
similarity index 97%
rename from src/components/pages/Executors/ExecutorsList/ExecutorsList.styled.tsx
rename to src/components/pages/Executors/ExecutorsList.styled.tsx
index 52e67bb29..a79a53621 100644
--- a/src/components/pages/Executors/ExecutorsList/ExecutorsList.styled.tsx
+++ b/src/components/pages/Executors/ExecutorsList.styled.tsx
@@ -2,7 +2,7 @@ import {Space} from 'antd';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const ExecutorsGridItem = styled(Space)`
   justify-content: space-between;
diff --git a/src/components/pages/Executors/ExecutorsList/ExecutorsList.tsx b/src/components/pages/Executors/ExecutorsList.tsx
similarity index 80%
rename from src/components/pages/Executors/ExecutorsList/ExecutorsList.tsx
rename to src/components/pages/Executors/ExecutorsList.tsx
index 7afaac4c6..eab927b7d 100644
--- a/src/components/pages/Executors/ExecutorsList/ExecutorsList.tsx
+++ b/src/components/pages/Executors/ExecutorsList.tsx
@@ -1,18 +1,19 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
 import {Tabs} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, Modal} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {CustomModal as Modal} from '@custom-antd/Modal';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {EntityGrid} from '@molecules';
+import {EntityGrid} from '@molecules/EntityGrid';
 
-import {PageBlueprint} from '@organisms';
+import {PageBlueprint} from '@organisms/PageBlueprint';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -22,14 +23,13 @@ import {useGetExecutorsQuery} from '@services/executors';
 import {externalLinks} from '@utils/externalLinks';
 import {safeRefetch} from '@utils/fetchUtils';
 
-import {executorsList} from '../utils';
+import {AddExecutorsModal} from './ExecutorsList/AddExecutorsModal';
+import {CustomExecutorCard} from './ExecutorsList/CustomExecutorCard';
+import {EmptyCustomExecutors} from './ExecutorsList/EmptyCustomExecutors';
+import {ExecutorCard} from './ExecutorsList/ExecutorCard';
+import {executorsList} from './utils';
 
-import AddExecutorsModal from './AddExecutorsModal';
-import CustomExecutorCard from './CustomExecutorCard';
-import EmptyCustomExecutors from './EmptyCustomExecutors';
-import ExecutorCard from './ExecutorCard';
-
-const Executors: React.FC = () => {
+export const Executors: FC = () => {
   const {isClusterAvailable} = useContext(MainContext);
   const openDetails = useDashboardNavigate(({name}: {name: string}) => `/executors/${name}`);
   const mayCreate = usePermission(Permissions.createEntity);
@@ -109,5 +109,3 @@ const Executors: React.FC = () => {
     </PageBlueprint>
   );
 };
-
-export default Executors;
diff --git a/src/components/pages/Executors/ExecutorsList/AddExecutorsModal.tsx b/src/components/pages/Executors/ExecutorsList/AddExecutorsModal.tsx
index 027087425..3a4b24d16 100644
--- a/src/components/pages/Executors/ExecutorsList/AddExecutorsModal.tsx
+++ b/src/components/pages/Executors/ExecutorsList/AddExecutorsModal.tsx
@@ -1,15 +1,19 @@
-import {useRef, useState} from 'react';
+import {FC, useRef, useState} from 'react';
 
 import {Form} from 'antd';
 
-import {Button, Input} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Input} from '@custom-antd/Input';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {ErrorNotificationConfig} from '@models/notifications';
+import type {ErrorNotificationConfig} from '@models/notifications';
 
-import {Hint, NotificationContent} from '@molecules';
+import {Hint} from '@molecules/Hint';
+import {NotificationContent} from '@molecules/Notification/NotificationContent';
+
+import {AddExecutorsModalContainer} from '@pages/Executors/ExecutorsList.styled';
 
 import {useCreateExecutorMutation} from '@services/executors';
 
@@ -19,15 +23,13 @@ import {externalLinks} from '@utils/externalLinks';
 import {k8sResourceNameMaxLength, k8sResourceNamePattern, required} from '@utils/form';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {AddExecutorsModalContainer} from './ExecutorsList.styled';
-
 type AddExecutorsFormValues = {
   name: string;
   type?: string;
   image: string;
 };
 
-const AddExecutorsModal: React.FC = () => {
+export const AddExecutorsModal: FC = () => {
   const {namespace} = useClusterDetailsPick('namespace');
   const openDetails = useDashboardNavigate((name: string) => `/executors/${name}`);
 
@@ -107,5 +109,3 @@ const AddExecutorsModal: React.FC = () => {
     </AddExecutorsModalContainer>
   );
 };
-
-export default AddExecutorsModal;
diff --git a/src/components/pages/Executors/ExecutorsList/CustomExecutorCard.tsx b/src/components/pages/Executors/ExecutorsList/CustomExecutorCard.tsx
index 0ce848b58..a0e85a9fa 100644
--- a/src/components/pages/Executors/ExecutorsList/CustomExecutorCard.tsx
+++ b/src/components/pages/Executors/ExecutorsList/CustomExecutorCard.tsx
@@ -1,24 +1,22 @@
 import {FC, memo} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {Executor} from '@models/executors';
 
-import Colors from '@styles/Colors';
+import {CustomExecutorContainer} from '@pages/Executors/ExecutorsList.styled';
 
-import {CustomExecutorContainer} from './ExecutorsList.styled';
+import {Colors} from '@styles/Colors';
 
 interface CustomExecutorCardProps {
   item: Executor;
   onClick: (item: Executor) => void;
 }
 
-const CustomExecutorCard: FC<CustomExecutorCardProps> = ({item, onClick}) => (
+export const CustomExecutorCard: FC<CustomExecutorCardProps> = memo(({item, onClick}) => (
   <CustomExecutorContainer onClick={() => onClick(item)} key={item.name}>
     <Text className="regular big">{item.name}</Text>
     <Text color={Colors.slate500}>{item.executor.executorType}</Text>
     <Text color={Colors.slate500}>{item.executor.image}</Text>
   </CustomExecutorContainer>
-);
-
-export default memo(CustomExecutorCard);
+));
diff --git a/src/components/pages/Executors/ExecutorsList/EmptyCustomExecutors.tsx b/src/components/pages/Executors/ExecutorsList/EmptyCustomExecutors.tsx
index fdf010faa..a6f05644c 100644
--- a/src/components/pages/Executors/ExecutorsList/EmptyCustomExecutors.tsx
+++ b/src/components/pages/Executors/ExecutorsList/EmptyCustomExecutors.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
+import {FC} from 'react';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -8,7 +9,7 @@ interface EmptyCustomExecutorsProps {
   onButtonClick: () => void;
 }
 
-const EmptyCustomExecutors: React.FC<EmptyCustomExecutorsProps> = props => {
+export const EmptyCustomExecutors: FC<EmptyCustomExecutorsProps> = props => {
   const {onButtonClick} = props;
 
   return (
@@ -33,5 +34,3 @@ const EmptyCustomExecutors: React.FC<EmptyCustomExecutorsProps> = props => {
     </EmptyListContent>
   );
 };
-
-export default EmptyCustomExecutors;
diff --git a/src/components/pages/Executors/ExecutorsList/ExecutorCard.tsx b/src/components/pages/Executors/ExecutorsList/ExecutorCard.tsx
index 8a2edb562..c99294eb6 100644
--- a/src/components/pages/Executors/ExecutorsList/ExecutorCard.tsx
+++ b/src/components/pages/Executors/ExecutorsList/ExecutorCard.tsx
@@ -2,26 +2,28 @@ import {FC, memo} from 'react';
 
 import {ReactComponent as ExecutorsIcon} from '@assets/executor.svg';
 
-import {ExecutorIcon, ExternalLink} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {Button, Text, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
+import {Title} from '@custom-antd/Typography/Title';
 
 import {Executor} from '@models/executors';
 
-import {getTestExecutorIcon} from '@redux/utils/executorIcon';
-
-import Colors from '@styles/Colors';
+import {ExecutorsGridItem} from '@pages/Executors/ExecutorsList.styled';
+import type {ExecutorGridItem} from '@pages/Executors/utils';
 
-import {ExecutorGridItem} from '../utils';
+import {getTestExecutorIcon} from '@redux/utils/executorIcon';
 
-import {ExecutorsGridItem} from './ExecutorsList.styled';
+import {Colors} from '@styles/Colors';
 
 interface ExecutorCardProps {
   item: ExecutorGridItem;
   executors?: Executor[];
 }
 
-const ExecutorCard: FC<ExecutorCardProps> = ({item, executors}) => {
+export const ExecutorCard: FC<ExecutorCardProps> = memo(({item, executors}) => {
   const isExecutor = item.type !== 'custom';
   const executorIcon = getTestExecutorIcon(executors || [], item.type);
 
@@ -39,6 +41,4 @@ const ExecutorCard: FC<ExecutorCardProps> = ({item, executors}) => {
       </ExecutorsGridItem>
     </ExternalLink>
   );
-};
-
-export default memo(ExecutorCard);
+});
diff --git a/src/components/pages/Executors/ExecutorsList/index.ts b/src/components/pages/Executors/ExecutorsList/index.ts
deleted file mode 100644
index 61a914e6b..000000000
--- a/src/components/pages/Executors/ExecutorsList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './ExecutorsList';
diff --git a/src/components/pages/Executors/index.ts b/src/components/pages/Executors/index.ts
deleted file mode 100644
index f17b4a221..000000000
--- a/src/components/pages/Executors/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Executors';
diff --git a/src/components/pages/Executors/utils.ts b/src/components/pages/Executors/utils.ts
index 32bed1f1d..50cd8ed73 100644
--- a/src/components/pages/Executors/utils.ts
+++ b/src/components/pages/Executors/utils.ts
@@ -1,4 +1,4 @@
-import {TestExecutor} from '@models/testExecutors';
+import type {TestExecutor} from '@models/testExecutors';
 
 export type ExecutorGridItem = {
   type: TestExecutor | 'custom';
diff --git a/src/components/pages/GlobalSettings/GlobalSettings.tsx b/src/components/pages/GlobalSettings.tsx
similarity index 54%
rename from src/components/pages/GlobalSettings/GlobalSettings.tsx
rename to src/components/pages/GlobalSettings.tsx
index 397baa232..b081f75cd 100644
--- a/src/components/pages/GlobalSettings/GlobalSettings.tsx
+++ b/src/components/pages/GlobalSettings.tsx
@@ -1,17 +1,15 @@
 import {FC} from 'react';
 
-import {SettingsLayout} from '@molecules';
+import {SettingsLayout} from '@molecules/SettingsLayout';
 
-import {PageBlueprint} from '@organisms';
+import {PageBlueprint} from '@organisms/PageBlueprint';
 
-import General from './General';
+import {GeneralSettings as General} from './GlobalSettings/General';
 
 const tabs = [{id: 'general', label: 'General', children: <General />}];
 
-const GlobalSettings: FC = () => (
+export const GlobalSettings: FC = () => (
   <PageBlueprint title="Settings" description="Control everything related to your testkube installation">
     <SettingsLayout tabs={tabs} />
   </PageBlueprint>
 );
-
-export default GlobalSettings;
diff --git a/src/components/pages/GlobalSettings/General.tsx b/src/components/pages/GlobalSettings/General.tsx
new file mode 100644
index 000000000..d930831c7
--- /dev/null
+++ b/src/components/pages/GlobalSettings/General.tsx
@@ -0,0 +1,13 @@
+import {ApiEndpoint} from './General/ApiEndpoint';
+import {ConnectCloud} from './General/ConnectCloud';
+import {YourInstallation} from './General/YourInstallation';
+
+export const GeneralSettings = () => {
+  return (
+    <>
+      <ApiEndpoint />
+      <YourInstallation />
+      <ConnectCloud />
+    </>
+  );
+};
diff --git a/src/components/pages/GlobalSettings/General/ApiEndpoint.tsx b/src/components/pages/GlobalSettings/General/ApiEndpoint.tsx
index 6e632d379..abfd3530c 100644
--- a/src/components/pages/GlobalSettings/General/ApiEndpoint.tsx
+++ b/src/components/pages/GlobalSettings/General/ApiEndpoint.tsx
@@ -1,16 +1,19 @@
-import {useState} from 'react';
+import {FC, useState} from 'react';
 
 import {Form, Input} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {FormItem, FullWidthSpace, Text} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {isApiEndpointLocked, useApiEndpoint, useUpdateApiEndpoint} from '@services/apiEndpoint';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -18,7 +21,7 @@ type ApiEndpointFormValues = {
   endpoint: string;
 };
 
-const ApiEndpoint: React.FC = () => {
+export const ApiEndpoint: FC = () => {
   const [form] = Form.useForm<ApiEndpointFormValues>();
 
   const [isLoading, setIsLoading] = useState(false);
@@ -82,5 +85,3 @@ const ApiEndpoint: React.FC = () => {
     </Form>
   );
 };
-
-export default ApiEndpoint;
diff --git a/src/components/pages/GlobalSettings/General/ConnectCloud.tsx b/src/components/pages/GlobalSettings/General/ConnectCloud.tsx
index 1f8094b35..ddf1510aa 100644
--- a/src/components/pages/GlobalSettings/General/ConnectCloud.tsx
+++ b/src/components/pages/GlobalSettings/General/ConnectCloud.tsx
@@ -1,16 +1,20 @@
+import {FC} from 'react';
+
 import {CloudUploadOutlined} from '@ant-design/icons';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {Button, FullWidthSpace, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {ConfigurationCard} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 
-const ConnectCloud: React.FC = () => {
+export const ConnectCloud: FC = () => {
   return (
     <ConfigurationCard
       title="Connect to Testkube Cloud"
@@ -40,5 +44,3 @@ const ConnectCloud: React.FC = () => {
     </ConfigurationCard>
   );
 };
-
-export default ConnectCloud;
diff --git a/src/components/pages/GlobalSettings/General/General.tsx b/src/components/pages/GlobalSettings/General/General.tsx
deleted file mode 100644
index 9818774e0..000000000
--- a/src/components/pages/GlobalSettings/General/General.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import ApiEndpoint from './ApiEndpoint';
-import ConnectCloud from './ConnectCloud';
-import YourInstallation from './YourInstallation';
-
-const GeneralSettings = () => {
-  return (
-    <>
-      <ApiEndpoint />
-      <YourInstallation />
-      <ConnectCloud />
-    </>
-  );
-};
-
-export default GeneralSettings;
diff --git a/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallation.styled.tsx b/src/components/pages/GlobalSettings/General/YourInstallation.styled.tsx
similarity index 100%
rename from src/components/pages/GlobalSettings/General/YourInstallation/YourInstallation.styled.tsx
rename to src/components/pages/GlobalSettings/General/YourInstallation.styled.tsx
diff --git a/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallation.tsx b/src/components/pages/GlobalSettings/General/YourInstallation.tsx
similarity index 79%
rename from src/components/pages/GlobalSettings/General/YourInstallation/YourInstallation.tsx
rename to src/components/pages/GlobalSettings/General/YourInstallation.tsx
index 4f0e14ac7..26e38409a 100644
--- a/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallation.tsx
+++ b/src/components/pages/GlobalSettings/General/YourInstallation.tsx
@@ -1,17 +1,17 @@
-import {memo} from 'react';
+import {FC, memo} from 'react';
 
-import {FullWidthSpace} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import env from '@env';
+import {env} from '@env';
 
-import {ConfigurationCard} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
 
 import {useClusterDetailsPick} from '@store/clusterDetails';
 
 import {YourInstallationContainer} from './YourInstallation.styled';
-import YourInstallationItem from './YourInstallationItem';
+import {YourInstallationItem} from './YourInstallation/YourInstallationItem';
 
-const YourInstallation: React.FC = () => {
+export const YourInstallation: FC = memo(() => {
   const {namespace, version, helmchartVersion} = useClusterDetailsPick('version', 'helmchartVersion', 'namespace');
 
   const versionRegex = /^(\d+\.)?(\d+\.)(\S+)$/;
@@ -32,6 +32,4 @@ const YourInstallation: React.FC = () => {
       </FullWidthSpace>
     </ConfigurationCard>
   );
-};
-
-export default memo(YourInstallation);
+});
diff --git a/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallationItem.tsx b/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallationItem.tsx
index a546a8906..24720f656 100644
--- a/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallationItem.tsx
+++ b/src/components/pages/GlobalSettings/General/YourInstallation/YourInstallationItem.tsx
@@ -1,15 +1,17 @@
-import {Text} from '@custom-antd';
+import {FC} from 'react';
 
-import Colors from '@styles/Colors';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {YourInstallationItemContainer} from './YourInstallation.styled';
+import {YourInstallationItemContainer} from '@pages/GlobalSettings/General/YourInstallation.styled';
+
+import {Colors} from '@styles/Colors';
 
 type YourInstallationItemProps = {
   label: string;
   value?: string;
 };
 
-const YourInstallationItem: React.FC<YourInstallationItemProps> = props => {
+export const YourInstallationItem: FC<YourInstallationItemProps> = props => {
   const {label, value} = props;
   return (
     <YourInstallationItemContainer>
@@ -20,5 +22,3 @@ const YourInstallationItem: React.FC<YourInstallationItemProps> = props => {
     </YourInstallationItemContainer>
   );
 };
-
-export default YourInstallationItem;
diff --git a/src/components/pages/GlobalSettings/General/YourInstallation/index.ts b/src/components/pages/GlobalSettings/General/YourInstallation/index.ts
deleted file mode 100644
index 39f6b3418..000000000
--- a/src/components/pages/GlobalSettings/General/YourInstallation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './YourInstallation';
diff --git a/src/components/pages/GlobalSettings/General/index.ts b/src/components/pages/GlobalSettings/General/index.ts
deleted file mode 100644
index 0d5590eb6..000000000
--- a/src/components/pages/GlobalSettings/General/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './General';
diff --git a/src/components/pages/GlobalSettings/index.ts b/src/components/pages/GlobalSettings/index.ts
deleted file mode 100644
index 6f9860b11..000000000
--- a/src/components/pages/GlobalSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './GlobalSettings';
diff --git a/src/components/pages/Loading/Loading.styled.tsx b/src/components/pages/Loading.styled.tsx
similarity index 100%
rename from src/components/pages/Loading/Loading.styled.tsx
rename to src/components/pages/Loading.styled.tsx
diff --git a/src/components/pages/Loading/Loading.tsx b/src/components/pages/Loading.tsx
similarity index 85%
rename from src/components/pages/Loading/Loading.tsx
rename to src/components/pages/Loading.tsx
index 18fa58cf1..439e4d28c 100644
--- a/src/components/pages/Loading/Loading.tsx
+++ b/src/components/pages/Loading.tsx
@@ -4,7 +4,7 @@ import {LoadingOutlined} from '@ant-design/icons';
 
 import {LoadingContainer} from './Loading.styled';
 
-const Loading = () => {
+export const Loading = () => {
   const [selectedSettingsTab, setSelectedSettingsTab] = useState(0);
 
   return (
@@ -13,5 +13,3 @@ const Loading = () => {
     </LoadingContainer>
   );
 };
-
-export default Loading;
diff --git a/src/components/pages/Loading/index.ts b/src/components/pages/Loading/index.ts
deleted file mode 100644
index 17dff722d..000000000
--- a/src/components/pages/Loading/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Loading';
diff --git a/src/components/pages/NotFound/NotFound.tsx b/src/components/pages/NotFound.tsx
similarity index 60%
rename from src/components/pages/NotFound/NotFound.tsx
rename to src/components/pages/NotFound.tsx
index 1bac82af7..9a4d7c804 100644
--- a/src/components/pages/NotFound/NotFound.tsx
+++ b/src/components/pages/NotFound.tsx
@@ -1,9 +1,7 @@
 import {FC} from 'react';
 
-import Error from '../Error';
+import {Error} from './Error';
 
-const NotFound: FC = () => (
+export const NotFound: FC = () => (
   <Error title="Page not found" description="We weren’t able to find the page you requested." />
 );
-
-export default NotFound;
diff --git a/src/components/pages/NotFound/index.ts b/src/components/pages/NotFound/index.ts
deleted file mode 100644
index f9343272a..000000000
--- a/src/components/pages/NotFound/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './NotFound';
diff --git a/src/components/pages/PageMetadata.tsx b/src/components/pages/PageMetadata.tsx
index 4e8fdcb1a..b44033b80 100644
--- a/src/components/pages/PageMetadata.tsx
+++ b/src/components/pages/PageMetadata.tsx
@@ -1,14 +1,14 @@
 import React, {FC, useContext} from 'react';
 import {Helmet} from 'react-helmet';
 
-import {ConfigContext} from '@contexts';
+import {ConfigContext} from '@contexts/ConfigContext';
 
 interface HeadProps {
   title?: string;
   description?: string;
 }
 
-const PageMetadata: FC<HeadProps> = ({title, description}) => {
+export const PageMetadata: FC<HeadProps> = ({title, description}) => {
   const {pageTitle: mainPageTitle} = useContext(ConfigContext);
   return (
     <Helmet>
@@ -17,5 +17,3 @@ const PageMetadata: FC<HeadProps> = ({title, description}) => {
     </Helmet>
   );
 };
-
-export default PageMetadata;
diff --git a/src/components/pages/Sources/Sources.tsx b/src/components/pages/Sources.tsx
similarity index 65%
rename from src/components/pages/Sources/Sources.tsx
rename to src/components/pages/Sources.tsx
index 36a918c3a..1717bb9f3 100644
--- a/src/components/pages/Sources/Sources.tsx
+++ b/src/components/pages/Sources.tsx
@@ -1,11 +1,11 @@
+import {FC} from 'react';
 import {Outlet, Route, Routes} from 'react-router-dom';
 
-import {NotFound} from '@pages';
+import {NotFound} from './NotFound';
+import {SourceDetails} from './Sources/SourceDetails';
+import {Sources as SourcesList} from './Sources/SourcesList';
 
-import SourceDetails from './SourceDetails';
-import SourcesList from './SourcesList';
-
-const Sources: React.FC = () => {
+export const Sources: FC = () => {
   return (
     <>
       <Routes>
@@ -20,5 +20,3 @@ const Sources: React.FC = () => {
     </>
   );
 };
-
-export default Sources;
diff --git a/src/components/pages/Sources/SourceDetails/SourceDetails.tsx b/src/components/pages/Sources/SourceDetails.tsx
similarity index 79%
rename from src/components/pages/Sources/SourceDetails/SourceDetails.tsx
rename to src/components/pages/Sources/SourceDetails.tsx
index 3573ef673..466ef384a 100644
--- a/src/components/pages/Sources/SourceDetails/SourceDetails.tsx
+++ b/src/components/pages/Sources/SourceDetails.tsx
@@ -3,14 +3,17 @@ import {useParams} from 'react-router-dom';
 
 import {Tabs} from 'antd';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {PageHeader, PageWrapper} from '@organisms';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
+import {PageHeader} from '@organisms/PageBlueprint/PageHeader';
 
-import {Error, Loading} from '@pages';
-import PageMetadata from '@pages/PageMetadata';
+import {Error} from '@pages/Error';
+import {Loading} from '@pages/Loading';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectCurrentSource, setCurrentSource} from '@redux/reducers/sourcesSlice';
@@ -19,9 +22,9 @@ import {useGetSourceDetailsQuery} from '@services/sources';
 
 import {safeRefetch} from '@utils/fetchUtils';
 
-import SourceSettings from './SourceSettings';
+import {SourceSettings} from './SourceDetails/SourceSettings';
 
-const SourceDetails = () => {
+export const SourceDetails = () => {
   const {dispatch, isClusterAvailable} = useContext(MainContext);
   const {location} = useContext(DashboardContext);
 
@@ -68,5 +71,3 @@ const SourceDetails = () => {
     </PageWrapper>
   );
 };
-
-export default SourceDetails;
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/SourceSettings.tsx b/src/components/pages/Sources/SourceDetails/SourceSettings.tsx
similarity index 56%
rename from src/components/pages/Sources/SourceDetails/SourceSettings/SourceSettings.tsx
rename to src/components/pages/Sources/SourceDetails/SourceSettings.tsx
index b100313e9..1e455181d 100644
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/SourceSettings.tsx
+++ b/src/components/pages/Sources/SourceDetails/SourceSettings.tsx
@@ -1,9 +1,9 @@
 import {FC, memo} from 'react';
 
-import {SettingsLayout} from '@molecules';
+import {SettingsLayout} from '@molecules/SettingsLayout';
 
-import SourceSettingsDefinition from './Definition';
-import General from './General';
+import {SourceSettingsDefinition} from './SourceSettings/Definition/SourceSettingsDefinition';
+import {General} from './SourceSettings/General';
 
 interface SourceSettingsProps {
   reload: () => void;
@@ -11,7 +11,7 @@ interface SourceSettingsProps {
   onTabChange: (tab: string) => void;
 }
 
-const SourceSettings: FC<SourceSettingsProps> = ({reload, tab, onTabChange}) => (
+export const SourceSettings: FC<SourceSettingsProps> = memo(({reload, tab, onTabChange}) => (
   <SettingsLayout
     active={tab}
     onChange={onTabChange}
@@ -20,6 +20,4 @@ const SourceSettings: FC<SourceSettingsProps> = ({reload, tab, onTabChange}) =>
       {id: 'definition', label: 'Definition', children: <SourceSettingsDefinition reload={reload} />},
     ]}
   />
-);
-
-export default memo(SourceSettings);
+));
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/SourceSettingsDefinition.tsx b/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/SourceSettingsDefinition.tsx
index 5b41aeaa7..8a82a7451 100644
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/SourceSettingsDefinition.tsx
+++ b/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/SourceSettingsDefinition.tsx
@@ -1,6 +1,6 @@
 import {FC} from 'react';
 
-import {Definition} from '@molecules';
+import {Definition} from '@molecules/Definition';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectCurrentSource} from '@redux/reducers/sourcesSlice';
@@ -14,7 +14,7 @@ interface SourceSettingsDefinitionProps {
   reload: () => void;
 }
 
-const SourceSettingsDefinition: FC<SourceSettingsDefinitionProps> = ({reload}) => {
+export const SourceSettingsDefinition: FC<SourceSettingsDefinitionProps> = ({reload}) => {
   const source = useAppSelector(selectCurrentSource)!;
   return (
     <Definition
@@ -33,5 +33,3 @@ const SourceSettingsDefinition: FC<SourceSettingsDefinitionProps> = ({reload}) =
     />
   );
 };
-
-export default SourceSettingsDefinition;
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/index.ts b/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/index.ts
deleted file mode 100644
index 279f62744..000000000
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/Definition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SourceSettingsDefinition';
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/General/General.tsx b/src/components/pages/Sources/SourceDetails/SourceSettings/General.tsx
similarity index 78%
rename from src/components/pages/Sources/SourceDetails/SourceSettings/General/General.tsx
rename to src/components/pages/Sources/SourceDetails/SourceSettings/General.tsx
index e102b7da2..45b3e59b7 100644
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/General/General.tsx
+++ b/src/components/pages/Sources/SourceDetails/SourceSettings/General.tsx
@@ -1,4 +1,6 @@
-import {Delete} from '@molecules/CommonSettings';
+import {FC} from 'react';
+
+import {Delete} from '@molecules/CommonSettings/Delete';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -7,10 +9,10 @@ import {selectCurrentSource} from '@redux/reducers/sourcesSlice';
 
 import {useDeleteSourceMutation} from '@services/sources';
 
-import Authentication from './Authentication';
-import NameNType from './NameNUrl';
+import {Authentication} from './General/Authentication';
+import {NameNUrl as NameNType} from './General/NameNUrl';
 
-const General: React.FC = () => {
+export const General: FC = () => {
   const mayDelete = usePermission(Permissions.deleteEntity);
   const source = useAppSelector(selectCurrentSource);
 
@@ -30,5 +32,3 @@ const General: React.FC = () => {
     </>
   );
 };
-
-export default General;
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/General/Authentication.tsx b/src/components/pages/Sources/SourceDetails/SourceSettings/General/Authentication.tsx
index e3b13a6a1..b3c57c062 100644
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/General/Authentication.tsx
+++ b/src/components/pages/Sources/SourceDetails/SourceSettings/General/Authentication.tsx
@@ -1,14 +1,16 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
 import {Form} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {FullWidthSpace} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ErrorNotificationConfig} from '@models/notifications';
+import type {ErrorNotificationConfig} from '@models/notifications';
 
-import {ConfigurationCard, SecretFormItem, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {SecretFormItem} from '@molecules/GitFormItems/SecretFormItem';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -25,7 +27,7 @@ type AuthenticationFormValues = {
   username: string;
 };
 
-const Authentication: React.FC = () => {
+export const Authentication: FC = () => {
   const {dispatch} = useContext(MainContext);
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -113,5 +115,3 @@ const Authentication: React.FC = () => {
     </Form>
   );
 };
-
-export default Authentication;
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/General/NameNUrl.tsx b/src/components/pages/Sources/SourceDetails/SourceSettings/General/NameNUrl.tsx
index 6d6d2e4e5..6ecd2ccda 100644
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/General/NameNUrl.tsx
+++ b/src/components/pages/Sources/SourceDetails/SourceSettings/General/NameNUrl.tsx
@@ -1,12 +1,13 @@
-import {useContext, useEffect} from 'react';
+import {FC, useContext, useEffect} from 'react';
 
 import {Form} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Input} from '@custom-antd';
+import {Input} from '@custom-antd/Input';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -23,7 +24,7 @@ type NameNUrlFormValues = {
   uri: string;
 };
 
-const NameNUrl: React.FC = () => {
+export const NameNUrl: FC = () => {
   const source = useAppSelector(selectCurrentSource);
 
   const {dispatch} = useContext(MainContext);
@@ -89,5 +90,3 @@ const NameNUrl: React.FC = () => {
     </Form>
   );
 };
-
-export default NameNUrl;
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/General/index.ts b/src/components/pages/Sources/SourceDetails/SourceSettings/General/index.ts
deleted file mode 100644
index 0d5590eb6..000000000
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/General/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './General';
diff --git a/src/components/pages/Sources/SourceDetails/SourceSettings/index.ts b/src/components/pages/Sources/SourceDetails/SourceSettings/index.ts
deleted file mode 100644
index f27d5aa10..000000000
--- a/src/components/pages/Sources/SourceDetails/SourceSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SourceSettings';
diff --git a/src/components/pages/Sources/SourceDetails/index.ts b/src/components/pages/Sources/SourceDetails/index.ts
deleted file mode 100644
index 9bccdea91..000000000
--- a/src/components/pages/Sources/SourceDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SourceDetails';
diff --git a/src/components/pages/Sources/SourcesList/SourcesList.styled.tsx b/src/components/pages/Sources/SourcesList.styled.tsx
similarity index 92%
rename from src/components/pages/Sources/SourcesList/SourcesList.styled.tsx
rename to src/components/pages/Sources/SourcesList.styled.tsx
index 70bc96b62..28169d042 100644
--- a/src/components/pages/Sources/SourcesList/SourcesList.styled.tsx
+++ b/src/components/pages/Sources/SourcesList.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const SourceContainer = styled.div`
   display: flex;
diff --git a/src/components/pages/Sources/SourcesList/SourcesList.tsx b/src/components/pages/Sources/SourcesList.tsx
similarity index 78%
rename from src/components/pages/Sources/SourcesList/SourcesList.tsx
rename to src/components/pages/Sources/SourcesList.tsx
index 23b2e86e1..daf343a77 100644
--- a/src/components/pages/Sources/SourcesList/SourcesList.tsx
+++ b/src/components/pages/Sources/SourcesList.tsx
@@ -1,16 +1,18 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, Modal} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {CustomModal as Modal} from '@custom-antd/Modal';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {EntityGrid} from '@molecules';
+import {EntityGrid} from '@molecules/EntityGrid';
 
-import {PageBlueprint} from '@organisms';
+import {PageBlueprint} from '@organisms/PageBlueprint';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -22,11 +24,11 @@ import {useGetSourcesQuery} from '@services/sources';
 import {externalLinks} from '@utils/externalLinks';
 import {safeRefetch} from '@utils/fetchUtils';
 
-import AddSourceModal from './AddSourceModal';
-import EmptySources from './EmptySources';
-import SourceCard from './SourceCard';
+import {AddSourceModal} from './SourcesList/AddSourceModal';
+import {EmptySources} from './SourcesList/EmptySources';
+import {SourceCard} from './SourcesList/SourceCard';
 
-const Sources: React.FC = () => {
+export const Sources: FC = () => {
   const sourcesList = useAppSelector(selectSources);
 
   const {dispatch, isClusterAvailable} = useContext(MainContext);
@@ -90,5 +92,3 @@ const Sources: React.FC = () => {
     </PageBlueprint>
   );
 };
-
-export default Sources;
diff --git a/src/components/pages/Sources/SourcesList/AddSourceModal.tsx b/src/components/pages/Sources/SourcesList/AddSourceModal.tsx
index b6a03cfe0..b329808c3 100644
--- a/src/components/pages/Sources/SourcesList/AddSourceModal.tsx
+++ b/src/components/pages/Sources/SourcesList/AddSourceModal.tsx
@@ -1,17 +1,21 @@
-import React, {useRef, useState} from 'react';
+import {FC, useRef, useState} from 'react';
 
 import {EyeInvisibleOutlined, EyeOutlined} from '@ant-design/icons';
 import {Input as AntdInput, Form} from 'antd';
 
-import {Button, Input} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Input} from '@custom-antd/Input';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {ErrorNotificationConfig} from '@models/notifications';
-import {SourceWithRepository} from '@models/sources';
+import type {ErrorNotificationConfig} from '@models/notifications';
+import type {SourceWithRepository} from '@models/sources';
 
-import {Hint, NotificationContent} from '@molecules';
+import {Hint} from '@molecules/Hint';
+import {NotificationContent} from '@molecules/Notification/NotificationContent';
+
+import {AddSourceModalContainer} from '@pages/Sources/SourcesList.styled';
 
 import {useCreateSourceMutation} from '@services/sources';
 
@@ -21,8 +25,6 @@ import {externalLinks} from '@utils/externalLinks';
 import {k8sResourceNameMaxLength, k8sResourceNamePattern, required} from '@utils/form';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {AddSourceModalContainer} from './SourcesList.styled';
-
 type AddSourceFormValues = {
   name: string;
   uri: string;
@@ -30,7 +32,7 @@ type AddSourceFormValues = {
   username?: string;
 };
 
-const AddSourceModal: React.FC = () => {
+export const AddSourceModal: FC = () => {
   const {namespace} = useClusterDetailsPick('namespace');
   const [form] = Form.useForm<AddSourceFormValues>();
   const openDetails = useDashboardNavigate((name: string) => `/sources/${name}`);
@@ -119,5 +121,3 @@ const AddSourceModal: React.FC = () => {
     </AddSourceModalContainer>
   );
 };
-
-export default AddSourceModal;
diff --git a/src/components/pages/Sources/SourcesList/EmptySources.tsx b/src/components/pages/Sources/SourcesList/EmptySources.tsx
index 0d89dec47..6c6b0bd28 100644
--- a/src/components/pages/Sources/SourcesList/EmptySources.tsx
+++ b/src/components/pages/Sources/SourcesList/EmptySources.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
+import {FC} from 'react';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -8,7 +9,7 @@ interface EmptySourcesProps {
   onButtonClick: () => void;
 }
 
-const EmptySources: React.FC<EmptySourcesProps> = props => {
+export const EmptySources: FC<EmptySourcesProps> = props => {
   const {onButtonClick} = props;
 
   return (
@@ -30,5 +31,3 @@ const EmptySources: React.FC<EmptySourcesProps> = props => {
     </EmptyListContent>
   );
 };
-
-export default EmptySources;
diff --git a/src/components/pages/Sources/SourcesList/SourceCard.tsx b/src/components/pages/Sources/SourcesList/SourceCard.tsx
index 3ba9b384e..7debd9e38 100644
--- a/src/components/pages/Sources/SourcesList/SourceCard.tsx
+++ b/src/components/pages/Sources/SourcesList/SourceCard.tsx
@@ -1,23 +1,21 @@
 import {FC, memo} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {SourceWithRepository} from '@models/sources';
+import type {SourceWithRepository} from '@models/sources';
 
-import Colors from '@styles/Colors';
+import {SourceContainer} from '@pages/Sources/SourcesList.styled';
 
-import {SourceContainer} from './SourcesList.styled';
+import {Colors} from '@styles/Colors';
 
 interface SourceCardProps {
   item: SourceWithRepository;
   onClick: (item: SourceWithRepository) => void;
 }
 
-const SourceCard: FC<SourceCardProps> = ({item, onClick}) => (
+export const SourceCard: FC<SourceCardProps> = memo(({item, onClick}) => (
   <SourceContainer onClick={() => onClick(item)} key={item.name}>
     <Text className="regular big">{item.name}</Text>
     <Text color={Colors.slate500}>{item.repository?.uri}</Text>
   </SourceContainer>
-);
-
-export default memo(SourceCard);
+));
diff --git a/src/components/pages/Sources/SourcesList/index.ts b/src/components/pages/Sources/SourcesList/index.ts
deleted file mode 100644
index 230c9246f..000000000
--- a/src/components/pages/Sources/SourcesList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SourcesList';
diff --git a/src/components/pages/Sources/index.ts b/src/components/pages/Sources/index.ts
deleted file mode 100644
index f7cb73815..000000000
--- a/src/components/pages/Sources/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Sources';
diff --git a/src/components/pages/TestSuites/TestSuites.tsx b/src/components/pages/TestSuites.tsx
similarity index 81%
rename from src/components/pages/TestSuites/TestSuites.tsx
rename to src/components/pages/TestSuites.tsx
index dbdebfc9e..45ee8cdf4 100644
--- a/src/components/pages/TestSuites/TestSuites.tsx
+++ b/src/components/pages/TestSuites.tsx
@@ -1,14 +1,13 @@
 import {FC} from 'react';
 import {Outlet, Route, Routes} from 'react-router-dom';
 
-import {NotFound} from '@pages';
+import {DashboardRewrite} from '@src/DashboardRewrite';
 
-import DashboardRewrite from '@src/DashboardRewrite';
+import {NotFound} from './NotFound';
+import {TestSuiteDetails} from './TestSuites/TestSuiteDetails';
+import {TestSuitesList} from './TestSuites/TestSuitesList';
 
-import TestSuiteDetails from './TestSuiteDetails';
-import TestSuitesList from './TestSuitesList';
-
-const TestSuites: FC = () => (
+export const TestSuites: FC = () => (
   <>
     <Routes>
       {/* Backwards compatibility */}
@@ -36,5 +35,3 @@ const TestSuites: FC = () => (
     <Outlet />
   </>
 );
-
-export default TestSuites;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetails.tsx b/src/components/pages/TestSuites/TestSuiteDetails.tsx
similarity index 75%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetails.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails.tsx
index c985d9c96..8ca834f36 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetails.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails.tsx
@@ -1,7 +1,8 @@
 import React, {FC} from 'react';
 import {useParams} from 'react-router-dom';
 
-import {EntityDetailsLayer, ExecutionDetailsLayer} from '@organisms/EntityDetails';
+import {EntityDetailsLayer} from '@organisms/EntityDetails/EntityDetailsLayer';
+import {ExecutionDetailsLayer} from '@organisms/EntityDetails/ExecutionDetailsLayer';
 
 import {
   useGetTestSuiteExecutionByIdQuery,
@@ -10,13 +11,13 @@ import {
 } from '@services/testSuiteExecutions';
 import {useGetTestSuiteDetailsQuery} from '@services/testSuites';
 
-import TestSuiteDetailsContent from './TestSuiteDetailsContent';
+import {TestSuiteDetailsContent} from './TestSuiteDetails/TestSuiteDetailsContent';
 
 interface TestSuiteDetailsProps {
   tab?: string;
 }
 
-const TestSuiteDetails: FC<TestSuiteDetailsProps> = ({tab}) => {
+export const TestSuiteDetails: FC<TestSuiteDetailsProps> = ({tab}) => {
   const {id, execId, settingsTab} = useParams();
   return (
     <EntityDetailsLayer
@@ -38,5 +39,3 @@ const TestSuiteDetails: FC<TestSuiteDetailsProps> = ({tab}) => {
     </EntityDetailsLayer>
   );
 };
-
-export default TestSuiteDetails;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetailsContent.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetailsContent.tsx
index 7d36ad2f0..e141e88fa 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetailsContent.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteDetailsContent.tsx
@@ -3,32 +3,36 @@ import React, {FC} from 'react';
 import {Tabs} from 'antd';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useRunEntity from '@hooks/useRunEntity';
-import useTrackTimeAnalytics from '@hooks/useTrackTimeAnalytics';
+import {useRunEntity} from '@hooks/useRunEntity';
+import {useTrackTimeAnalytics} from '@hooks/useTrackTimeAnalytics';
 
-import {CLICommands, SummaryGrid} from '@molecules';
+import {CLICommands} from '@molecules/CLICommands';
+import {SummaryGrid} from '@molecules/SummaryGrid';
 
-import {PageWrapper} from '@organisms';
-import {EntityDetailsHeader, EntityDetailsWrapper, RecentExecutionsTab} from '@organisms/EntityDetails';
+import {EntityDetailsWrapper} from '@organisms/EntityDetails.styled';
+import {EntityDetailsHeader} from '@organisms/EntityDetails/EntityDetailsHeader';
+import {RecentExecutionsTab} from '@organisms/EntityDetails/RecentExecutionsTab';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
 
-import {Error, Loading} from '@pages';
-import PageMetadata from '@pages/PageMetadata';
+import {Error} from '@pages/Error';
+import {Loading} from '@pages/Loading';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {useAbortAllTestSuiteExecutionsMutation, useAbortTestSuiteExecutionMutation} from '@services/testSuites';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-import TestSuiteExecutionDrawer from './TestSuiteExecution/TestSuiteExecutionDrawer';
-import TestSuiteSettings from './TestSuiteSettings';
+import {TestSuiteExecutionDrawer} from './TestSuiteExecution/TestSuiteExecutionDrawer';
+import {TestSuiteSettings} from './TestSuiteSettings';
 
 interface TestSuiteDetailsContentProps {
   tab?: string;
   settingsTab?: string;
 }
 
-const TestSuiteDetailsContent: FC<TestSuiteDetailsContentProps> = ({tab, settingsTab}) => {
+export const TestSuiteDetailsContent: FC<TestSuiteDetailsContentProps> = ({tab, settingsTab}) => {
   const {id, details, error, metrics} = useEntityDetailsPick('id', 'details', 'error', 'metrics');
   const [isRunning, run] = useRunEntity('test-suites', details);
 
@@ -85,5 +89,3 @@ const TestSuiteDetailsContent: FC<TestSuiteDetailsContentProps> = ({tab, setting
     </EntityDetailsWrapper>
   );
 };
-
-export default TestSuiteDetailsContent;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionDrawer.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionDrawer.tsx
index 6ac8b1d13..bd1732a77 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionDrawer.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionDrawer.tsx
@@ -1,15 +1,15 @@
 import {FC} from 'react';
 
-import ExecutionDrawer from '@organisms/ExecutionDrawer';
-import ExecutionDrawerHeader from '@organisms/ExecutionDrawer/ExecutionDrawerHeader';
+import {ExecutionDrawer} from '@organisms/ExecutionDrawer';
+import {ExecutionDrawerHeader} from '@organisms/ExecutionDrawer/ExecutionDrawerHeader';
 
 import {useAbortTestExecutionMutation} from '@services/tests';
 
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
-import TestSuiteExecutionTabs from './TestSuiteExecutionTabs';
+import {TestSuiteExecutionTabs} from './TestSuiteExecutionTabs';
 
-const TestSuiteExecutionDrawer: FC = () => {
+export const TestSuiteExecutionDrawer: FC = () => {
   const {close, id, data} = useExecutionDetailsPick('close', 'id', 'data');
   return (
     <ExecutionDrawer
@@ -22,5 +22,3 @@ const TestSuiteExecutionDrawer: FC = () => {
     </ExecutionDrawer>
   );
 };
-
-export default TestSuiteExecutionDrawer;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionTabs.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionTabs.tsx
index 54625c76a..44d70237c 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionTabs.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteExecution/TestSuiteExecutionTabs.tsx
@@ -1,12 +1,14 @@
+import {FC} from 'react';
+
 import {Tabs} from 'antd';
 
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
-import {ExecutionStepsList} from '@molecules';
+import {ExecutionStepsList} from '@molecules/ExecutionStepsList';
 
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
-const TestSuiteExecutionTabs: React.FC = () => {
+export const TestSuiteExecutionTabs: FC = () => {
   const {
     data: {executeStepResults},
   } = useExecutionDetailsPick('data') as {data: TestSuiteExecution};
@@ -23,5 +25,3 @@ const TestSuiteExecutionTabs: React.FC = () => {
     />
   );
 };
-
-export default TestSuiteExecutionTabs;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/TestSuiteSettings.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings.tsx
similarity index 50%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/TestSuiteSettings.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings.tsx
index 580ee0853..2c0ea38af 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/TestSuiteSettings.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings.tsx
@@ -1,16 +1,16 @@
 import React, {FC} from 'react';
 
-import {SettingsLayout} from '@molecules';
-import {SettingsLayoutProps} from '@molecules/SettingsLayout/SettingsLayout';
+import {SettingsLayout} from '@molecules/SettingsLayout';
+import type {SettingsLayoutProps} from '@molecules/SettingsLayout';
 
-import {SettingsScheduling} from '@organisms/EntityDetails';
+import {Schedule as SettingsScheduling} from '@organisms/EntityDetails/Settings/SettingsScheduling/Schedule';
 
 import {useUpdateTestSuiteMutation} from '@services/testSuites';
 
-import SettingsDefinition from './SettingsDefinition';
-import SettingsGeneral from './SettingsGeneral';
-import SettingsTests from './SettingsTests';
-import SettingsVariables from './SettingsVariables';
+import {SettingsDefinition} from './TestSuiteSettings/SettingsDefinition';
+import {SettingsGeneral} from './TestSuiteSettings/SettingsGeneral';
+import {SettingsTests} from './TestSuiteSettings/SettingsTests';
+import {SettingsVariables} from './TestSuiteSettings/SettingsVariables';
 
 const tabs = [
   {id: 'general', label: 'General', children: <SettingsGeneral />},
@@ -26,6 +26,4 @@ const tabs = [
 
 type TestSuiteSettingsProps = Omit<SettingsLayoutProps, 'tabs'>;
 
-const TestSuiteSettings: FC<TestSuiteSettingsProps> = props => <SettingsLayout {...props} tabs={tabs} />;
-
-export default TestSuiteSettings;
+export const TestSuiteSettings: FC<TestSuiteSettingsProps> = props => <SettingsLayout {...props} tabs={tabs} />;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/SettingsDefinition.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition.tsx
similarity index 89%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/SettingsDefinition.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition.tsx
index 66c83d01f..de0afbac3 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/SettingsDefinition.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition.tsx
@@ -1,6 +1,6 @@
 import {FC} from 'react';
 
-import {Definition} from '@molecules';
+import {Definition} from '@molecules/Definition';
 
 import {useGetTestSuiteDefinitionQuery, useUpdateTestSuiteDefinitionMutation} from '@services/testSuites';
 
@@ -9,7 +9,7 @@ import {useEntityDetailsPick} from '@store/entityDetails';
 import {createSchemaOverride} from '@utils/createSchemaOverride';
 import {testkubeCRDBases} from '@utils/externalLinks';
 
-const SettingsDefinition: FC = () => {
+export const SettingsDefinition: FC = () => {
   const {details} = useEntityDetailsPick('details');
   return (
     <Definition
@@ -27,5 +27,3 @@ const SettingsDefinition: FC = () => {
     />
   );
 };
-
-export default SettingsDefinition;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/index.ts
deleted file mode 100644
index bcf6568b5..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsDefinition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsDefinition';
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/SettingsGeneral.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral.tsx
similarity index 77%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/SettingsGeneral.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral.tsx
index a4b00e2fa..645b0b7aa 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/SettingsGeneral.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral.tsx
@@ -1,8 +1,9 @@
 import {FC} from 'react';
 
-import {Delete} from '@molecules/CommonSettings';
+import {Delete} from '@molecules/CommonSettings/Delete';
 
-import {Labels, NameNDescription} from '@organisms/EntityDetails';
+import {Labels} from '@organisms/EntityDetails/Settings/SettingsGeneral/Labels';
+import {NameNDescription} from '@organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -10,7 +11,7 @@ import {useDeleteTestSuiteMutation, useUpdateTestSuiteMutation} from '@services/
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-const SettingsGeneral: FC = () => {
+export const SettingsGeneral: FC = () => {
   const mayDelete = usePermission(Permissions.deleteEntity);
   const {details} = useEntityDetailsPick('details');
 
@@ -30,5 +31,3 @@ const SettingsGeneral: FC = () => {
     </>
   );
 };
-
-export default SettingsGeneral;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/index.ts
deleted file mode 100644
index 8fdaaccab..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsGeneral/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsGeneral';
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.styled.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled.tsx
similarity index 97%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.styled.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled.tsx
index ce5c1f9e8..0de7a1b1e 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.styled.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled.tsx
@@ -2,7 +2,7 @@ import {ReactNode} from 'react';
 
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const addWidth = 32;
 export const addHeight = 46;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.tsx
similarity index 87%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.tsx
index 50749e120..77a503616 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/SettingsTests.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.tsx
@@ -6,18 +6,22 @@ import {nanoid} from '@reduxjs/toolkit';
 
 import pick from 'lodash/pick';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, FullWidthSpace, Title} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Title} from '@custom-antd/Typography/Title';
 
-import useClusterVersionMatch from '@hooks/useClusterVersionMatch';
+import {useClusterVersionMatch} from '@hooks/useClusterVersionMatch';
 
-import {TestSuiteStepTest} from '@models/test';
-import {LocalStep, TestSuite} from '@models/testSuite';
+import type {TestSuiteStepTest} from '@models/test';
+import type {LocalStep, TestSuite} from '@models/testSuite';
 
-import {ConfigurationCard, InlineNotification, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {InlineNotification} from '@molecules/InlineNotification';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -33,12 +37,12 @@ import {externalLinks} from '@utils/externalLinks';
 import {formatMilliseconds} from '@utils/formatMilliseconds';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import DelayModal from './Modals/DelayModal';
-import TestModal from './Modals/TestModal';
 import {EmptyTestsContainer} from './SettingsTests.styled';
-import TestSuiteStepsFlow from './TestSuiteStepsFlow';
+import {DelayModal} from './SettingsTests/Modals/DelayModal';
+import {TestModal} from './SettingsTests/Modals/TestModal';
+import {TestSuiteStepsFlow} from './SettingsTests/TestSuiteStepsFlow';
 
-const SettingsTests = () => {
+export const SettingsTests = memo(() => {
   const {isClusterAvailable} = useContext(MainContext);
   const {details, isV2: rawIsV2} = useEntityDetailsPick('details', 'isV2') as {details: TestSuite; isV2: boolean};
 
@@ -207,6 +211,4 @@ const SettingsTests = () => {
       </Form>
     </FullWidthSpace>
   );
-};
-
-export default memo(SettingsTests);
+});
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/DelayModal.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/DelayModal.tsx
index 411a24c5f..9e065a90e 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/DelayModal.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/DelayModal.tsx
@@ -1,14 +1,15 @@
-import React, {useEffect, useRef, useState} from 'react';
+import {FC, useEffect, useRef, useState} from 'react';
 
 import {Input} from 'antd';
 
-import {Button, Modal} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {CustomModal as Modal} from '@custom-antd/Modal';
 
-import usePressEnter from '@hooks/usePressEnter';
+import {usePressEnter} from '@hooks/usePressEnter';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
-import {StyledDelayModalContent} from '../SettingsTests.styled';
+import {StyledDelayModalContent} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
 
 type DelayModalProps = {
   visible: boolean;
@@ -16,7 +17,7 @@ type DelayModalProps = {
   onSubmit: (delay: string) => void;
 };
 
-const DelayModal: React.FC<DelayModalProps> = props => {
+export const DelayModal: FC<DelayModalProps> = props => {
   const {visible, onClose, onSubmit} = props;
 
   const [delayValue, setDelayValue] = useState<string>('');
@@ -84,5 +85,3 @@ const DelayModal: React.FC<DelayModalProps> = props => {
     />
   );
 };
-
-export default DelayModal;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/TestModal.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/TestModal.tsx
index d8259b19e..bbe266c7f 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/TestModal.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Modals/TestModal.tsx
@@ -1,14 +1,21 @@
-import React, {useMemo, useState} from 'react';
+import {FC, useMemo, useState} from 'react';
 
 import {Select} from 'antd';
 
-import {ExecutorIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
 
-import {Button, Modal, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {CustomModal as Modal} from '@custom-antd/Modal';
+import {Text} from '@custom-antd/Typography/Text';
 
-import usePressEnter from '@hooks/usePressEnter';
+import {usePressEnter} from '@hooks/usePressEnter';
 
-import {TestSuiteStepTest} from '@models/test';
+import type {TestSuiteStepTest} from '@models/test';
+
+import {
+  StyledDelayModalContent,
+  StyledOptionWrapper,
+} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectExecutors} from '@redux/reducers/executorsSlice';
@@ -16,8 +23,6 @@ import {getTestExecutorIcon} from '@redux/utils/executorIcon';
 
 import {useGetAllTestsQuery} from '@services/tests';
 
-import {StyledDelayModalContent, StyledOptionWrapper} from '../SettingsTests.styled';
-
 type TestModalProps = {
   visible: boolean;
   onClose: () => void;
@@ -25,7 +30,7 @@ type TestModalProps = {
 };
 const {Option} = Select;
 
-const TestModal: React.FC<TestModalProps> = props => {
+export const TestModal: FC<TestModalProps> = props => {
   const {visible, onClose, onSubmit} = props;
 
   const {data: allTestsList} = useGetAllTestsQuery();
@@ -97,5 +102,3 @@ const TestModal: React.FC<TestModalProps> = props => {
     />
   );
 };
-
-export default TestModal;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddNode.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddNode.tsx
index c5fea5a36..03e3a71f8 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddNode.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddNode.tsx
@@ -1,6 +1,8 @@
-import {IntersectionContainer} from '../SettingsTests.styled';
+import {FC} from 'react';
 
-import AddStepDropdown from './AddStepDropdown';
+import {IntersectionContainer} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
+
+import {AddStepDropdown} from './AddStepDropdown';
 
 type AddNodeProps = {
   data: {
@@ -10,7 +12,7 @@ type AddNodeProps = {
   };
 };
 
-const AddNode: React.FC<AddNodeProps> = props => {
+export const AddNode: FC<AddNodeProps> = props => {
   const {data} = props;
 
   return (
@@ -21,5 +23,3 @@ const AddNode: React.FC<AddNodeProps> = props => {
     </>
   );
 };
-
-export default AddNode;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddStepDropdown.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddStepDropdown.tsx
index 69f4edb39..313fa4ff4 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddStepDropdown.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/AddStepDropdown.tsx
@@ -1,4 +1,4 @@
-import {ReactNode} from 'react';
+import {FC, ReactNode} from 'react';
 
 import {Dropdown} from 'antd';
 
@@ -12,7 +12,7 @@ type AddStepDropdownProps = {
   };
 };
 
-const AddStepDropdown: React.FC<AddStepDropdownProps> = props => {
+export const AddStepDropdown: FC<AddStepDropdownProps> = props => {
   const {data, before = false, children} = props;
   const group = data.group + (before ? -0.5 : 0);
 
@@ -31,4 +31,3 @@ const AddStepDropdown: React.FC<AddStepDropdownProps> = props => {
     </Dropdown>
   );
 };
-export default AddStepDropdown;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/IntersectionNode.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/IntersectionNode.tsx
index 7d7b8fe38..1faca2cae 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/IntersectionNode.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/IntersectionNode.tsx
@@ -1,8 +1,9 @@
+import {FC} from 'react';
 import {Handle, Position} from 'reactflow';
 
-import {IntersectionContainer} from '../SettingsTests.styled';
+import {IntersectionContainer} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
 
-import AddStepDropdown from './AddStepDropdown';
+import {AddStepDropdown} from './AddStepDropdown';
 
 type IntersectionNodeProps = {
   data: {
@@ -12,7 +13,7 @@ type IntersectionNodeProps = {
     last: boolean;
   };
 };
-const IntersectionNode: React.FC<IntersectionNodeProps> = props => {
+export const IntersectionNode: FC<IntersectionNodeProps> = props => {
   const {data} = props;
 
   return (
@@ -25,5 +26,3 @@ const IntersectionNode: React.FC<IntersectionNodeProps> = props => {
     </>
   );
 };
-
-export default IntersectionNode;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/StepNode.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/StepNode.tsx
index 1abc05578..f86886c16 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/StepNode.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/Nodes/StepNode.tsx
@@ -1,17 +1,21 @@
+import {FC} from 'react';
 import {Handle, Position} from 'reactflow';
 
 import {ClockCircleOutlined} from '@ant-design/icons';
 import {Tooltip} from 'antd';
 
-import {ExecutorIcon} from '@atoms';
+import {ExecutorIcon} from '@atoms/ExecutorIcon';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {LocalStep} from '@models/testSuite';
+import type {LocalStep} from '@models/testSuite';
 
-import {DotsDropdown} from '@molecules';
+import {DotsDropdown} from '@molecules/DotsDropdown';
 
-import {TestNodeContainer, TestNodeNameContainer} from '../SettingsTests.styled';
+import {
+  TestNodeContainer,
+  TestNodeNameContainer,
+} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
 
 type StepNodeProps = {
   data: {
@@ -22,7 +26,7 @@ type StepNodeProps = {
   id: string;
 };
 
-const StepNode: React.FC<StepNodeProps> = props => {
+export const StepNode: FC<StepNodeProps> = props => {
   const {data, id} = props;
   const {type, test, delay} = data.item;
 
@@ -45,5 +49,3 @@ const StepNode: React.FC<StepNodeProps> = props => {
     </>
   );
 };
-
-export default StepNode;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/TestSuiteStepsFlow.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/TestSuiteStepsFlow.tsx
index 2f67b5e23..4cd2f238b 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/TestSuiteStepsFlow.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/TestSuiteStepsFlow.tsx
@@ -1,14 +1,20 @@
-import {useEffect, useMemo, useState} from 'react';
+import {FC, useEffect, useMemo, useState} from 'react';
 import ReactFlow, {Controls, Edge, Node} from 'reactflow';
 
 import {nanoid} from '@reduxjs/toolkit';
 
-import {LocalStep} from '@models/testSuite';
+import type {LocalStep} from '@models/testSuite';
 
-import AddNode from './Nodes/AddNode';
-import IntersectionNode from './Nodes/IntersectionNode';
-import StepNode from './Nodes/StepNode';
-import {ReactFlowContainer, addHeight, itemHeight, itemWidth} from './SettingsTests.styled';
+import {
+  ReactFlowContainer,
+  addHeight,
+  itemHeight,
+  itemWidth,
+} from '@pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests.styled';
+
+import {AddNode} from './Nodes/AddNode';
+import {IntersectionNode} from './Nodes/IntersectionNode';
+import {StepNode} from './Nodes/StepNode';
 
 interface ExtendedNode extends Node {
   group?: number | string;
@@ -41,7 +47,7 @@ const getAddPosition = (group: number, groupLength: number, offsetY: number) =>
 };
 const getHeight = (maxLength: number) => getItemPosition(0, maxLength - 1, 0).y + itemHeight / 2;
 
-const TestSuiteStepsFlow: React.FC<TestSuiteStepsFlowProps> = props => {
+export const TestSuiteStepsFlow: FC<TestSuiteStepsFlowProps> = props => {
   const {steps, setSteps, showDelayModal, showTestModal, isV2} = props;
 
   const [nodes, setNodes] = useState<ExtendedNode[]>([]);
@@ -143,5 +149,3 @@ const TestSuiteStepsFlow: React.FC<TestSuiteStepsFlowProps> = props => {
     </ReactFlowContainer>
   );
 };
-
-export default TestSuiteStepsFlow;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/index.ts
deleted file mode 100644
index 78cd23671..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsTests/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsTests';
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/SettingsVariables.tsx b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables.tsx
similarity index 71%
rename from src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/SettingsVariables.tsx
rename to src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables.tsx
index aa84b4205..967eff919 100644
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/SettingsVariables.tsx
+++ b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables.tsx
@@ -1,14 +1,12 @@
 import {FC} from 'react';
 
-import {Variables} from '@organisms/EntityDetails';
+import {Variables} from '@organisms/EntityDetails/Settings/SettingsVariables/Variables';
 
 import {useUpdateTestSuiteMutation} from '@services/testSuites';
 
-const SettingsVariables: FC = () => (
+export const SettingsVariables: FC = () => (
   <Variables
     description="Define environment variables which will be shared across your tests. Variables defined at a Test Suite level will override those defined at a Test level."
     useUpdateEntity={useUpdateTestSuiteMutation}
   />
 );
-
-export default SettingsVariables;
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/index.ts
deleted file mode 100644
index ae7a1cc53..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/SettingsVariables/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsVariables';
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/index.ts
deleted file mode 100644
index 9ed993f1e..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/TestSuiteSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSuiteSettings';
diff --git a/src/components/pages/TestSuites/TestSuiteDetails/index.ts b/src/components/pages/TestSuites/TestSuiteDetails/index.ts
deleted file mode 100644
index 485e727e6..000000000
--- a/src/components/pages/TestSuites/TestSuiteDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSuiteDetails';
diff --git a/src/components/pages/TestSuites/TestSuitesList/TestSuitesList.tsx b/src/components/pages/TestSuites/TestSuitesList.tsx
similarity index 80%
rename from src/components/pages/TestSuites/TestSuitesList/TestSuitesList.tsx
rename to src/components/pages/TestSuites/TestSuitesList.tsx
index c5f0f1238..d2eb30662 100644
--- a/src/components/pages/TestSuites/TestSuitesList/TestSuitesList.tsx
+++ b/src/components/pages/TestSuites/TestSuitesList.tsx
@@ -1,15 +1,15 @@
 import {FC, useCallback, useContext} from 'react';
 
-import {MainContext} from '@contexts';
-import {ModalConfig} from '@contexts/ModalContext';
+import {MainContext} from '@contexts/MainContext';
+import type {ModalConfig} from '@contexts/ModalContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {TestSuite} from '@models/testSuite';
+import type {TestSuite} from '@models/testSuite';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
-import {EntityListContent} from '@organisms';
+import {EntityListContent} from '@organisms/EntityList/EntityListContent';
 
 import {usePluginSlot} from '@plugins/hooks';
 
@@ -19,9 +19,9 @@ import {initialFilters, useTestSuitesField, useTestSuitesSync} from '@store/test
 
 import {PollingIntervals} from '@utils/numbers';
 
-import EmptyTestSuites from './EmptyTestSuites';
-import TestSuiteCard from './TestSuiteCard';
-import TestSuiteCreationModalContent from './TestSuiteCreationModalContent';
+import {EmptyTestSuites} from './TestSuitesList/EmptyTestSuites';
+import {TestSuiteCard} from './TestSuitesList/TestSuiteCard';
+import {TestSuiteCreationModalContent} from './TestSuitesList/TestSuiteCreationModalContent';
 
 const PageDescription: FC = () => <>Explore your test suites at a glance...</>;
 
@@ -33,7 +33,7 @@ const createModal: ModalConfig = {
   dataTestModalRoot: 'add-a-new-test-suite-modal',
 };
 
-const TestSuitesList: FC = () => {
+export const TestSuitesList: FC = () => {
   const {isClusterAvailable} = useContext(MainContext);
   const [filters, setFilters] = useTestSuitesField('filters');
 
@@ -80,5 +80,3 @@ const TestSuitesList: FC = () => {
     />
   );
 };
-
-export default TestSuitesList;
diff --git a/src/components/pages/TestSuites/TestSuitesList/EmptyTestSuites.tsx b/src/components/pages/TestSuites/TestSuitesList/EmptyTestSuites.tsx
index d2a3adf7b..32b30bfd6 100644
--- a/src/components/pages/TestSuites/TestSuitesList/EmptyTestSuites.tsx
+++ b/src/components/pages/TestSuites/TestSuitesList/EmptyTestSuites.tsx
@@ -1,10 +1,11 @@
 import {FC} from 'react';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {externalLinks} from '@utils/externalLinks';
 
-const EmptyTestSuites: FC<{action: () => void}> = props => {
+export const EmptyTestSuites: FC<{action: () => void}> = props => {
   const {action} = props;
 
   return (
@@ -23,5 +24,3 @@ const EmptyTestSuites: FC<{action: () => void}> = props => {
     </EmptyListContent>
   );
 };
-
-export default EmptyTestSuites;
diff --git a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCard.tsx b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCard.tsx
index 0d91a08a8..e4919746b 100644
--- a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCard.tsx
+++ b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCard.tsx
@@ -1,12 +1,12 @@
 import React, {FC, useContext, useRef} from 'react';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {TestSuiteWithExecution} from '@models/testSuite';
+import type {TestSuiteWithExecution} from '@models/testSuite';
 
-import EntityGridItemPure, {Item} from '@molecules/EntityGrid/EntityGridItemPure';
+import {EntityGridItemPure, Item} from '@molecules/EntityGrid/EntityGridItemPure';
 
 import {useGetTestSuiteExecutionMetricsQuery} from '@services/testSuiteExecutions';
 
@@ -18,7 +18,7 @@ export interface TestSuiteCardProps {
   onAbort: (item: Item) => void;
 }
 
-const TestSuiteCard: FC<TestSuiteCardProps> = ({item: {testSuite, latestExecution}, onClick, onAbort}) => {
+export const TestSuiteCard: FC<TestSuiteCardProps> = ({item: {testSuite, latestExecution}, onClick, onAbort}) => {
   const {isClusterAvailable} = useContext(MainContext);
 
   const ref = useRef(null);
@@ -41,5 +41,3 @@ const TestSuiteCard: FC<TestSuiteCardProps> = ({item: {testSuite, latestExecutio
     />
   );
 };
-
-export default TestSuiteCard;
diff --git a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/TestSuiteCreationModalContent.tsx b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent.tsx
similarity index 80%
rename from src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/TestSuiteCreationModalContent.tsx
rename to src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent.tsx
index 18d1648bc..039fa0929 100644
--- a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/TestSuiteCreationModalContent.tsx
+++ b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent.tsx
@@ -1,19 +1,22 @@
-import React, {useContext, useEffect, useRef, useState} from 'react';
+import {FC, memo, useContext, useEffect, useRef, useState} from 'react';
 
 import {Form, Input} from 'antd';
 
-import {ModalContext} from '@contexts';
+import {ModalContext} from '@contexts/ModalContext';
 
-import {Button, FormItem, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {Option} from '@models/form';
-import {ErrorNotificationConfig} from '@models/notifications';
+import type {Option} from '@models/form';
+import type {ErrorNotificationConfig} from '@models/notifications';
 
-import {LabelsSelect, NotificationContent} from '@molecules';
+import {LabelsSelect} from '@molecules/LabelsSelect';
 import {decomposeLabels} from '@molecules/LabelsSelect/utils';
+import {NotificationContent} from '@molecules/Notification/NotificationContent';
 
 import {useAddTestSuiteMutation} from '@services/testSuites';
 
@@ -22,7 +25,7 @@ import {useTelemetry} from '@telemetry/hooks';
 import {k8sResourceNameMaxLength, k8sResourceNamePattern, required} from '@utils/form';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {StyledFormSpace} from './CreationModal.styled';
+import {StyledFormSpace} from './TestSuiteCreationModalContent/CreationModal.styled';
 
 const {TextArea} = Input;
 
@@ -32,7 +35,7 @@ type TestSuiteCreationModalFormValues = {
   labels: readonly Option[];
 };
 
-const TestSuiteCreationModalContent: React.FC = () => {
+export const TestSuiteCreationModalContent: FC = memo(() => {
   const [form] = Form.useForm<TestSuiteCreationModalFormValues>();
 
   const {closeModal} = useContext(ModalContext);
@@ -107,6 +110,4 @@ const TestSuiteCreationModalContent: React.FC = () => {
       </StyledFormSpace>
     </Form>
   );
-};
-
-export default React.memo(TestSuiteCreationModalContent);
+});
diff --git a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/CreationModal.styled.tsx b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/CreationModal.styled.tsx
index cbce9c8bb..c2069b5e6 100644
--- a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/CreationModal.styled.tsx
+++ b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/CreationModal.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import {FullWidthSpace} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
 export const StyledFormSpace = styled(FullWidthSpace)`
   .ant-form-item-control-input-content {
diff --git a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/index.ts b/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/index.ts
deleted file mode 100644
index a11cad998..000000000
--- a/src/components/pages/TestSuites/TestSuitesList/TestSuiteCreationModalContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSuiteCreationModalContent';
diff --git a/src/components/pages/TestSuites/TestSuitesList/index.ts b/src/components/pages/TestSuites/TestSuitesList/index.ts
deleted file mode 100644
index a66d3e5a0..000000000
--- a/src/components/pages/TestSuites/TestSuitesList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSuitesList';
diff --git a/src/components/pages/TestSuites/index.ts b/src/components/pages/TestSuites/index.ts
deleted file mode 100644
index 10fc0e8f7..000000000
--- a/src/components/pages/TestSuites/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSuites';
diff --git a/src/components/pages/Tests/Tests.tsx b/src/components/pages/Tests.tsx
similarity index 83%
rename from src/components/pages/Tests/Tests.tsx
rename to src/components/pages/Tests.tsx
index abb023995..45e3409a2 100644
--- a/src/components/pages/Tests/Tests.tsx
+++ b/src/components/pages/Tests.tsx
@@ -1,14 +1,13 @@
 import {FC} from 'react';
 import {Outlet, Route, Routes} from 'react-router-dom';
 
-import {NotFound} from '@pages';
+import {DashboardRewrite} from '@src/DashboardRewrite';
 
-import DashboardRewrite from '@src/DashboardRewrite';
+import {NotFound} from './NotFound';
+import {TestDetails} from './Tests/TestDetails';
+import {TestsList} from './Tests/TestsList';
 
-import TestDetails from './TestDetails';
-import TestsList from './TestsList';
-
-const Tests: FC = () => (
+export const Tests: FC = () => (
   <>
     <Routes>
       {/* Backwards compatibility */}
@@ -38,5 +37,3 @@ const Tests: FC = () => (
     <Outlet />
   </>
 );
-
-export default Tests;
diff --git a/src/components/pages/Tests/TestDetails/TestDetails.tsx b/src/components/pages/Tests/TestDetails.tsx
similarity index 74%
rename from src/components/pages/Tests/TestDetails/TestDetails.tsx
rename to src/components/pages/Tests/TestDetails.tsx
index 2155838e0..eee71fde1 100644
--- a/src/components/pages/Tests/TestDetails/TestDetails.tsx
+++ b/src/components/pages/Tests/TestDetails.tsx
@@ -1,7 +1,8 @@
 import React, {FC} from 'react';
 import {useParams} from 'react-router-dom';
 
-import {EntityDetailsLayer, ExecutionDetailsLayer} from '@organisms/EntityDetails';
+import {EntityDetailsLayer} from '@organisms/EntityDetails/EntityDetailsLayer';
+import {ExecutionDetailsLayer} from '@organisms/EntityDetails/ExecutionDetailsLayer';
 
 import {
   useGetTestExecutionByIdQuery,
@@ -10,13 +11,13 @@ import {
   useGetTestQuery,
 } from '@services/tests';
 
-import TestDetailsContent from './TestDetailsContent';
+import {TestDetailsContent} from './TestDetails/TestDetailsContent';
 
 interface TestDetailsProps {
   tab?: string;
 }
 
-const TestDetails: FC<TestDetailsProps> = ({tab}) => {
+export const TestDetails: FC<TestDetailsProps> = ({tab}) => {
   const {id, execId, settingsTab} = useParams();
   return (
     <EntityDetailsLayer
@@ -38,5 +39,3 @@ const TestDetails: FC<TestDetailsProps> = ({tab}) => {
     </EntityDetailsLayer>
   );
 };
-
-export default TestDetails;
diff --git a/src/components/pages/Tests/TestDetails/TestDetailsContent.tsx b/src/components/pages/Tests/TestDetails/TestDetailsContent.tsx
index 4954fd1a4..1b3d6436b 100644
--- a/src/components/pages/Tests/TestDetails/TestDetailsContent.tsx
+++ b/src/components/pages/Tests/TestDetails/TestDetailsContent.tsx
@@ -3,32 +3,36 @@ import React, {FC} from 'react';
 import {Tabs} from 'antd';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useRunEntity from '@hooks/useRunEntity';
-import useTrackTimeAnalytics from '@hooks/useTrackTimeAnalytics';
+import {useRunEntity} from '@hooks/useRunEntity';
+import {useTrackTimeAnalytics} from '@hooks/useTrackTimeAnalytics';
 
-import {CLICommands, SummaryGrid} from '@molecules';
+import {CLICommands} from '@molecules/CLICommands';
+import {SummaryGrid} from '@molecules/SummaryGrid';
 
-import {PageWrapper} from '@organisms';
-import {EntityDetailsHeader, EntityDetailsWrapper, RecentExecutionsTab} from '@organisms/EntityDetails';
+import {EntityDetailsWrapper} from '@organisms/EntityDetails.styled';
+import {EntityDetailsHeader} from '@organisms/EntityDetails/EntityDetailsHeader';
+import {RecentExecutionsTab} from '@organisms/EntityDetails/RecentExecutionsTab';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
 
-import {Error, Loading} from '@pages';
-import PageMetadata from '@pages/PageMetadata';
+import {Error} from '@pages/Error';
+import {Loading} from '@pages/Loading';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {useAbortAllTestExecutionsMutation, useAbortTestExecutionMutation} from '@services/tests';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-import TestExecutionDrawer from './TestExecution/TestExecutionDrawer';
-import TestSettings from './TestSettings';
+import {TestExecutionDrawer} from './TestExecution/TestExecutionDrawer';
+import {TestSettings} from './TestSettings';
 
 interface TestDetailsContentProps {
   tab?: string;
   settingsTab?: string;
 }
 
-const TestDetailsContent: FC<TestDetailsContentProps> = ({tab, settingsTab}) => {
+export const TestDetailsContent: FC<TestDetailsContentProps> = ({tab, settingsTab}) => {
   const {id, details, error, metrics} = useEntityDetailsPick('id', 'details', 'error', 'metrics');
   const [isRunning, run] = useRunEntity('tests', details);
 
@@ -85,5 +89,3 @@ const TestDetailsContent: FC<TestDetailsContentProps> = ({tab, settingsTab}) =>
     </EntityDetailsWrapper>
   );
 };
-
-export default TestDetailsContent;
diff --git a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionArtifacts.tsx b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionArtifacts.tsx
index 7ecc963ba..b20321b3f 100644
--- a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionArtifacts.tsx
+++ b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionArtifacts.tsx
@@ -1,10 +1,10 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import {Artifact} from '@models/artifact';
+import type {Artifact} from '@models/artifact';
 
-import {ArtifactsList} from '@molecules';
+import {ArtifactsList} from '@molecules/ArtifactsList';
 
 import {useGetTestExecutionArtifactsQuery} from '@services/tests';
 
@@ -15,7 +15,7 @@ type TestExecutionArtifactsProps = {
   startTime?: string;
 };
 
-const TestExecutionArtifacts: React.FC<TestExecutionArtifactsProps> = props => {
+export const TestExecutionArtifacts: FC<TestExecutionArtifactsProps> = props => {
   const {id, testName, testSuiteName, startTime} = props;
 
   const {isClusterAvailable} = useContext(MainContext);
@@ -43,5 +43,3 @@ const TestExecutionArtifacts: React.FC<TestExecutionArtifactsProps> = props => {
     />
   );
 };
-
-export default TestExecutionArtifacts;
diff --git a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionDrawer.tsx b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionDrawer.tsx
index ffbb91d79..8d3df78c5 100644
--- a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionDrawer.tsx
+++ b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionDrawer.tsx
@@ -1,14 +1,15 @@
 import {FC} from 'react';
 
-import {ExecutionDrawer, ExecutionDrawerHeader} from '@organisms';
+import {ExecutionDrawer} from '@organisms/ExecutionDrawer';
+import {ExecutionDrawerHeader} from '@organisms/ExecutionDrawer/ExecutionDrawerHeader';
 
 import {useAbortTestExecutionMutation} from '@services/tests';
 
 import {useExecutionDetailsPick} from '@store/executionDetails';
 
-import TestExecutionTabs from './TestExecutionTabs';
+import {TestExecutionTabs} from './TestExecutionTabs';
 
-const TestExecutionDrawer: FC = () => {
+export const TestExecutionDrawer: FC = () => {
   const {close, id, data} = useExecutionDetailsPick('close', 'id', 'data');
   return (
     <ExecutionDrawer
@@ -21,5 +22,3 @@ const TestExecutionDrawer: FC = () => {
     </ExecutionDrawer>
   );
 };
-
-export default TestExecutionDrawer;
diff --git a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionTabs.tsx b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionTabs.tsx
index a7b3324d1..08487c81a 100644
--- a/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionTabs.tsx
+++ b/src/components/pages/Tests/TestDetails/TestExecution/TestExecutionTabs.tsx
@@ -1,16 +1,18 @@
-import {useEffect} from 'react';
+import {FC, useEffect} from 'react';
 import {useParams} from 'react-router-dom';
 
 import {Tabs} from 'antd';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {Execution} from '@models/execution';
+import type {Execution} from '@models/execution';
 
-import {CLICommands, ExecutionsVariablesList, LogOutput} from '@molecules';
+import {CLICommands} from '@molecules/CLICommands';
+import {LogOutput} from '@molecules/LogOutput';
+import {ExecutionsVariablesList} from '@molecules/Variables/ExecutionsVariablesList';
 
 import {usePluginSlot, usePluginSlotList, usePluginState} from '@plugins/hooks';
-import {LogOutputBannerInterface, TestExecutionTabsInterface} from '@plugins/types';
+import type {LogOutputBannerInterface, TestExecutionTabsInterface} from '@plugins/types';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectExecutorsFeaturesMap} from '@redux/reducers/executorsSlice';
@@ -20,9 +22,9 @@ import {useExecutionDetailsPick} from '@store/executionDetails';
 
 import {decomposeVariables} from '@utils/variables';
 
-import TestExecutionArtifacts from './TestExecutionArtifacts';
+import {TestExecutionArtifacts} from './TestExecutionArtifacts';
 
-const TestExecutionTabs: React.FC = () => {
+export const TestExecutionTabs: FC = () => {
   const {data: execution} = useExecutionDetailsPick('data') as {data: Execution};
   const {details} = useEntityDetailsPick('details');
   const [, setTestExecutionTabsData] = usePluginState<TestExecutionTabsInterface>('testExecutionTabs');
@@ -117,5 +119,3 @@ const TestExecutionTabs: React.FC = () => {
 
   return <Tabs defaultActiveKey="log-output" activeKey={execDetailsTab} onChange={setExecutionTab} items={items} />;
 };
-
-export default TestExecutionTabs;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/TestSettings.tsx b/src/components/pages/Tests/TestDetails/TestSettings.tsx
similarity index 51%
rename from src/components/pages/Tests/TestDetails/TestSettings/TestSettings.tsx
rename to src/components/pages/Tests/TestDetails/TestSettings.tsx
index d3a01b1af..c40e6028f 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/TestSettings.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings.tsx
@@ -1,17 +1,17 @@
 import React, {FC} from 'react';
 
-import {SettingsLayout} from '@molecules';
-import {SettingsLayoutProps} from '@molecules/SettingsLayout/SettingsLayout';
+import {SettingsLayout} from '@molecules/SettingsLayout';
+import type {SettingsLayoutProps} from '@molecules/SettingsLayout';
 
-import {SettingsScheduling} from '@organisms/EntityDetails';
+import {Schedule as SettingsScheduling} from '@organisms/EntityDetails/Settings/SettingsScheduling/Schedule';
 
 import {useUpdateTestSuiteMutation} from '@services/testSuites';
 
-import SettingsDefinition from './SettingsDefinition';
-import SettingsExecution from './SettingsExecution';
-import SettingsGeneral from './SettingsGeneral';
-import SettingsTest from './SettingsTest';
-import SettingsVariables from './SettingsVariables';
+import {SettingsDefinition} from './TestSettings/SettingsDefinition';
+import {SettingsExecution} from './TestSettings/SettingsExecution';
+import {SettingsGeneral} from './TestSettings/SettingsGeneral';
+import {SettingsTest} from './TestSettings/SettingsTest';
+import {SettingsVariables} from './TestSettings/SettingsVariables';
 
 const tabs = [
   {id: 'general', label: 'General', children: <SettingsGeneral />},
@@ -28,6 +28,4 @@ const tabs = [
 
 type TestSettingsProps = Omit<SettingsLayoutProps, 'tabs'>;
 
-const TestSettings: FC<TestSettingsProps> = props => <SettingsLayout {...props} tabs={tabs} />;
-
-export default TestSettings;
+export const TestSettings: FC<TestSettingsProps> = props => <SettingsLayout {...props} tabs={tabs} />;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/SettingsDefinition.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition.tsx
similarity index 88%
rename from src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/SettingsDefinition.tsx
rename to src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition.tsx
index 7deef84e0..bc013123f 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/SettingsDefinition.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition.tsx
@@ -1,6 +1,6 @@
 import {FC} from 'react';
 
-import {Definition} from '@molecules';
+import {Definition} from '@molecules/Definition';
 
 import {useGetTestDefinitionQuery, useUpdateTestDefinitionMutation} from '@services/tests';
 
@@ -9,7 +9,7 @@ import {useEntityDetailsPick} from '@store/entityDetails';
 import {createSchemaOverride} from '@utils/createSchemaOverride';
 import {testkubeCRDBases} from '@utils/externalLinks';
 
-const SettingsDefinition: FC = () => {
+export const SettingsDefinition: FC = () => {
   const {details} = useEntityDetailsPick('details');
   return (
     <Definition
@@ -27,5 +27,3 @@ const SettingsDefinition: FC = () => {
     />
   );
 };
-
-export default SettingsDefinition;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/index.ts
deleted file mode 100644
index bcf6568b5..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsDefinition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsDefinition';
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution.tsx
new file mode 100644
index 000000000..73891d2fd
--- /dev/null
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution.tsx
@@ -0,0 +1,11 @@
+import {FC} from 'react';
+
+import {PostRun} from './SettingsExecution/PostRun';
+import {PreRun} from './SettingsExecution/PreRun';
+
+export const SettingsExecution: FC = () => (
+  <>
+    <PreRun />
+    <PostRun />
+  </>
+);
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PostRun.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PostRun.tsx
index 5aa64a389..7998bbe5d 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PostRun.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PostRun.tsx
@@ -1,10 +1,14 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {CommandInput} from '@atoms';
+import {CommandInput} from '@atoms/CommandInput';
 
-import {FormItem, FullWidthSpace} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -18,7 +22,7 @@ type PostRunFormValues = {
   command: string;
 };
 
-const PostRun: React.FC = () => {
+export const PostRun: FC = () => {
   const {details} = useEntityDetailsPick('details');
   const isPostRunAvailable = usePermission(Permissions.editEntity);
 
@@ -74,5 +78,3 @@ const PostRun: React.FC = () => {
     </Form>
   );
 };
-
-export default PostRun;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PreRun.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PreRun.tsx
index 38eb3143c..3fee43a99 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PreRun.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/PreRun.tsx
@@ -1,10 +1,14 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {CommandInput} from '@atoms';
+import {CommandInput} from '@atoms/CommandInput';
 
-import {FormItem, FullWidthSpace} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -18,7 +22,7 @@ type PreRunFormValues = {
   command: string;
 };
 
-const PreRun: React.FC = () => {
+export const PreRun: FC = () => {
   const {entity, details} = useEntityDetailsPick('entity', 'details');
   const isPreRunAvailable = usePermission(Permissions.editEntity);
 
@@ -74,5 +78,3 @@ const PreRun: React.FC = () => {
     </Form>
   );
 };
-
-export default PreRun;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/SettingsExecution.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/SettingsExecution.tsx
deleted file mode 100644
index 799f77b54..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/SettingsExecution.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import PostRun from './PostRun';
-import PreRun from './PreRun';
-
-const SettingsExecution: React.FC = () => (
-  <>
-    <PreRun />
-    <PostRun />
-  </>
-);
-
-export default SettingsExecution;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/index.ts
deleted file mode 100644
index 48256ae7b..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsExecution/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsExecution';
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/SettingsGeneral.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral.tsx
similarity index 68%
rename from src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/SettingsGeneral.tsx
rename to src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral.tsx
index d3fcfb9fc..b0b841e9d 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/SettingsGeneral.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral.tsx
@@ -1,6 +1,9 @@
-import {Delete} from '@molecules/CommonSettings';
+import {FC} from 'react';
 
-import {Labels, NameNDescription} from '@organisms/EntityDetails';
+import {Delete} from '@molecules/CommonSettings/Delete';
+
+import {Labels} from '@organisms/EntityDetails/Settings/SettingsGeneral/Labels';
+import {NameNDescription} from '@organisms/EntityDetails/Settings/SettingsGeneral/NameNDescription';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -8,10 +11,10 @@ import {useDeleteTestMutation, useUpdateTestMutation} from '@services/tests';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-import FailureHandling from './FailureHandling';
-import Timeout from './Timeout';
+import {FailureHandling} from './SettingsGeneral/FailureHandling';
+import {Timeout} from './SettingsGeneral/Timeout';
 
-const SettingsGeneral: React.FC = () => {
+export const SettingsGeneral: FC = () => {
   const mayDelete = usePermission(Permissions.deleteEntity);
   const {details} = useEntityDetailsPick('details');
 
@@ -33,5 +36,3 @@ const SettingsGeneral: React.FC = () => {
     </>
   );
 };
-
-export default SettingsGeneral;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/FailureHandling.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/FailureHandling.tsx
index f359779ba..2efa0f09d 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/FailureHandling.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/FailureHandling.tsx
@@ -1,8 +1,13 @@
+import {FC} from 'react';
+
 import {Form, Popover} from 'antd';
 
-import {Checkbox, FormItem, Text} from '@custom-antd';
+import {Checkbox} from '@custom-antd/Checkbox';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -26,7 +31,7 @@ type FailureHandlingFormValues = {
   negativeTest: boolean;
 };
 
-const FailureHandling: React.FC = () => {
+export const FailureHandling: FC = () => {
   const {details} = useEntityDetailsPick('details');
   const mayEdit = usePermission(Permissions.editEntity);
 
@@ -80,5 +85,3 @@ const FailureHandling: React.FC = () => {
     </Form>
   );
 };
-
-export default FailureHandling;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/Timeout.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/Timeout.tsx
index c5405dfab..149670cce 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/Timeout.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/Timeout.tsx
@@ -1,10 +1,15 @@
+import {FC} from 'react';
+
 import {Form, Input} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {FormItem, FullWidthSpace, Text} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -20,7 +25,7 @@ type TimeoutForm = {
   activeDeadlineSeconds?: number;
 };
 
-const Timeout: React.FC = () => {
+export const Timeout: FC = () => {
   const {details} = useEntityDetailsPick('details');
   const {executionRequest, name} = details;
 
@@ -78,5 +83,3 @@ const Timeout: React.FC = () => {
     </Form>
   );
 };
-
-export default Timeout;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/index.ts
deleted file mode 100644
index 8fdaaccab..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsGeneral/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsGeneral';
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/SettingsTest.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest.tsx
similarity index 77%
rename from src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/SettingsTest.tsx
rename to src/components/pages/Tests/TestDetails/TestSettings/SettingsTest.tsx
index 0d49bea8a..b9978cc39 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/SettingsTest.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest.tsx
@@ -1,4 +1,6 @@
-import {notificationCall} from '@molecules';
+import {FC} from 'react';
+
+import {notificationCall} from '@molecules/Notification';
 
 import {useUpdateTestMutation} from '@services/tests';
 
@@ -6,10 +8,10 @@ import {useEntityDetailsPick} from '@store/entityDetails';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import Source from './Source';
-import TestType from './TestType';
+import {Source} from './SettingsTest/Source';
+import {TestType} from './SettingsTest/TestType';
 
-const SettingsTest: React.FC = () => {
+export const SettingsTest: FC = () => {
   const {details} = useEntityDetailsPick('details');
 
   const [updateTestMutation] = useUpdateTestMutation();
@@ -35,5 +37,3 @@ const SettingsTest: React.FC = () => {
     </>
   );
 };
-
-export default SettingsTest;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/Source.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/Source.tsx
index 409bf7c93..dc67c7e28 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/Source.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/Source.tsx
@@ -1,21 +1,20 @@
-import {memo, useMemo, useState} from 'react';
+import {FC, memo, useMemo, useState} from 'react';
 
 import {Form, Select} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {FormItem, FullWidthSpace} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {Test} from '@models/test';
+import type {Test} from '@models/test';
 
-import {ConfigurationCard} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
 
-import {
-  CustomSourceEditFormFields,
-  FileContentFields,
-  SourceEditFormFields,
-  StringContentFields,
-} from '@organisms/TestConfigurationForm';
+import {CustomFormFields as CustomSourceEditFormFields} from '@organisms/TestConfigurationForm/Custom/SourceEditFormFields';
+import {FileContentFields} from '@organisms/TestConfigurationForm/FileContentFields';
+import {SourceEdit as SourceEditFormFields} from '@organisms/TestConfigurationForm/Git/SourceEditFormFields';
+import {StringContentFields} from '@organisms/TestConfigurationForm/StringContentFields';
 import {Props, SourceFields, SourceType, getAdditionalFieldsComponent} from '@organisms/TestConfigurationForm/utils';
 
 import {Permissions, usePermission} from '@permissions/base';
@@ -50,7 +49,7 @@ type SourceProps = {
 
 type SourceFormValues = GetSourceFormValues & {testSource: string};
 
-const Source: React.FC<SourceProps> = props => {
+export const Source: FC<SourceProps> = memo(props => {
   const {details, updateTest} = props;
   const {type} = details;
 
@@ -158,6 +157,4 @@ const Source: React.FC<SourceProps> = props => {
       </ConfigurationCard>
     </Form>
   );
-};
-
-export default memo(Source);
+});
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/TestType.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/TestType.tsx
index afde34c6e..ffc3bc257 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/TestType.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/TestType.tsx
@@ -1,12 +1,13 @@
-import {memo} from 'react';
+import {FC, memo} from 'react';
 
 import {Form, Select} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {FormItem, FullWidthSpace} from '@custom-antd';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
-import {ConfigurationCard} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -26,7 +27,7 @@ type TestTypeFormValues = {
   type: string;
 };
 
-const TestType: React.FC<TestTypeProps> = props => {
+export const TestType: FC<TestTypeProps> = memo(props => {
   const {type, updateTest} = props;
 
   const [form] = Form.useForm<TestTypeFormValues>();
@@ -65,6 +66,4 @@ const TestType: React.FC<TestTypeProps> = props => {
       </ConfigurationCard>
     </Form>
   );
-};
-
-export default memo(TestType);
+});
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/index.ts
deleted file mode 100644
index 33ab20d64..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsTest/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsTest';
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/SettingsVariables.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables.tsx
similarity index 58%
rename from src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/SettingsVariables.tsx
rename to src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables.tsx
index 8b60b2799..694afed6f 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/SettingsVariables.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables.tsx
@@ -1,12 +1,12 @@
 import {FC} from 'react';
 
-import {Variables} from '@organisms/EntityDetails';
+import {Variables} from '@organisms/EntityDetails/Settings/SettingsVariables/Variables';
 
 import {useUpdateTestMutation} from '@services/tests';
 
-import Arguments from './Arguments';
+import {Arguments} from './SettingsVariables/Arguments';
 
-const SettingsVariables: FC = () => (
+export const SettingsVariables: FC = () => (
   <>
     <Variables
       description="Define environment variables which will be shared across your test."
@@ -15,5 +15,3 @@ const SettingsVariables: FC = () => (
     <Arguments />
   </>
 );
-
-export default SettingsVariables;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.styled.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.styled.tsx
index aa7c9b667..87f437d6d 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.styled.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.styled.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
-import Fonts from '@styles/Fonts';
+import {Colors} from '@styles/Colors';
+import {Fonts} from '@styles/Fonts';
 
 export const ArgumentsWrapper = styled.div`
   .args-textarea {
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.tsx b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.tsx
index 1a5c50f73..7b7617040 100644
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.tsx
+++ b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/Arguments.tsx
@@ -1,14 +1,18 @@
-import React, {useEffect, useState} from 'react';
+import {FC, useEffect, useState} from 'react';
 
 import {Form, Input} from 'antd';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {Button, FullWidthSpace, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {Test} from '@models/test';
+import type {Test} from '@models/test';
 
-import {ConfigurationCard, CopyCommand, notificationCall} from '@molecules';
+import {CopyCommand} from '@molecules/CLICommands/CopyCommand';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -16,7 +20,7 @@ import {useUpdateTestMutation} from '@services/tests';
 
 import {useEntityDetailsPick} from '@store/entityDetails';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 import {externalLinks} from '@utils/externalLinks';
 import {displayDefaultNotificationFlow} from '@utils/notification';
@@ -27,7 +31,7 @@ type ArgumentsFormValues = {
   args: string;
 };
 
-const Arguments: React.FC = () => {
+export const Arguments: FC = () => {
   const [form] = Form.useForm<ArgumentsFormValues>();
 
   const {details} = useEntityDetailsPick('details') as {details: Test};
@@ -139,5 +143,3 @@ value
     </Form>
   );
 };
-
-export default Arguments;
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/index.ts
deleted file mode 100644
index ae7a1cc53..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/SettingsVariables/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './SettingsVariables';
diff --git a/src/components/pages/Tests/TestDetails/TestSettings/index.ts b/src/components/pages/Tests/TestDetails/TestSettings/index.ts
deleted file mode 100644
index dd3ab9998..000000000
--- a/src/components/pages/Tests/TestDetails/TestSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestSettings';
diff --git a/src/components/pages/Tests/TestDetails/index.ts b/src/components/pages/Tests/TestDetails/index.ts
deleted file mode 100644
index dbd88d3d9..000000000
--- a/src/components/pages/Tests/TestDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestDetails';
diff --git a/src/components/pages/Tests/TestsList/TestsList.tsx b/src/components/pages/Tests/TestsList.tsx
similarity index 79%
rename from src/components/pages/Tests/TestsList/TestsList.tsx
rename to src/components/pages/Tests/TestsList.tsx
index d9d32eea8..6d200f8bd 100644
--- a/src/components/pages/Tests/TestsList/TestsList.tsx
+++ b/src/components/pages/Tests/TestsList.tsx
@@ -1,17 +1,17 @@
 import {FC, useCallback, useContext} from 'react';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {MainContext} from '@contexts';
-import {ModalConfig} from '@contexts/ModalContext';
+import {MainContext} from '@contexts/MainContext';
+import type {ModalConfig} from '@contexts/ModalContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {Test} from '@models/test';
+import type {Test} from '@models/test';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
-import {EntityListContent} from '@organisms';
+import {EntityListContent} from '@organisms/EntityList/EntityListContent';
 
 import {useAbortAllTestExecutionsMutation, useGetTestsQuery} from '@services/tests';
 
@@ -20,9 +20,9 @@ import {initialFilters, useTestsField, useTestsSync} from '@store/tests';
 import {externalLinks} from '@utils/externalLinks';
 import {PollingIntervals} from '@utils/numbers';
 
-import EmptyTests from './EmptyTests';
-import TestCard from './TestCard';
-import TestCreationModalContent from './TestCreationModalContent';
+import {EmptyTests} from './TestsList/EmptyTests';
+import {TestCard} from './TestsList/TestCard';
+import {TestCreationModalContent} from './TestsList/TestCreationModalContent';
 
 const PageDescription: FC = () => (
   <>
@@ -39,7 +39,7 @@ export const createModal: ModalConfig = {
   dataTestModalRoot: 'add-a-new-test-modal',
 };
 
-const TestsList: FC = () => {
+export const TestsList: FC = () => {
   const {isClusterAvailable} = useContext(MainContext);
   const [filters, setFilters] = useTestsField('filters');
 
@@ -85,5 +85,3 @@ const TestsList: FC = () => {
     />
   );
 };
-
-export default TestsList;
diff --git a/src/components/pages/Tests/TestsList/EmptyTests.tsx b/src/components/pages/Tests/TestsList/EmptyTests.tsx
index 6db85e869..d1141b856 100644
--- a/src/components/pages/Tests/TestsList/EmptyTests.tsx
+++ b/src/components/pages/Tests/TestsList/EmptyTests.tsx
@@ -1,10 +1,11 @@
 import {FC} from 'react';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {externalLinks} from '@utils/externalLinks';
 
-const EmptyTests: FC<{action: () => void}> = ({action}) => {
+export const EmptyTests: FC<{action: () => void}> = ({action}) => {
   return (
     <EmptyListContent
       title="Create your first test in a few easy steps."
@@ -24,5 +25,3 @@ const EmptyTests: FC<{action: () => void}> = ({action}) => {
     </EmptyListContent>
   );
 };
-
-export default EmptyTests;
diff --git a/src/components/pages/Tests/TestsList/TestCard.tsx b/src/components/pages/Tests/TestsList/TestCard.tsx
index 58a1a2b88..d925ee9a3 100644
--- a/src/components/pages/Tests/TestsList/TestCard.tsx
+++ b/src/components/pages/Tests/TestsList/TestCard.tsx
@@ -1,12 +1,12 @@
 import React, {FC, useContext, useRef} from 'react';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {TestWithExecution} from '@models/test';
+import type {TestWithExecution} from '@models/test';
 
-import EntityGridItemPure, {Item} from '@molecules/EntityGrid/EntityGridItemPure';
+import {EntityGridItemPure, Item} from '@molecules/EntityGrid/EntityGridItemPure';
 
 import {useGetTestExecutionMetricsQuery} from '@services/tests';
 
@@ -18,7 +18,7 @@ export interface TestCardProps {
   onAbort: (item: Item) => void;
 }
 
-const TestCard: FC<TestCardProps> = ({item: {test, latestExecution}, onClick, onAbort}) => {
+export const TestCard: FC<TestCardProps> = ({item: {test, latestExecution}, onClick, onAbort}) => {
   const {isClusterAvailable} = useContext(MainContext);
 
   const ref = useRef(null);
@@ -41,5 +41,3 @@ const TestCard: FC<TestCardProps> = ({item: {test, latestExecution}, onClick, on
     />
   );
 };
-
-export default TestCard;
diff --git a/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationModalContent.tsx b/src/components/pages/Tests/TestsList/TestCreationModalContent.tsx
similarity index 83%
rename from src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationModalContent.tsx
rename to src/components/pages/Tests/TestsList/TestCreationModalContent.tsx
index 7f847db04..f29aac278 100644
--- a/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationModalContent.tsx
+++ b/src/components/pages/Tests/TestsList/TestCreationModalContent.tsx
@@ -1,16 +1,16 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
 import {Form} from 'antd';
 
-import {ModalContext} from '@contexts';
+import {ModalContext} from '@contexts/ModalContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {MetadataResponse, RTKResponse} from '@models/fetch';
-import {Test} from '@models/test';
+import type {MetadataResponse, RTKResponse} from '@models/fetch';
+import type {Test} from '@models/test';
 
-import {Hint} from '@molecules';
-import {HintProps} from '@molecules/Hint/Hint';
+import {Hint} from '@molecules/Hint';
+import type {HintProps} from '@molecules/Hint';
 
 import {useAppSelector} from '@redux/hooks';
 import {selectExecutors} from '@redux/reducers/executorsSlice';
@@ -21,8 +21,8 @@ import {useTelemetry} from '@telemetry/hooks';
 import {externalLinks} from '@utils/externalLinks';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {TestCreationModalWrapper} from './CreationModal.styled';
-import TestCreationForm from './TestCreationForm';
+import {TestCreationModalWrapper} from './TestCreationModalContent/CreationModal.styled';
+import {TestCreationForm} from './TestCreationModalContent/TestCreationForm';
 
 const defaultHintConfig = {
   title: 'Missing a test type?',
@@ -30,7 +30,7 @@ const defaultHintConfig = {
   openLink: () => window.open(externalLinks.containerExecutor),
 };
 
-const TestCreationModalContent: React.FC = () => {
+export const TestCreationModalContent: FC = () => {
   const [form] = Form.useForm();
   const testType = Form.useWatch('testType', form);
 
@@ -88,5 +88,3 @@ const TestCreationModalContent: React.FC = () => {
     </TestCreationModalWrapper>
   );
 };
-
-export default TestCreationModalContent;
diff --git a/src/components/pages/Tests/TestsList/TestCreationModalContent/CreationModal.styled.tsx b/src/components/pages/Tests/TestsList/TestCreationModalContent/CreationModal.styled.tsx
index cfcd10b50..cea2f44f2 100644
--- a/src/components/pages/Tests/TestsList/TestCreationModalContent/CreationModal.styled.tsx
+++ b/src/components/pages/Tests/TestsList/TestCreationModalContent/CreationModal.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import {FullWidthSpace} from '@custom-antd';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
 export const StyledFormSpace = styled(FullWidthSpace)`
   .ant-form-item-control-input-content {
diff --git a/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationForm.tsx b/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationForm.tsx
index cf758c4c7..87c0d6879 100644
--- a/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationForm.tsx
+++ b/src/components/pages/Tests/TestsList/TestCreationModalContent/TestCreationForm.tsx
@@ -1,27 +1,28 @@
-import React, {useMemo, useRef, useState} from 'react';
+import {FC, useMemo, useRef, useState} from 'react';
 
 import {Form, FormInstance, Input, Select} from 'antd';
 
-import {Button, FormItem, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {Text} from '@custom-antd/Typography/Text';
 
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
 import {Executor} from '@models/executors';
-import {MetadataResponse, RTKResponse} from '@models/fetch';
-import {Option} from '@models/form';
-import {ErrorNotificationConfig} from '@models/notifications';
-import {SourceWithRepository} from '@models/sources';
-import {Test} from '@models/test';
+import type {MetadataResponse, RTKResponse} from '@models/fetch';
+import type {Option} from '@models/form';
+import type {ErrorNotificationConfig} from '@models/notifications';
+import type {SourceWithRepository} from '@models/sources';
+import type {Test} from '@models/test';
 
-import {LabelsSelect, NotificationContent} from '@molecules';
+import {LabelsSelect} from '@molecules/LabelsSelect';
 import {decomposeLabels} from '@molecules/LabelsSelect/utils';
+import {NotificationContent} from '@molecules/Notification/NotificationContent';
 
-import {
-  CustomCreationFormFields,
-  FileContentFields,
-  GitCreationFormFields,
-  StringContentFields,
-} from '@organisms/TestConfigurationForm';
+import {CustomFormFields as CustomCreationFormFields} from '@organisms/TestConfigurationForm/Custom/CreationFormFields';
+import {FileContentFields} from '@organisms/TestConfigurationForm/FileContentFields';
+import {GitFormFields as GitCreationFormFields} from '@organisms/TestConfigurationForm/Git/CreationFormFields';
+import {StringContentFields} from '@organisms/TestConfigurationForm/StringContentFields';
 import {Props, SourceFields, SourceType, getAdditionalFieldsComponent} from '@organisms/TestConfigurationForm/utils';
 
 import {useAddTestMutation} from '@services/tests';
@@ -59,7 +60,7 @@ const additionalFields: SourceFields = {
   string: StringContentFields,
 };
 
-const TestCreationForm: React.FC<TestCreationFormProps> = props => {
+export const TestCreationForm: FC<TestCreationFormProps> = props => {
   const {form, testSources, executors, onSuccess} = props;
 
   const remappedExecutors = remapExecutors(executors);
@@ -202,5 +203,3 @@ const TestCreationForm: React.FC<TestCreationFormProps> = props => {
     </Form>
   );
 };
-
-export default TestCreationForm;
diff --git a/src/components/pages/Tests/TestsList/TestCreationModalContent/index.ts b/src/components/pages/Tests/TestsList/TestCreationModalContent/index.ts
deleted file mode 100644
index ab6cad12e..000000000
--- a/src/components/pages/Tests/TestsList/TestCreationModalContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestCreationModalContent';
diff --git a/src/components/pages/Tests/TestsList/index.ts b/src/components/pages/Tests/TestsList/index.ts
deleted file mode 100644
index 6b2849f76..000000000
--- a/src/components/pages/Tests/TestsList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TestsList';
diff --git a/src/components/pages/Tests/index.ts b/src/components/pages/Tests/index.ts
deleted file mode 100644
index 36f5f102d..000000000
--- a/src/components/pages/Tests/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Tests';
diff --git a/src/components/pages/Triggers/Triggers.tsx b/src/components/pages/Triggers.tsx
similarity index 66%
rename from src/components/pages/Triggers/Triggers.tsx
rename to src/components/pages/Triggers.tsx
index 01378ad05..790bf9289 100644
--- a/src/components/pages/Triggers/Triggers.tsx
+++ b/src/components/pages/Triggers.tsx
@@ -1,11 +1,11 @@
+import {FC} from 'react';
 import {Outlet, Route, Routes} from 'react-router-dom';
 
-import {NotFound} from '@pages';
+import {NotFound} from './NotFound';
+import {TriggerDetails} from './Triggers/TriggerDetails';
+import {TriggersList} from './Triggers/TriggersList';
 
-import TriggerDetails from './TriggerDetails';
-import TriggersList from './TriggersList';
-
-const Triggers: React.FC = () => {
+export const Triggers: FC = () => {
   return (
     <>
       <Routes>
@@ -20,5 +20,3 @@ const Triggers: React.FC = () => {
     </>
   );
 };
-
-export default Triggers;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerDetails.tsx b/src/components/pages/Triggers/TriggerDetails.tsx
similarity index 82%
rename from src/components/pages/Triggers/TriggerDetails/TriggerDetails.tsx
rename to src/components/pages/Triggers/TriggerDetails.tsx
index c925cb625..562fa0050 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerDetails.tsx
+++ b/src/components/pages/Triggers/TriggerDetails.tsx
@@ -3,14 +3,16 @@ import {useParams} from 'react-router-dom';
 
 import {Tabs} from 'antd';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {PageHeader, PageWrapper} from '@organisms';
+import {PageWrapper} from '@organisms/PageBlueprint.styled';
+import {PageHeader} from '@organisms/PageBlueprint/PageHeader';
 
-import {Error, Loading} from '@pages';
-import PageMetadata from '@pages/PageMetadata';
+import {Error} from '@pages/Error';
+import {Loading} from '@pages/Loading';
+import {PageMetadata} from '@pages/PageMetadata';
 
 import {useGetTriggerByIdQuery, useGetTriggersKeyMapQuery} from '@services/triggers';
 
@@ -18,9 +20,9 @@ import {useTriggersPick, useTriggersSync} from '@store/triggers';
 
 import {safeRefetch} from '@utils/fetchUtils';
 
-import TriggerSettings from './TriggerSettings';
+import {TriggerSettings} from './TriggerDetails/TriggerSettings';
 
-const TriggerDetails = () => {
+export const TriggerDetails = () => {
   const {isClusterAvailable} = useContext(MainContext);
 
   const {id: name, settingsTab = 'general'} = useParams() as {id: string; settingsTab?: string};
@@ -67,5 +69,3 @@ const TriggerDetails = () => {
     </PageWrapper>
   );
 };
-
-export default TriggerDetails;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerSettings.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings.tsx
similarity index 56%
rename from src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerSettings.tsx
rename to src/components/pages/Triggers/TriggerDetails/TriggerSettings.tsx
index 7d9dfbcb6..d11ad570c 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerSettings.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings.tsx
@@ -1,11 +1,11 @@
 import {FC, memo} from 'react';
 
-import {SettingsLayout} from '@molecules';
+import {SettingsLayout} from '@molecules/SettingsLayout';
 
-import Definition from './Definition';
-import General from './General';
-import TriggerAction from './TriggerAction';
-import TriggerCondition from './TriggerCondition';
+import {TriggerDefinition as Definition} from './TriggerSettings/Definition';
+import {General} from './TriggerSettings/General';
+import {TriggerAction} from './TriggerSettings/TriggerAction';
+import {TriggerCondition} from './TriggerSettings/TriggerCondition';
 
 interface TriggerSettingsProps {
   reload: () => void;
@@ -13,7 +13,7 @@ interface TriggerSettingsProps {
   onTabChange: (tab: string) => void;
 }
 
-const TriggerSettings: FC<TriggerSettingsProps> = ({reload, tab, onTabChange}) => (
+export const TriggerSettings: FC<TriggerSettingsProps> = memo(({reload, tab, onTabChange}) => (
   <SettingsLayout
     active={tab}
     onChange={onTabChange}
@@ -24,6 +24,4 @@ const TriggerSettings: FC<TriggerSettingsProps> = ({reload, tab, onTabChange}) =
       {id: 'definition', label: 'Definition', children: <Definition reload={reload} />},
     ]}
   />
-);
-
-export default memo(TriggerSettings);
+));
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/Definition.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition.tsx
similarity index 87%
rename from src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/Definition.tsx
rename to src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition.tsx
index 1de9a0128..6665b1f8a 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/Definition.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition.tsx
@@ -1,6 +1,6 @@
 import {FC} from 'react';
 
-import {Definition} from '@molecules';
+import {Definition} from '@molecules/Definition';
 
 import {useGetTriggerDefinitionQuery, useUpdateTriggerDefinitionMutation} from '@services/triggers';
 
@@ -13,7 +13,7 @@ interface TriggerDefinitionProps {
   reload: () => void;
 }
 
-const TriggerDefinition: FC<TriggerDefinitionProps> = ({reload}) => {
+export const TriggerDefinition: FC<TriggerDefinitionProps> = ({reload}) => {
   const [currentTrigger, setCurrentTrigger] = useTriggersField('current');
 
   return (
@@ -33,5 +33,3 @@ const TriggerDefinition: FC<TriggerDefinitionProps> = ({reload}) => {
     />
   );
 };
-
-export default TriggerDefinition;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/index.ts b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/index.ts
deleted file mode 100644
index d9773a0dd..000000000
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/Definition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Definition';
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/General.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General.tsx
similarity index 83%
rename from src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/General.tsx
rename to src/components/pages/Triggers/TriggerDetails/TriggerSettings/General.tsx
index 0321dec25..8e3f27a0c 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/General.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General.tsx
@@ -1,4 +1,6 @@
-import {Delete} from '@molecules/CommonSettings';
+import {FC} from 'react';
+
+import {Delete} from '@molecules/CommonSettings/Delete';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -6,9 +8,9 @@ import {useDeleteTriggerMutation} from '@services/triggers';
 
 import {useTriggersPick} from '@store/triggers';
 
-import Name from './Name';
+import {Name} from './General/Name';
 
-const General: React.FC = () => {
+export const General: FC = () => {
   const mayDelete = usePermission(Permissions.deleteEntity);
   const {current} = useTriggersPick('current');
 
@@ -27,5 +29,3 @@ const General: React.FC = () => {
     </>
   );
 };
-
-export default General;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/Name.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/Name.tsx
index bf8d474fb..1f868bdc7 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/Name.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/Name.tsx
@@ -1,8 +1,11 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {Input} from '@custom-antd';
+import {Input} from '@custom-antd/Input';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -12,7 +15,7 @@ import {useTriggersField} from '@store/triggers';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-const Name: React.FC = () => {
+export const Name: FC = () => {
   const [currentTrigger, setCurrentTrigger] = useTriggersField('current');
 
   const mayEdit = usePermission(Permissions.editEntity);
@@ -59,5 +62,3 @@ const Name: React.FC = () => {
     </Form>
   );
 };
-
-export default Name;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/index.ts b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/index.ts
deleted file mode 100644
index 0d5590eb6..000000000
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/General/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './General';
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/TriggerAction.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction.tsx
similarity index 86%
rename from src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/TriggerAction.tsx
rename to src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction.tsx
index 7f381b583..f4a3cbe8e 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/TriggerAction.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction.tsx
@@ -1,8 +1,13 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
+
+import {ActionFormItems} from '@organisms/TriggersFormItems/ActionFormItems';
 
-import {ActionFormItems} from '@organisms';
+import {getActionFormValues, getResourceIdentifierSelector} from '@pages/Triggers/utils';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -13,9 +18,7 @@ import {useTriggersField} from '@store/triggers';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {getActionFormValues, getResourceIdentifierSelector} from '../../../utils';
-
-const TriggerAction: React.FC = () => {
+export const TriggerAction: FC = () => {
   const {namespace} = useClusterDetailsPick('namespace');
   const [currentTrigger, setCurrentTrigger] = useTriggersField('current');
 
@@ -65,5 +68,3 @@ const TriggerAction: React.FC = () => {
     </Form>
   );
 };
-
-export default TriggerAction;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/index.ts b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/index.ts
deleted file mode 100644
index 8f6a2356e..000000000
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerAction/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggerAction';
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/TriggerCondition.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition.tsx
similarity index 51%
rename from src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/TriggerCondition.tsx
rename to src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition.tsx
index db819a53b..f66dc5447 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/TriggerCondition.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition.tsx
@@ -1,9 +1,11 @@
+import {FC} from 'react';
+
 import {useTriggersPick} from '@store/triggers';
 
-import Condition from './Condition';
-import ResourceCondition from './ResourceCondition';
+import {Condition} from './TriggerCondition/Condition';
+import {ResourceCondition} from './TriggerCondition/ResourceCondition';
 
-const TriggerCondition: React.FC = () => {
+export const TriggerCondition: FC = () => {
   const {keyMap} = useTriggersPick('keyMap');
 
   return (
@@ -13,5 +15,3 @@ const TriggerCondition: React.FC = () => {
     </>
   );
 };
-
-export default TriggerCondition;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/Condition.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/Condition.tsx
index be0fb4bc6..28c0defbb 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/Condition.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/Condition.tsx
@@ -1,8 +1,13 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
+
+import {ConditionFormItems} from '@organisms/TriggersFormItems/ConditionFormItems';
 
-import {ConditionFormItems} from '@organisms';
+import {getConditionFormValues, getResourceIdentifierSelector} from '@pages/Triggers/utils';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -13,9 +18,7 @@ import {useTriggersField} from '@store/triggers';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {getConditionFormValues, getResourceIdentifierSelector} from '../../../utils';
-
-const Condition: React.FC = () => {
+export const Condition: FC = () => {
   const {namespace} = useClusterDetailsPick('namespace');
   const [currentTrigger, setCurrentTrigger] = useTriggersField('current');
 
@@ -67,5 +70,3 @@ const Condition: React.FC = () => {
     </Form>
   );
 };
-
-export default Condition;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/ResourceCondition.tsx b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/ResourceCondition.tsx
index d9417d900..67de269c4 100644
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/ResourceCondition.tsx
+++ b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/ResourceCondition.tsx
@@ -1,11 +1,19 @@
+import {FC} from 'react';
+
 import {DeleteOutlined} from '@ant-design/icons';
 import {Form, Input, InputNumber, Select} from 'antd';
 
-import {Button, FormIconWrapper, FormItem, FormItemLabel, FormRow, FullWidthSpace} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {FormIconWrapper} from '@custom-antd/Form.styled';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {FormItemLabel} from '@custom-antd/Form/FormItem/FormItemLabel';
+import {FormRow} from '@custom-antd/Form/FormRow';
+import {FullWidthSpace} from '@custom-antd/FullWidthSpace';
 
 import {TestTrigger, TriggerConditionStatus} from '@models/triggers';
 
-import {ConfigurationCard, notificationCall} from '@molecules';
+import {ConfigurationCard} from '@molecules/ConfigurationCard';
+import {notificationCall} from '@molecules/Notification';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -16,7 +24,7 @@ import {useTriggersField, useTriggersPick} from '@store/triggers';
 import {requiredNoText} from '@utils/form';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-const ResourceCondition: React.FC = () => {
+export const ResourceCondition: FC = () => {
   const [currentTrigger, setCurrentTrigger] = useTriggersField('current');
   const {keyMap} = useTriggersPick('keyMap');
 
@@ -151,5 +159,3 @@ const ResourceCondition: React.FC = () => {
     </Form>
   );
 };
-
-export default ResourceCondition;
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/index.ts b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/index.ts
deleted file mode 100644
index a71b1d1a2..000000000
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/TriggerCondition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggerCondition';
diff --git a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/index.ts b/src/components/pages/Triggers/TriggerDetails/TriggerSettings/index.ts
deleted file mode 100644
index e6ae171ce..000000000
--- a/src/components/pages/Triggers/TriggerDetails/TriggerSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggerSettings';
diff --git a/src/components/pages/Triggers/TriggerDetails/index.ts b/src/components/pages/Triggers/TriggerDetails/index.ts
deleted file mode 100644
index 9d5481e30..000000000
--- a/src/components/pages/Triggers/TriggerDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggerDetails';
diff --git a/src/components/pages/Triggers/TriggersList/TriggersList.styled.tsx b/src/components/pages/Triggers/TriggersList.styled.tsx
similarity index 92%
rename from src/components/pages/Triggers/TriggersList/TriggersList.styled.tsx
rename to src/components/pages/Triggers/TriggersList.styled.tsx
index 07b657e3d..2127b1506 100644
--- a/src/components/pages/Triggers/TriggersList/TriggersList.styled.tsx
+++ b/src/components/pages/Triggers/TriggersList.styled.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const TriggerContainer = styled.div`
   overflow: hidden;
diff --git a/src/components/pages/Triggers/TriggersList/TriggersList.tsx b/src/components/pages/Triggers/TriggersList.tsx
similarity index 75%
rename from src/components/pages/Triggers/TriggersList/TriggersList.tsx
rename to src/components/pages/Triggers/TriggersList.tsx
index 7a112fb63..0b62a6cc8 100644
--- a/src/components/pages/Triggers/TriggersList/TriggersList.tsx
+++ b/src/components/pages/Triggers/TriggersList.tsx
@@ -1,16 +1,18 @@
-import {useContext, useEffect, useState} from 'react';
+import {FC, useContext, useEffect, useState} from 'react';
 
-import {ExternalLink} from '@atoms';
+import {ExternalLink} from '@atoms/ExternalLink';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {Button, Modal} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {CustomModal as Modal} from '@custom-antd/Modal';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
 
-import {EntityGrid} from '@molecules';
+import {EntityGrid} from '@molecules/EntityGrid';
 
-import {PageBlueprint} from '@organisms';
+import {PageBlueprint} from '@organisms/PageBlueprint';
 
 import {Permissions, usePermission} from '@permissions/base';
 
@@ -19,11 +21,11 @@ import {useGetTriggersListQuery} from '@services/triggers';
 import {externalLinks} from '@utils/externalLinks';
 import {safeRefetch} from '@utils/fetchUtils';
 
-import AddTriggerModal from './AddTriggerModal';
-import EmptyTriggers from './EmptyTriggers';
-import TriggerCard from './TriggerCard';
+import {AddTriggerModal} from './TriggersList/AddTriggerModal';
+import {EmptyTriggers} from './TriggersList/EmptyTriggers';
+import {TriggerCard} from './TriggersList/TriggerCard';
 
-const TriggersList: React.FC = () => {
+export const TriggersList: FC = () => {
   const {isClusterAvailable} = useContext(MainContext);
   const {location} = useContext(DashboardContext);
   const openDetails = useDashboardNavigate(({name}: {name: string}) => `/triggers/${name}`);
@@ -79,5 +81,3 @@ const TriggersList: React.FC = () => {
     </PageBlueprint>
   );
 };
-
-export default TriggersList;
diff --git a/src/components/pages/Triggers/TriggersList/AddTriggerModal/AddTriggerModal.styled.tsx b/src/components/pages/Triggers/TriggersList/AddTriggerModal.styled.tsx
similarity index 100%
rename from src/components/pages/Triggers/TriggersList/AddTriggerModal/AddTriggerModal.styled.tsx
rename to src/components/pages/Triggers/TriggersList/AddTriggerModal.styled.tsx
diff --git a/src/components/pages/Triggers/TriggersList/AddTriggerModal/AddTriggerModal.tsx b/src/components/pages/Triggers/TriggersList/AddTriggerModal.tsx
similarity index 81%
rename from src/components/pages/Triggers/TriggersList/AddTriggerModal/AddTriggerModal.tsx
rename to src/components/pages/Triggers/TriggersList/AddTriggerModal.tsx
index 05ec23e5a..2e5842d5f 100644
--- a/src/components/pages/Triggers/TriggersList/AddTriggerModal/AddTriggerModal.tsx
+++ b/src/components/pages/Triggers/TriggersList/AddTriggerModal.tsx
@@ -1,18 +1,22 @@
-import React, {useContext, useEffect, useRef, useState} from 'react';
+import {FC, useContext, useEffect, useRef, useState} from 'react';
 
 import {Form, Space, Steps} from 'antd';
 
-import {DashboardContext, MainContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
+import {MainContext} from '@contexts/MainContext';
 
-import {Input, Text} from '@custom-antd';
+import {Input} from '@custom-antd/Input';
+import {Text} from '@custom-antd/Typography/Text';
 
 import {useDashboardNavigate} from '@hooks/useDashboardNavigate';
-import useInViewport from '@hooks/useInViewport';
+import {useInViewport} from '@hooks/useInViewport';
 
-import {Option} from '@models/form';
-import {ErrorNotificationConfig} from '@models/notifications';
+import type {Option} from '@models/form';
+import type {ErrorNotificationConfig} from '@models/notifications';
 
-import {NotificationContent} from '@molecules';
+import {NotificationContent} from '@molecules/Notification/NotificationContent';
+
+import {getResourceIdentifierSelector} from '@pages/Triggers/utils';
 
 import {useCreateTriggerMutation, useGetTriggersKeyMapQuery} from '@services/triggers';
 
@@ -22,14 +26,12 @@ import {useTriggersPick, useTriggersSync} from '@store/triggers';
 import {safeRefetch} from '@utils/fetchUtils';
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-import {getResourceIdentifierSelector} from '../../utils';
-
 import {StyledNotificationContainer} from './AddTriggerModal.styled';
-import ModalFirstStep from './ModalFirstStep';
-import ModalSecondStep from './ModalSecondStep';
-import {StepsEnum} from './types';
+import {ModalFirstStep} from './AddTriggerModal/ModalFirstStep';
+import {ModalSecondStep} from './AddTriggerModal/ModalSecondStep';
+import {StepsEnum} from './AddTriggerModal/types';
 
-const AddTriggerModal: React.FC = () => {
+export const AddTriggerModal: FC = () => {
   const {namespace} = useClusterDetailsPick('namespace');
   const {isClusterAvailable} = useContext(MainContext);
   const {location} = useContext(DashboardContext);
@@ -122,5 +124,3 @@ const AddTriggerModal: React.FC = () => {
     </>
   );
 };
-
-export default AddTriggerModal;
diff --git a/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalFirstStep.tsx b/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalFirstStep.tsx
index 4e0e7907a..d14674899 100644
--- a/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalFirstStep.tsx
+++ b/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalFirstStep.tsx
@@ -1,12 +1,16 @@
+import {FC} from 'react';
+
 import {Form} from 'antd';
 
-import {Button, Text} from '@custom-antd';
+import {Button} from '@custom-antd/Button';
+import {Text} from '@custom-antd/Typography/Text';
+
+import {ConditionFormItems} from '@organisms/TriggersFormItems/ConditionFormItems';
 
-import {ConditionFormItems} from '@organisms';
+import {StyledStepDescription} from '@pages/Triggers/TriggersList/AddTriggerModal.styled';
 
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
-import {StyledStepDescription} from './AddTriggerModal.styled';
 import {StepsEnum} from './types';
 
 type ModalFirstStepProps = {
@@ -14,7 +18,7 @@ type ModalFirstStepProps = {
   setFirstStepValues: (values: any) => void;
 };
 
-const ModalFirstStep: React.FC<ModalFirstStepProps> = props => {
+export const ModalFirstStep: FC<ModalFirstStepProps> = props => {
   const {setFirstStepValues, setCurrentStep} = props;
 
   return (
@@ -49,5 +53,3 @@ const ModalFirstStep: React.FC<ModalFirstStepProps> = props => {
     </>
   );
 };
-
-export default ModalFirstStep;
diff --git a/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalSecondStep.tsx b/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalSecondStep.tsx
index 94e842ad5..a1ce83e5c 100644
--- a/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalSecondStep.tsx
+++ b/src/components/pages/Triggers/TriggersList/AddTriggerModal/ModalSecondStep.tsx
@@ -1,10 +1,15 @@
-import {Button, FormItem, Text} from '@custom-antd';
+import {FC} from 'react';
 
-import {ActionFormItems} from '@organisms';
+import {Button} from '@custom-antd/Button';
+import {FormItem} from '@custom-antd/Form/FormItem';
+import {Text} from '@custom-antd/Typography/Text';
 
-import Colors from '@styles/Colors';
+import {ActionFormItems} from '@organisms/TriggersFormItems/ActionFormItems';
+
+import {StyledButtonsContainer, StyledStepDescription} from '@pages/Triggers/TriggersList/AddTriggerModal.styled';
+
+import {Colors} from '@styles/Colors';
 
-import {StyledButtonsContainer, StyledStepDescription} from './AddTriggerModal.styled';
 import {StepsEnum} from './types';
 
 type ModalSecondStepProps = {
@@ -12,7 +17,7 @@ type ModalSecondStepProps = {
   isLoading: boolean;
 };
 
-const ModalSecondStep: React.FC<ModalSecondStepProps> = props => {
+export const ModalSecondStep: FC<ModalSecondStepProps> = props => {
   const {isLoading, setCurrentStep} = props;
 
   return (
@@ -48,5 +53,3 @@ const ModalSecondStep: React.FC<ModalSecondStepProps> = props => {
     </>
   );
 };
-
-export default ModalSecondStep;
diff --git a/src/components/pages/Triggers/TriggersList/AddTriggerModal/index.ts b/src/components/pages/Triggers/TriggersList/AddTriggerModal/index.ts
deleted file mode 100644
index 413a4aa94..000000000
--- a/src/components/pages/Triggers/TriggersList/AddTriggerModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './AddTriggerModal';
diff --git a/src/components/pages/Triggers/TriggersList/EmptyTriggers.tsx b/src/components/pages/Triggers/TriggersList/EmptyTriggers.tsx
index 28c77ee9f..a7bbe655c 100644
--- a/src/components/pages/Triggers/TriggersList/EmptyTriggers.tsx
+++ b/src/components/pages/Triggers/TriggersList/EmptyTriggers.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
+import {FC} from 'react';
 
-import {EmptyListContent, HelpCard} from '@molecules';
+import {EmptyListContent} from '@molecules/EmptyListContent';
+import {HelpCard} from '@molecules/HelpCard';
 
 import {externalLinks} from '@utils/externalLinks';
 
@@ -8,7 +9,7 @@ interface EmptyTriggersProps {
   onButtonClick: () => void;
 }
 
-const EmptyTriggers: React.FC<EmptyTriggersProps> = props => {
+export const EmptyTriggers: FC<EmptyTriggersProps> = props => {
   const {onButtonClick} = props;
 
   return (
@@ -30,5 +31,3 @@ const EmptyTriggers: React.FC<EmptyTriggersProps> = props => {
     </EmptyListContent>
   );
 };
-
-export default EmptyTriggers;
diff --git a/src/components/pages/Triggers/TriggersList/TriggerCard.tsx b/src/components/pages/Triggers/TriggersList/TriggerCard.tsx
index 326c18f75..838d78266 100644
--- a/src/components/pages/Triggers/TriggersList/TriggerCard.tsx
+++ b/src/components/pages/Triggers/TriggersList/TriggerCard.tsx
@@ -1,20 +1,18 @@
 import {FC, memo} from 'react';
 
-import {Text} from '@custom-antd';
+import {Text} from '@custom-antd/Typography/Text';
 
-import {TestTrigger} from '@models/triggers';
+import type {TestTrigger} from '@models/triggers';
 
-import {TriggerContainer} from './TriggersList.styled';
+import {TriggerContainer} from '@pages/Triggers/TriggersList.styled';
 
 interface TriggerCardProps {
   item: TestTrigger;
   onClick: (item: TestTrigger) => void;
 }
 
-const TriggerCard: FC<TriggerCardProps> = ({item, onClick}) => (
+export const TriggerCard: FC<TriggerCardProps> = memo(({item, onClick}) => (
   <TriggerContainer onClick={() => onClick(item)} key={item.name}>
     <Text className="regular big">{item.name}</Text>
   </TriggerContainer>
-);
-
-export default memo(TriggerCard);
+));
diff --git a/src/components/pages/Triggers/TriggersList/index.ts b/src/components/pages/Triggers/TriggersList/index.ts
deleted file mode 100644
index 7202731cd..000000000
--- a/src/components/pages/Triggers/TriggersList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggersList';
diff --git a/src/components/pages/Triggers/TriggersList/index.tsx b/src/components/pages/Triggers/TriggersList/index.tsx
deleted file mode 100644
index 7202731cd..000000000
--- a/src/components/pages/Triggers/TriggersList/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './TriggersList';
diff --git a/src/components/pages/Triggers/index.ts b/src/components/pages/Triggers/index.ts
deleted file mode 100644
index 21c15130a..000000000
--- a/src/components/pages/Triggers/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './Triggers';
diff --git a/src/components/pages/Triggers/utils.ts b/src/components/pages/Triggers/utils.ts
index 7e2a1f61a..14fbfdfd6 100644
--- a/src/components/pages/Triggers/utils.ts
+++ b/src/components/pages/Triggers/utils.ts
@@ -1,5 +1,5 @@
-import {Option} from '@models/form';
-import {TestTrigger, TestTriggerSelector} from '@models/triggers';
+import type {Option} from '@models/form';
+import type {TestTrigger, TestTriggerSelector} from '@models/triggers';
 
 import {decomposeLabels} from '@molecules/LabelsSelect/utils';
 
diff --git a/src/components/pages/index.ts b/src/components/pages/index.ts
deleted file mode 100644
index eb0ba6074..000000000
--- a/src/components/pages/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export {default as NotFound} from './NotFound';
-export {default as EndpointProcessing} from './EndpointProcessing';
-export {default as Tests} from './Tests';
-export {default as TestSuites} from './TestSuites';
-export {default as Executors} from './Executors';
-export {default as Sources} from './Sources';
-export {default as Triggers} from './Triggers';
-export {default as ErrorBoundary} from './ErrorBoundary';
-export {default as GlobalSettings} from './GlobalSettings';
-export {default as Loading} from './Loading';
-export {default as Error} from './Error';
diff --git a/src/contexts/ConfigContext.ts b/src/contexts/ConfigContext.ts
index 034c9f9b1..ba430cff9 100644
--- a/src/contexts/ConfigContext.ts
+++ b/src/contexts/ConfigContext.ts
@@ -5,6 +5,4 @@ interface ConfigContextData {
   discordUrl: string;
 }
 
-const ConfigContext = createContext<ConfigContextData>(undefined!);
-
-export default ConfigContext;
+export const ConfigContext = createContext<ConfigContextData>(undefined!);
diff --git a/src/contexts/DashboardContext.ts b/src/contexts/DashboardContext.ts
index 8ac131f01..348915028 100644
--- a/src/contexts/DashboardContext.ts
+++ b/src/contexts/DashboardContext.ts
@@ -11,6 +11,4 @@ interface DashboardContextData {
   showTestkubeCloudBanner: boolean;
 }
 
-const DashboardContext = createContext<DashboardContextData>(undefined!);
-
-export default DashboardContext;
+export const DashboardContext = createContext<DashboardContextData>(undefined!);
diff --git a/src/contexts/MainContext.ts b/src/contexts/MainContext.ts
index 2d2cba493..ee98160c8 100644
--- a/src/contexts/MainContext.ts
+++ b/src/contexts/MainContext.ts
@@ -14,6 +14,4 @@ export type MainContextProps = {
 };
 
 // @ts-ignore
-const MainContext = createContext<MainContextProps>();
-
-export default MainContext;
+export const MainContext = createContext<MainContextProps>();
diff --git a/src/contexts/ModalContext.tsx b/src/contexts/ModalContext.tsx
index 727d4fab5..108300500 100644
--- a/src/contexts/ModalContext.tsx
+++ b/src/contexts/ModalContext.tsx
@@ -1,6 +1,6 @@
 import React, {FC, PropsWithChildren, ReactElement, createContext, useContext, useMemo, useState} from 'react';
 
-import {Modal} from '@custom-antd';
+import {CustomModal as Modal} from '@custom-antd/Modal';
 
 export interface ModalConfig {
   width: number;
@@ -19,7 +19,7 @@ export interface ModalContextInterface {
   closeModal: () => void;
 }
 
-const ModalContext = createContext<ModalContextInterface>(undefined!);
+export const ModalContext = createContext<ModalContextInterface>(undefined!);
 
 const defaultModalConfig = {
   width: 500,
@@ -72,5 +72,3 @@ export const ModalOutletProvider: FC<PropsWithChildren<{}>> = ({children}) => (
     {children}
   </>
 );
-
-export default ModalContext;
diff --git a/src/contexts/index.ts b/src/contexts/index.ts
deleted file mode 100644
index 870bde0f2..000000000
--- a/src/contexts/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {default as MainContext} from './MainContext';
-export {default as ConfigContext} from './ConfigContext';
-export {default as DashboardContext} from './DashboardContext';
-export {default as ModalContext} from './ModalContext';
diff --git a/src/env.ts b/src/env.ts
index 24f85f602..3cc46ad9a 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -37,7 +37,7 @@ export interface DynamicEnvironment {
   debugTelemetry: boolean;
 }
 
-export default {
+export const env = {
   ...dynamic,
   ...build,
 };
diff --git a/src/feature-flags/index.ts b/src/feature-flags/index.ts
deleted file mode 100644
index 3ea02e3a8..000000000
--- a/src/feature-flags/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './hooks';
-export {FeatureFlagsProvider} from './context';
diff --git a/src/hooks/useCRD.ts b/src/hooks/useCRD.ts
index 563456a66..0f83846b0 100644
--- a/src/hooks/useCRD.ts
+++ b/src/hooks/useCRD.ts
@@ -3,7 +3,7 @@ import {useEffect, useRef, useState} from 'react';
 import {parse} from 'yaml';
 
 const crdCache: Record<string, Promise<any>> = {};
-const useCRD = (url = '') => {
+export const useCRD = (url = '') => {
   const prevUrl = useRef('');
   const [loading, setLoading] = useState(true);
   const [raw, setRaw] = useState('');
@@ -48,5 +48,3 @@ const useCRD = (url = '') => {
 
   return {loading, crd, raw};
 };
-
-export default useCRD;
diff --git a/src/hooks/useClusterVersionMatch.ts b/src/hooks/useClusterVersionMatch.ts
index b3222bf1c..9ee0635b4 100644
--- a/src/hooks/useClusterVersionMatch.ts
+++ b/src/hooks/useClusterVersionMatch.ts
@@ -2,11 +2,9 @@ import {useContext} from 'react';
 
 import {satisfies as matchesVersion} from 'semver';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
 
-const useClusterVersionMatch = <T>(match: string, defaults?: T): boolean | T => {
+export const useClusterVersionMatch = <T>(match: string, defaults?: T): boolean | T => {
   const {clusterVersion} = useContext(MainContext);
   return clusterVersion == null ? (defaults as T) : matchesVersion(clusterVersion, match);
 };
-
-export default useClusterVersionMatch;
diff --git a/src/hooks/useDashboardNavigate.ts b/src/hooks/useDashboardNavigate.ts
index c67463996..d07016b3a 100644
--- a/src/hooks/useDashboardNavigate.ts
+++ b/src/hooks/useDashboardNavigate.ts
@@ -2,7 +2,7 @@ import {useContext} from 'react';
 import {To} from 'react-router';
 import {NavigateOptions} from 'react-router/lib/hooks';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
 import {useLastCallback} from './useLastCallback';
 
diff --git a/src/hooks/useExecutorIcon.ts b/src/hooks/useExecutorIcon.ts
index 8ada05f2e..56dd6231d 100644
--- a/src/hooks/useExecutorIcon.ts
+++ b/src/hooks/useExecutorIcon.ts
@@ -4,9 +4,7 @@ import {useAppSelector} from '@redux/hooks';
 import {selectExecutors} from '@redux/reducers/executorsSlice';
 import {getTestExecutorIcon} from '@redux/utils/executorIcon';
 
-const useExecutorIcon = (item: any) => {
+export const useExecutorIcon = (item: any) => {
   const executors = useAppSelector(selectExecutors);
   return useMemo(() => getTestExecutorIcon(executors, item?.type), [executors, item?.type]);
 };
-
-export default useExecutorIcon;
diff --git a/src/hooks/useInViewport.ts b/src/hooks/useInViewport.ts
index a46174352..44f1f2294 100644
--- a/src/hooks/useInViewport.ts
+++ b/src/hooks/useInViewport.ts
@@ -1,7 +1,7 @@
 import {RefObject} from 'react';
 import {useIntersection} from 'react-use';
 
-export default function useInViewport(ref: RefObject<any>) {
+export function useInViewport(ref: RefObject<any>) {
   const entry = useIntersection(ref, {});
   return Boolean(entry?.isIntersecting);
 }
diff --git a/src/hooks/useIsMobile.ts b/src/hooks/useIsMobile.ts
index cfb5d8441..fd0a98f84 100644
--- a/src/hooks/useIsMobile.ts
+++ b/src/hooks/useIsMobile.ts
@@ -2,9 +2,7 @@ import {useWindowSize} from 'react-use';
 
 import {size} from '@styles/MediaQueries';
 
-const useIsMobile = (): boolean => {
+export const useIsMobile = (): boolean => {
   const {width} = useWindowSize();
   return width < size.tablet;
 };
-
-export default useIsMobile;
diff --git a/src/hooks/useIsRunning.ts b/src/hooks/useIsRunning.ts
index 760b74308..17e2bd5eb 100644
--- a/src/hooks/useIsRunning.ts
+++ b/src/hooks/useIsRunning.ts
@@ -1,7 +1,5 @@
-import {ExecutionStatusEnum} from '@models/execution';
+import type {ExecutionStatusEnum} from '@models/execution';
 
-const useIsRunning = (status: ExecutionStatusEnum) => {
+export const useIsRunning = (status: ExecutionStatusEnum) => {
   return status === 'running';
 };
-
-export default useIsRunning;
diff --git a/src/hooks/useLoadingIndicator.ts b/src/hooks/useLoadingIndicator.ts
index de8e6d515..0acf83721 100644
--- a/src/hooks/useLoadingIndicator.ts
+++ b/src/hooks/useLoadingIndicator.ts
@@ -1,6 +1,6 @@
 import {useState} from 'react';
 
-const useLoadingIndicator = (timeoutInterval = 1000) => {
+export const useLoadingIndicator = (timeoutInterval = 1000) => {
   const [isLoading, setIsLoading] = useState(false);
 
   const handleLoading = () => {
@@ -12,5 +12,3 @@ const useLoadingIndicator = (timeoutInterval = 1000) => {
 
   return {isLoading, handleLoading};
 };
-
-export default useLoadingIndicator;
diff --git a/src/hooks/useLocation.ts b/src/hooks/useLocation.ts
index d9c0d40ec..ecfe840f8 100644
--- a/src/hooks/useLocation.ts
+++ b/src/hooks/useLocation.ts
@@ -6,7 +6,7 @@ type Query = {
   lastPathSegment: string;
 };
 
-const useLocation = (): Query => {
+export const useLocation = (): Query => {
   const [query, setQuery] = useState<Query>({
     path: '',
     lastPathSegment: '',
@@ -20,5 +20,3 @@ const useLocation = (): Query => {
   }, [window.location]);
   return query;
 };
-
-export default useLocation;
diff --git a/src/hooks/usePressEnter.ts b/src/hooks/usePressEnter.ts
index 78241e351..65f6a03df 100644
--- a/src/hooks/usePressEnter.ts
+++ b/src/hooks/usePressEnter.ts
@@ -8,6 +8,4 @@ const onEvent = (e: KeyboardEvent<any>, cb: Callback) => {
   }
 };
 
-const usePressEnter = () => onEvent;
-
-export default usePressEnter;
+export const usePressEnter = () => onEvent;
diff --git a/src/hooks/useRunEntity.ts b/src/hooks/useRunEntity.ts
index 89499e1e9..917aaca59 100644
--- a/src/hooks/useRunEntity.ts
+++ b/src/hooks/useRunEntity.ts
@@ -3,11 +3,10 @@ import {useCallback} from 'react';
 import {MutationTrigger} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 import {MutationDefinition} from '@reduxjs/toolkit/query';
 
-import useLoadingIndicator from '@hooks/useLoadingIndicator';
+import type {Entity} from '@models/entity';
 
-import {Entity} from '@models/entity';
-
-import {RunningContextType, notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
+import {RunningContextType} from '@molecules/RunningContext';
 
 import {useRunTestSuiteMutation} from '@services/testSuites';
 import {useRunTestMutation} from '@services/tests';
@@ -16,7 +15,9 @@ import {useTelemetry} from '@telemetry/hooks';
 
 import {displayDefaultNotificationFlow} from '@utils/notification';
 
-const useRunEntity = (
+import {useLoadingIndicator} from './useLoadingIndicator';
+
+export const useRunEntity = (
   entity: Entity,
   details?: {name: string; type?: string; namespace?: string}
 ): [boolean, () => Promise<any>] => {
@@ -62,5 +63,3 @@ const useRunEntity = (
 
   return [isLoading, trigger];
 };
-
-export default useRunEntity;
diff --git a/src/hooks/useSecureContext.ts b/src/hooks/useSecureContext.ts
index c5dbc4c5a..0ea8de330 100644
--- a/src/hooks/useSecureContext.ts
+++ b/src/hooks/useSecureContext.ts
@@ -1,5 +1,3 @@
-const useSecureContext = () => {
+export const useSecureContext = () => {
   return window.isSecureContext;
 };
-
-export default useSecureContext;
diff --git a/src/hooks/useTrackTimeAnalytics.spec.tsx b/src/hooks/useTrackTimeAnalytics.spec.tsx
index 49a65bfd9..e5921828d 100644
--- a/src/hooks/useTrackTimeAnalytics.spec.tsx
+++ b/src/hooks/useTrackTimeAnalytics.spec.tsx
@@ -4,7 +4,7 @@ import {act, fireEvent, render} from '@testing-library/react';
 
 import {TelemetryContext} from '@telemetry/context';
 
-import useTrackTimeAnalytics from './useTrackTimeAnalytics';
+import {useTrackTimeAnalytics} from './useTrackTimeAnalytics';
 
 const setDocumentVisibility = (value: boolean) => {
   const hidden = !value;
diff --git a/src/hooks/useTrackTimeAnalytics.ts b/src/hooks/useTrackTimeAnalytics.ts
index d60e985aa..10daf9ab9 100644
--- a/src/hooks/useTrackTimeAnalytics.ts
+++ b/src/hooks/useTrackTimeAnalytics.ts
@@ -3,7 +3,7 @@ import {useEvent, useInterval} from 'react-use';
 
 import {useTelemetry} from '@telemetry/hooks';
 
-const useTrackTimeAnalytics = (page: string, condition = true) => {
+export const useTrackTimeAnalytics = (page: string, condition = true) => {
   const [hidden, setHidden] = useState(document.hidden);
   const durationRef = useRef(0);
   const telemetry = useTelemetry();
@@ -30,5 +30,3 @@ const useTrackTimeAnalytics = (page: string, condition = true) => {
     }
   }, [hidden, condition]);
 };
-
-export default useTrackTimeAnalytics;
diff --git a/src/hooks/useURLSearchParams.ts b/src/hooks/useURLSearchParams.ts
index ea9e2d264..e1779207c 100644
--- a/src/hooks/useURLSearchParams.ts
+++ b/src/hooks/useURLSearchParams.ts
@@ -2,14 +2,12 @@ import {useContext, useMemo} from 'react';
 
 import qs from 'query-string';
 
-import {DashboardContext} from '@contexts';
+import {DashboardContext} from '@contexts/DashboardContext';
 
-const useURLSearchParams = () => {
+export const useURLSearchParams = () => {
   const {location} = useContext(DashboardContext);
   const {search} = location;
 
   const query = useMemo(() => new URLSearchParams(search).toString(), [search]);
   return qs.parse(query);
 };
-
-export default useURLSearchParams;
diff --git a/src/hooks/useValidateRepository.ts b/src/hooks/useValidateRepository.ts
index 68fa4c2e6..95da4bc58 100644
--- a/src/hooks/useValidateRepository.ts
+++ b/src/hooks/useValidateRepository.ts
@@ -1,12 +1,12 @@
-import {useRef} from 'react';
+import {Dispatch, SetStateAction, useRef} from 'react';
 import {useDebounce, useInterval, useLatest, useUpdate} from 'react-use';
 
 import {NamePath} from 'antd/lib/form/interface';
 
 import {isEqual} from 'lodash';
 
-import {RTKResponse} from '@models/fetch';
-import {Repository} from '@models/repository';
+import type {RTKResponse} from '@models/fetch';
+import type {Repository} from '@models/repository';
 
 import {TooltipStatus} from '@molecules/GitFormItems/tooltipUtils';
 
@@ -37,9 +37,9 @@ const getErrorMessage = (rawErrorString: string, searchString: string) => {
   );
 };
 
-const useValidateRepository = (
+export const useValidateRepository = (
   getFieldValue: (name: NamePath) => string,
-  setValidationState: React.Dispatch<React.SetStateAction<ValidationState>>,
+  setValidationState: Dispatch<SetStateAction<ValidationState>>,
   validateRepository: (repository: Repository) => Promise<RTKResponse<void>>
 ) => {
   const getValues = () => ({
@@ -212,5 +212,3 @@ const useValidateRepository = (
     [current.uri, current.token, current.username, current.branch, current.path]
   );
 };
-
-export default useValidateRepository;
diff --git a/src/index.tsx b/src/index.tsx
index 27b03aece..a15775e24 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,18 +1,19 @@
-import React from 'react';
+import {StrictMode} from 'react';
 import {createRoot} from 'react-dom/client';
 import {Provider as ReduxProvider} from 'react-redux';
 import {BrowserRouter} from 'react-router-dom';
 import 'reactflow/dist/style.css';
 
+import {env} from '@env';
+
 import {store} from '@redux/store';
 
 import {GlobalStyle} from '@styles/globalStyles';
 
 import {TelemetryProvider} from '@telemetry/provider';
 
-import AppRoot from './AppRoot';
+import {AppRoot} from './AppRoot';
 import './antd-theme/antd-customized.css';
-import env from './env';
 
 (async () => {
   const container = document.getElementById('root');
@@ -30,7 +31,7 @@ import env from './env';
   // Big thread here https://github.com/remix-run/react-router/issues/8427
 
   root.render(
-    <React.StrictMode>
+    <StrictMode>
       <TelemetryProvider
         prefix="tk.ui."
         app={app}
@@ -45,6 +46,6 @@ import env from './env';
           </BrowserRouter>
         </ReduxProvider>
       </TelemetryProvider>
-    </React.StrictMode>
+    </StrictMode>
   );
 })();
diff --git a/src/models/command.ts b/src/models/command.ts
index 51098a049..9b3d09b45 100644
--- a/src/models/command.ts
+++ b/src/models/command.ts
@@ -1,4 +1,4 @@
-import Colors from '@styles/Colors';
+import {Colors} from '@styles/Colors';
 
 export const literalToColor: Record<string, Colors> = {
   kubectl: Colors.indigo300,
diff --git a/src/models/entity.ts b/src/models/entity.ts
index 54b2c4c65..57794681b 100644
--- a/src/models/entity.ts
+++ b/src/models/entity.ts
@@ -1,11 +1,11 @@
 import {FC, ReactNode} from 'react';
 
-import {ModalConfig} from '@contexts/ModalContext';
+import type {ModalConfig} from '@contexts/ModalContext';
 
-import {TestWithExecution} from '@models/test';
-import {TestSuiteWithExecution} from '@models/testSuite';
+import type {Item} from '@molecules/EntityGrid/EntityGridItemPure';
 
-import {Item} from '@molecules/EntityGrid/EntityGridItemPure';
+import type {TestWithExecution} from './test';
+import type {TestSuiteWithExecution} from './testSuite';
 
 export type Entity = 'test-suites' | 'tests';
 
diff --git a/src/models/execution.ts b/src/models/execution.ts
index 4ce60a0bd..124e1aa89 100644
--- a/src/models/execution.ts
+++ b/src/models/execution.ts
@@ -1,9 +1,9 @@
-import type {Args} from '@models/args';
-import type {AssertionResult} from '@models/assertionResult';
-import type {EntityMap} from '@models/entityMap';
-import type {TestContent} from '@models/test';
-import type {TestExecutor} from '@models/testExecutors';
-import type {Variables} from '@models/variable';
+import type {Args} from './args';
+import type {AssertionResult} from './assertionResult';
+import type {EntityMap} from './entityMap';
+import type {TestContent} from './test';
+import type {TestExecutor} from './testExecutors';
+import type {Variables} from './variable';
 
 export type ExecutionStatusEnum = 'running' | 'passed' | 'failed' | 'queued' | 'cancelled' | 'aborted';
 export type ExecutionResultOutputTypeEnum = 'text/plain' | 'application/junit+xml' | 'application/json';
diff --git a/src/models/executors.ts b/src/models/executors.ts
index bfc45eb90..04f129c05 100644
--- a/src/models/executors.ts
+++ b/src/models/executors.ts
@@ -1,5 +1,5 @@
-import {Args} from '@models/args';
-import {EntityMap} from '@models/entityMap';
+import type {Args} from './args';
+import type {EntityMap} from './entityMap';
 
 type Executor = {
   name: string;
diff --git a/src/models/metrics.ts b/src/models/metrics.ts
index dfd6eb709..188fce2d6 100644
--- a/src/models/metrics.ts
+++ b/src/models/metrics.ts
@@ -1,4 +1,4 @@
-import {ExecutionStatusEnum} from './execution';
+import type {ExecutionStatusEnum} from './execution';
 
 export type ExecutionMetrics = {
   executionId?: string;
diff --git a/src/models/sources.ts b/src/models/sources.ts
index c4527033b..ebb3db8ba 100644
--- a/src/models/sources.ts
+++ b/src/models/sources.ts
@@ -1,4 +1,4 @@
-import {Repository} from '@models/repository';
+import type {Repository} from './repository';
 
 interface Source {
   name: string;
diff --git a/src/models/test.ts b/src/models/test.ts
index 7e71e32bf..4b51ed823 100644
--- a/src/models/test.ts
+++ b/src/models/test.ts
@@ -1,7 +1,7 @@
-import type {EntityMap} from '@models/entityMap';
-import type {Execution, ExecutionRequest, ExecutionStatusEnum} from '@models/execution';
-import type {Repository} from '@models/repository';
-import type {Variables} from '@models/variable';
+import type {EntityMap} from './entityMap';
+import type {Execution, ExecutionRequest, ExecutionStatusEnum} from './execution';
+import type {Repository} from './repository';
+import type {Variables} from './variable';
 
 export type TestContentTypeEnum = 'file-uri' | 'git-file' | 'git-dir' | 'string';
 
diff --git a/src/models/testSuite.ts b/src/models/testSuite.ts
index c42b11dff..f4ba1547c 100644
--- a/src/models/testSuite.ts
+++ b/src/models/testSuite.ts
@@ -1,7 +1,6 @@
-import type {EntityMap} from '@models/entityMap';
-import type {TestSuiteExecution} from '@models/testSuiteExecution';
-
+import type {EntityMap} from './entityMap';
 import type {Execution} from './execution';
+import type {TestSuiteExecution} from './testSuiteExecution';
 import type {Variables} from './variable';
 
 export interface TestSuiteStep {
diff --git a/src/models/testSuiteExecution.ts b/src/models/testSuiteExecution.ts
index fa8500f94..84d37b317 100644
--- a/src/models/testSuiteExecution.ts
+++ b/src/models/testSuiteExecution.ts
@@ -1,7 +1,6 @@
-import type {EntityMap} from '@models/entityMap';
-import type {ExecutionStatusEnum} from '@models/execution';
-import type {ObjectRef} from '@models/objectRef';
-
+import type {EntityMap} from './entityMap';
+import type {ExecutionStatusEnum} from './execution';
+import type {ObjectRef} from './objectRef';
 import type {TestSuiteStepExecutionResult} from './testSuite';
 
 export type TestSuiteExecution = {
diff --git a/src/models/triggers.ts b/src/models/triggers.ts
index f173c465f..07cf85f06 100644
--- a/src/models/triggers.ts
+++ b/src/models/triggers.ts
@@ -1,4 +1,4 @@
-import {EntityMap} from './entityMap';
+import type {EntityMap} from './entityMap';
 
 export enum TriggerResources {
   'pod' = 'pod',
diff --git a/src/models/variable.ts b/src/models/variable.ts
index 241df7c0e..baa4a7627 100644
--- a/src/models/variable.ts
+++ b/src/models/variable.ts
@@ -1,4 +1,4 @@
-import {SecretRef} from './secretRef';
+import type {SecretRef} from './secretRef';
 
 export type Variable = {
   type: 0 | 1 | 'secretRef' | 'secret' | 'basic' | null;
diff --git a/src/models/websocket.ts b/src/models/websocket.ts
index 8f1167db0..49f6711a6 100644
--- a/src/models/websocket.ts
+++ b/src/models/websocket.ts
@@ -1,5 +1,5 @@
-import {Execution} from '@models/execution';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {Execution} from './execution';
+import type {TestSuiteExecution} from './testSuiteExecution';
 
 export enum WSEventType {
   START_TEST = 'start-test',
diff --git a/src/plugins/PluginScope.ts b/src/plugins/PluginScope.ts
index 253d80285..26884be29 100644
--- a/src/plugins/PluginScope.ts
+++ b/src/plugins/PluginScope.ts
@@ -1,6 +1,6 @@
 import type {SlotMetadata} from './types';
 
-class PluginScope {
+export class PluginScope {
   private state: Record<string, any>;
   private slots: Record<string, any>;
 
@@ -26,5 +26,3 @@ class PluginScope {
     this.slots[name].push({value, metadata});
   }
 }
-
-export default PluginScope;
diff --git a/src/plugins/context.ts b/src/plugins/context.ts
index 2b2e4069b..c5b1730aa 100644
--- a/src/plugins/context.ts
+++ b/src/plugins/context.ts
@@ -1,10 +1,9 @@
 import {createContext} from 'react';
 
-import PluginScope from './PluginScope';
+import {PluginScope} from './PluginScope';
 
 export interface PluginsContextProps {
   scope: PluginScope;
 }
 
-const PluginsContext = createContext<PluginsContextProps>(undefined!);
-export default PluginsContext;
+export const PluginsContext = createContext<PluginsContextProps>(undefined!);
diff --git a/src/plugins/definitions/ai-insights.tsx b/src/plugins/definitions/ai-insights.tsx
index 2ddb015c6..565e133ac 100644
--- a/src/plugins/definitions/ai-insights.tsx
+++ b/src/plugins/definitions/ai-insights.tsx
@@ -1,12 +1,13 @@
-import {IconLabel, Tag} from '@atoms';
+import {IconLabel} from '@atoms/IconLabel';
+import {Tag} from '@atoms/Tag';
 
 import {config} from '@constants/config';
 
-import {AiInsightsTab, MessagePanel} from '@molecules';
+import {AiInsightsTab} from '@molecules/AiInsightsTab';
+import {MessagePanel} from '@molecules/MessagePanel';
 
-import {LogOutputBannerInterface, Plugin, TestExecutionTabsInterface} from '@plugins/types';
-
-import PluginScope from '../PluginScope';
+import {PluginScope} from '@plugins/PluginScope';
+import type {LogOutputBannerInterface, Plugin, TestExecutionTabsInterface} from '@plugins/types';
 
 const isTestExecutionFailed = (scope: PluginScope) => {
   return (
@@ -14,7 +15,7 @@ const isTestExecutionFailed = (scope: PluginScope) => {
   );
 };
 
-const createAiInsightsPlugin = (): Plugin => ({
+export const createAiInsightsPlugin = (): Plugin => ({
   name: 'ai-insights',
   setup: scope => {
     scope.appendSlot(
@@ -67,5 +68,3 @@ const createAiInsightsPlugin = (): Plugin => ({
     );
   },
 });
-
-export default createAiInsightsPlugin;
diff --git a/src/plugins/hooks.ts b/src/plugins/hooks.ts
index ab8b64c74..f12bfd6d1 100644
--- a/src/plugins/hooks.ts
+++ b/src/plugins/hooks.ts
@@ -1,6 +1,6 @@
 import {useContext, useMemo} from 'react';
 
-import PluginsContext from './context';
+import {PluginsContext} from './context';
 import {orderArray} from './utils';
 
 export const usePluginState = <T>(name: string) => {
diff --git a/src/plugins/manager.ts b/src/plugins/manager.ts
index 2c3d722f0..45957638b 100644
--- a/src/plugins/manager.ts
+++ b/src/plugins/manager.ts
@@ -1,5 +1,5 @@
-import PluginScope from './PluginScope';
-import {Plugin} from './types';
+import {PluginScope} from './PluginScope';
+import type {Plugin} from './types';
 
 export class PluginManager {
   private plugins: Plugin[];
@@ -25,6 +25,4 @@ export class PluginManager {
   }
 }
 
-const createPluginManager = () => new PluginManager();
-
-export default createPluginManager;
+export const createPluginManager = () => new PluginManager();
diff --git a/src/plugins/types.ts b/src/plugins/types.ts
index 305be8b86..923982d14 100644
--- a/src/plugins/types.ts
+++ b/src/plugins/types.ts
@@ -1,6 +1,6 @@
 import type {Execution} from '@models/execution';
 
-import type PluginScope from './PluginScope';
+import type {PluginScope} from './PluginScope';
 
 export interface Plugin {
   name: string;
diff --git a/src/redux/hooks.ts b/src/redux/hooks.ts
index 5c4e9f66d..9d556500e 100644
--- a/src/redux/hooks.ts
+++ b/src/redux/hooks.ts
@@ -1,6 +1,6 @@
 import {TypedUseSelectorHook, useDispatch, useSelector} from 'react-redux';
 
-import {AppDispatch, RootState} from './store';
+import type {AppDispatch, RootState} from './store';
 
 export const useAppDispatch = () => useDispatch<AppDispatch>();
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
diff --git a/src/redux/initialState.ts b/src/redux/initialState.ts
index da8c2b332..d8ef1a1be 100644
--- a/src/redux/initialState.ts
+++ b/src/redux/initialState.ts
@@ -14,9 +14,7 @@ const initialSourcesState: SourcesState = {
   currentSource: undefined,
 };
 
-const initialReduxState = {
+export const initialReduxState = {
   executors: initialExecutorsState,
   sources: initialSourcesState,
 };
-
-export default initialReduxState;
diff --git a/src/redux/reducers/executorsSlice.ts b/src/redux/reducers/executorsSlice.ts
index 36d38b8be..36ad06ff0 100644
--- a/src/redux/reducers/executorsSlice.ts
+++ b/src/redux/reducers/executorsSlice.ts
@@ -2,15 +2,14 @@ import {Draft, PayloadAction, createSlice} from '@reduxjs/toolkit';
 
 import {capitalize} from 'lodash';
 
-import {EntityMap} from '@models/entityMap';
+import type {EntityMap} from '@models/entityMap';
 import {Executor, ExecutorFeature, ExecutorsState} from '@models/executors';
 
-import initialState from '@redux/initialState';
+import {initialReduxState as initialState} from '@redux/initialState';
+import type {RootState} from '@redux/store';
 
 import {isURL} from '@utils/strings';
 
-import type {RootState} from '../store';
-
 export const executorsSlice = createSlice({
   name: 'executorsSlice',
   initialState: initialState.executors,
diff --git a/src/redux/reducers/sourcesSlice.ts b/src/redux/reducers/sourcesSlice.ts
index f79f19af5..f9a323dd7 100644
--- a/src/redux/reducers/sourcesSlice.ts
+++ b/src/redux/reducers/sourcesSlice.ts
@@ -2,9 +2,8 @@ import {Draft, PayloadAction, createSlice} from '@reduxjs/toolkit';
 
 import type {SourceWithRepository, SourcesState} from '@models/sources';
 
-import initialState from '@redux/initialState';
-
-import type {RootState} from '../store';
+import {initialReduxState as initialState} from '@redux/initialState';
+import type {RootState} from '@redux/store';
 
 export const sourcesSlice = createSlice({
   name: 'sourcesSlice',
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 74e1755b8..9d4de92c8 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -1,8 +1,5 @@
 import {Action, Middleware, ThunkAction, configureStore} from '@reduxjs/toolkit';
 
-import {executorsSlice} from '@redux/reducers/executorsSlice';
-import {sourcesSlice} from '@redux/reducers/sourcesSlice';
-
 import {configApi} from '@services/config';
 import {executionsApi} from '@services/executions';
 import {executorsApi} from '@services/executors';
@@ -14,6 +11,9 @@ import {testSuitesApi} from '@services/testSuites';
 import {testsApi} from '@services/tests';
 import {triggersApi} from '@services/triggers';
 
+import {executorsSlice} from './reducers/executorsSlice';
+import {sourcesSlice} from './reducers/sourcesSlice';
+
 export const middlewares: Middleware[] = [
   executionsApi.middleware,
   testsApi.middleware,
diff --git a/src/services/apiEndpoint.spec.ts b/src/services/apiEndpoint.spec.ts
index c683a15a9..aeea93ede 100644
--- a/src/services/apiEndpoint.spec.ts
+++ b/src/services/apiEndpoint.spec.ts
@@ -4,14 +4,14 @@ import pick from 'lodash/pick';
 
 import {config} from '@constants/config';
 
-import MainContext from '@contexts/MainContext';
+import {MainContext} from '@contexts/MainContext';
+
+import {env} from '@env';
 
 import {initializeClusterDetailsStore} from '@store/clusterDetails';
 
 import {composeProviders} from '@utils/composeProviders';
 
-import env from '../env';
-
 import {
   getApiDetails,
   getApiEndpoint,
diff --git a/src/services/apiEndpoint.ts b/src/services/apiEndpoint.ts
index 14312e04b..113b0a126 100644
--- a/src/services/apiEndpoint.ts
+++ b/src/services/apiEndpoint.ts
@@ -5,15 +5,15 @@ import axios from 'axios';
 
 import {config} from '@constants/config';
 
-import {MainContext} from '@contexts';
+import {MainContext} from '@contexts/MainContext';
+
+import {env} from '@env';
 
 import {useClusterDetailsPick} from '@store/clusterDetails';
 
 import {getRtkBaseUrl, getRtkIdToken} from '@utils/rtk';
 import {hasProtocol} from '@utils/strings';
 
-import env from '../env';
-
 export type ApiEndpointListener = (apiEndpoint: string | null) => void;
 
 export interface ApiDetails {
diff --git a/src/services/artifacts.ts b/src/services/artifacts.ts
index ba9aaa07d..aacca3fc9 100644
--- a/src/services/artifacts.ts
+++ b/src/services/artifacts.ts
@@ -1,7 +1,7 @@
-import {getApiEndpoint} from '@services/apiEndpoint';
-
 import {getRtkBaseUrl, getRtkIdToken} from '@utils/rtk';
 
+import {getApiEndpoint} from './apiEndpoint';
+
 export const downloadArtifact = async (
   fileName: string,
   executionId: string,
diff --git a/src/services/config.ts b/src/services/config.ts
index 9862cf97f..e2aeec854 100644
--- a/src/services/config.ts
+++ b/src/services/config.ts
@@ -1,6 +1,6 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {ClusterConfig} from '@models/config';
+import type {ClusterConfig} from '@models/config';
 
 import {dynamicBaseQuery, memoizeQuery} from '@utils/fetchUtils';
 
diff --git a/src/services/executors.ts b/src/services/executors.ts
index e51234b14..abf1e46f4 100644
--- a/src/services/executors.ts
+++ b/src/services/executors.ts
@@ -1,7 +1,7 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
 import {Executor} from '@models/executors';
-import {MetadataResponse, YamlEditBody} from '@models/fetch';
+import type {MetadataResponse, YamlEditBody} from '@models/fetch';
 
 import {dynamicBaseQuery, memoizeQuery} from '@utils/fetchUtils';
 
diff --git a/src/services/repository.ts b/src/services/repository.ts
index 6bdb4fe99..5862cedba 100644
--- a/src/services/repository.ts
+++ b/src/services/repository.ts
@@ -1,6 +1,6 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {Repository} from '@models/repository';
+import type {Repository} from '@models/repository';
 
 import {dynamicBaseQuery} from '@utils/fetchUtils';
 
diff --git a/src/services/sources.ts b/src/services/sources.ts
index 338b6a76f..e14b67247 100644
--- a/src/services/sources.ts
+++ b/src/services/sources.ts
@@ -1,8 +1,8 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {YamlEditBody} from '@models/fetch';
-import {Repository} from '@models/repository';
-import {CreateSourceResult, SourceWithRepository} from '@models/sources';
+import type {YamlEditBody} from '@models/fetch';
+import type {Repository} from '@models/repository';
+import type {CreateSourceResult, SourceWithRepository} from '@models/sources';
 
 import {dynamicBaseQuery, memoizeQuery} from '@utils/fetchUtils';
 
diff --git a/src/services/testSuites.ts b/src/services/testSuites.ts
index d3dc3c79c..018954ad8 100644
--- a/src/services/testSuites.ts
+++ b/src/services/testSuites.ts
@@ -1,8 +1,8 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {MetadataResponse, YamlEditBody} from '@models/fetch';
-import {Test} from '@models/test';
-import {TestSuiteFilters, TestSuiteWithExecution} from '@models/testSuite';
+import type {MetadataResponse, YamlEditBody} from '@models/fetch';
+import type {Test} from '@models/test';
+import type {TestSuiteFilters, TestSuiteWithExecution} from '@models/testSuite';
 
 import {dynamicBaseQuery, memoizeQuery, paramsSerializer} from '@utils/fetchUtils';
 
diff --git a/src/services/tests.ts b/src/services/tests.ts
index fe395e670..e5169f2c4 100644
--- a/src/services/tests.ts
+++ b/src/services/tests.ts
@@ -1,8 +1,8 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {Artifact} from '@models/artifact';
-import {MetadataResponse, YamlEditBody} from '@models/fetch';
-import {Test, TestFilters, TestWithExecution} from '@models/test';
+import type {Artifact} from '@models/artifact';
+import type {MetadataResponse, YamlEditBody} from '@models/fetch';
+import type {Test, TestFilters, TestWithExecution} from '@models/test';
 
 import {dynamicBaseQuery, memoizeQuery, paramsSerializer} from '@utils/fetchUtils';
 
diff --git a/src/services/triggers.ts b/src/services/triggers.ts
index 098ee6cd4..99d2fac38 100644
--- a/src/services/triggers.ts
+++ b/src/services/triggers.ts
@@ -1,7 +1,7 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
-import {YamlEditBody} from '@models/fetch';
-import {TestTrigger, TriggersKeyMap} from '@models/triggers';
+import type {YamlEditBody} from '@models/fetch';
+import type {TestTrigger, TriggersKeyMap} from '@models/triggers';
 
 import {dynamicBaseQuery, memoizeQuery} from '@utils/fetchUtils';
 
diff --git a/src/store/clusterDetails.ts b/src/store/clusterDetails.ts
index f063ee536..9beb60c9b 100644
--- a/src/store/clusterDetails.ts
+++ b/src/store/clusterDetails.ts
@@ -2,7 +2,7 @@ import {StateCreator} from 'zustand';
 
 import type {ApiDetails} from '@services/apiEndpoint';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 export interface ClusterDetailsSlice extends ApiDetails {
   setClusterDetails: (state: ApiDetails) => void;
diff --git a/src/store/entityDetails.ts b/src/store/entityDetails.ts
index c224c7762..d09032a0e 100644
--- a/src/store/entityDetails.ts
+++ b/src/store/entityDetails.ts
@@ -3,7 +3,7 @@ import {StateCreator} from 'zustand';
 import type {Entity} from '@models/entity';
 import type {Metrics} from '@models/metrics';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 export interface EntityDetailsSlice {
   entity: Entity;
diff --git a/src/store/executionDetails.ts b/src/store/executionDetails.ts
index 05dc78acc..d275e10e3 100644
--- a/src/store/executionDetails.ts
+++ b/src/store/executionDetails.ts
@@ -1,9 +1,9 @@
 import {StateCreator} from 'zustand';
 
-import {Execution} from '@models/execution';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {Execution} from '@models/execution';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 export interface ExecutionDetailsSlice {
   id?: string;
diff --git a/src/store/logOutput.ts b/src/store/logOutput.ts
index c54d69f35..f26dcf0db 100644
--- a/src/store/logOutput.ts
+++ b/src/store/logOutput.ts
@@ -1,6 +1,6 @@
 import {StateCreator} from 'zustand';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 export interface LogOutputSlice {
   isFullscreen: boolean;
diff --git a/src/store/testSuites.ts b/src/store/testSuites.ts
index 81dace442..4160821a0 100644
--- a/src/store/testSuites.ts
+++ b/src/store/testSuites.ts
@@ -1,10 +1,10 @@
 import {StateCreator} from 'zustand';
 
-import {TestSuiteFilters, TestSuiteWithExecution} from '@models/testSuite';
+import type {TestSuiteFilters, TestSuiteWithExecution} from '@models/testSuite';
 
 import {initialPageSize} from '@redux/initialState';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 interface TestSuitesSlice {
   testSuites?: TestSuiteWithExecution[];
diff --git a/src/store/tests.ts b/src/store/tests.ts
index 0396ceac4..879b4a29d 100644
--- a/src/store/tests.ts
+++ b/src/store/tests.ts
@@ -1,10 +1,10 @@
 import {StateCreator} from 'zustand';
 
-import {TestFilters, TestWithExecution} from '@models/test';
+import type {TestFilters, TestWithExecution} from '@models/test';
 
 import {initialPageSize} from '@redux/initialState';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 interface TestsSlice {
   tests?: TestWithExecution[];
diff --git a/src/store/triggers.ts b/src/store/triggers.ts
index 578834318..2f9e49ee2 100644
--- a/src/store/triggers.ts
+++ b/src/store/triggers.ts
@@ -1,8 +1,8 @@
 import {StateCreator} from 'zustand';
 
-import {TestTrigger, TriggersKeyMap} from '@models/triggers';
+import type {TestTrigger, TriggersKeyMap} from '@models/triggers';
 
-import {connectStore, createStoreFactory} from '@store/utils';
+import {connectStore, createStoreFactory} from './utils';
 
 interface TriggersSlice {
   keyMap?: TriggersKeyMap;
diff --git a/src/styles/Colors.ts b/src/styles/Colors.ts
index 2a68b145c..3dcb638a9 100644
--- a/src/styles/Colors.ts
+++ b/src/styles/Colors.ts
@@ -1,4 +1,4 @@
-enum Colors {
+export enum Colors {
   mainBackground = '#111827',
   slate50 = '#F8FAFC',
   slate100 = '#F1F5F9',
@@ -188,5 +188,3 @@ export enum BorderColors {
 const borders = {
   greyBorder: `1px solid ${BorderColors.greyBorder}`,
 };
-
-export default Colors;
diff --git a/src/styles/Fonts.ts b/src/styles/Fonts.ts
index 0852427bc..a60a01650 100644
--- a/src/styles/Fonts.ts
+++ b/src/styles/Fonts.ts
@@ -1,8 +1,6 @@
-enum Fonts {
+export enum Fonts {
   nunito = 'Nunito, sans-serif',
   ptSans = 'PT Sans, sans-serif',
   roboto = 'Roboto, sans-serif',
   robotoMono = 'Roboto Mono, sans-serif',
 }
-
-export default Fonts;
diff --git a/src/styles/Shadows.ts b/src/styles/Shadows.ts
index b84ec4489..24ee69574 100644
--- a/src/styles/Shadows.ts
+++ b/src/styles/Shadows.ts
@@ -1,5 +1,3 @@
-enum Shadows {
+export enum Shadows {
   soft = '0 1px 2px rgba(0, 0, 0, 0.07), 0 2px 4px rgba(0, 0, 0, 0.07), 0 4px 8px rgba(0, 0, 0, 0.07), 0 8px 16px rgba(0, 0, 0, 0.07), 0 16px 32px rgba(0, 0, 0, 0.07), 0 32px 64px rgba(0, 0, 0, 0.07);',
 }
-
-export default Shadows;
diff --git a/src/styles/globalStyles.ts b/src/styles/globalStyles.ts
index e651278b5..14c797594 100644
--- a/src/styles/globalStyles.ts
+++ b/src/styles/globalStyles.ts
@@ -1,7 +1,7 @@
 import {createGlobalStyle} from 'styled-components';
 
-import Colors, {BackgroundColors} from '@styles/Colors';
-import {maxDevice} from '@styles/MediaQueries';
+import {BackgroundColors, Colors} from './Colors';
+import {maxDevice} from './MediaQueries';
 
 export const invisibleScroll = `
   &::-webkit-scrollbar {
diff --git a/src/utils/anonymizeQueryString.ts b/src/utils/anonymizeQueryString.ts
index 2447f0f25..cb555e3d6 100644
--- a/src/utils/anonymizeQueryString.ts
+++ b/src/utils/anonymizeQueryString.ts
@@ -12,7 +12,7 @@ const getDataType = (value: unknown): DataType | null => {
   return null;
 };
 
-const anonymizeQueryString = (qs: string): string => {
+export const anonymizeQueryString = (qs: string): string => {
   const params = new URLSearchParams(qs);
   Array.from(params.entries()).forEach(([key, value]) => {
     const type = getDataType(value);
@@ -23,5 +23,3 @@ const anonymizeQueryString = (qs: string): string => {
   const result = params.toString();
   return /^\?*$/.test(result) ? '' : result.replace(/^\?*/, '?');
 };
-
-export default anonymizeQueryString;
diff --git a/src/utils/executors.ts b/src/utils/executors.ts
index 1f4d693f3..8df46ed1d 100644
--- a/src/utils/executors.ts
+++ b/src/utils/executors.ts
@@ -1,5 +1,5 @@
 import {Executor} from '@models/executors';
-import {Option} from '@models/form';
+import type {Option} from '@models/form';
 
 export const remapExecutors = (executors: Executor[]): Option[] => {
   const array: Option[] = [];
diff --git a/src/utils/externalLinks.ts b/src/utils/externalLinks.ts
index 03df267e9..b781d2b2b 100644
--- a/src/utils/externalLinks.ts
+++ b/src/utils/externalLinks.ts
@@ -1,4 +1,4 @@
-import env from '../env';
+import {env} from '@env';
 
 export enum externalLinks {
   documentation = 'https://docs.testkube.io/',
diff --git a/src/utils/fetchUtils.ts b/src/utils/fetchUtils.ts
index aadb9a89d..1921a9e98 100644
--- a/src/utils/fetchUtils.ts
+++ b/src/utils/fetchUtils.ts
@@ -7,7 +7,7 @@ import {isEqual} from 'lodash';
 
 import {getApiEndpoint} from '@services/apiEndpoint';
 
-import {getRtkBaseUrl, getRtkIdToken} from '@utils/rtk';
+import {getRtkBaseUrl, getRtkIdToken} from './rtk';
 
 const prohibitedValues = ['undefined', 'null'];
 
diff --git a/src/utils/form.tsx b/src/utils/form.tsx
index 6d8d23b61..c016ce819 100644
--- a/src/utils/form.tsx
+++ b/src/utils/form.tsx
@@ -1,6 +1,6 @@
 import {Rule} from 'antd/lib/form';
 
-import {k8sResourceNameRegex} from '@utils/strings';
+import {k8sResourceNameRegex} from './strings';
 
 export const required: Rule = {required: true, message: 'Required.'};
 export const digits: Rule = {pattern: /\d/, message: 'Only digits.'};
diff --git a/src/utils/index.ts b/src/utils/index.ts
deleted file mode 100644
index 7424149ec..000000000
--- a/src/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {validateDuplicateValueByKey} from './validate';
diff --git a/src/utils/isExecutionFinished.ts b/src/utils/isExecutionFinished.ts
index 2c2817546..c36894437 100644
--- a/src/utils/isExecutionFinished.ts
+++ b/src/utils/isExecutionFinished.ts
@@ -1,5 +1,5 @@
-import {Execution} from '@models/execution';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {Execution} from '@models/execution';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
 export function isExecutionFinished(data: TestSuiteExecution | Execution | null | undefined): boolean {
   const status = (data as Execution)?.executionResult?.status || (data as TestSuiteExecution)?.status;
diff --git a/src/utils/notification.ts b/src/utils/notification.ts
index 3f8818825..ca81479f9 100644
--- a/src/utils/notification.ts
+++ b/src/utils/notification.ts
@@ -1,6 +1,6 @@
-import {RTKResponse} from '@models/fetch';
+import type {RTKResponse} from '@models/fetch';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
 export type DefaultRequestError = {
   title?: string;
diff --git a/src/utils/sources.ts b/src/utils/sources.ts
index 2ae7b3c6b..bb67c3206 100644
--- a/src/utils/sources.ts
+++ b/src/utils/sources.ts
@@ -1,14 +1,14 @@
 import {NamePath} from 'antd/lib/form/interface';
 
-import {Option} from '@models/form';
-import {Repository} from '@models/repository';
-import {SecretRef} from '@models/secretRef';
-import {SourceWithRepository} from '@models/sources';
-import {Test} from '@models/test';
+import type {Option} from '@models/form';
+import type {Repository} from '@models/repository';
+import type {SecretRef} from '@models/secretRef';
+import type {SourceWithRepository} from '@models/sources';
+import type {Test} from '@models/test';
 
-import {notificationCall} from '@molecules';
+import {notificationCall} from '@molecules/Notification';
 
-import {SourceType} from '@organisms/TestConfigurationForm/utils';
+import type {SourceType} from '@organisms/TestConfigurationForm/utils';
 
 const customGitSourceString = '$custom-git-';
 
diff --git a/src/utils/testSuites.ts b/src/utils/testSuites.ts
index 3a77dd273..900004473 100644
--- a/src/utils/testSuites.ts
+++ b/src/utils/testSuites.ts
@@ -1,5 +1,5 @@
-import {TestSuite, TestSuiteStep} from '@models/testSuite';
-import {TestSuiteExecution} from '@models/testSuiteExecution';
+import type {TestSuite, TestSuiteStep} from '@models/testSuite';
+import type {TestSuiteExecution} from '@models/testSuiteExecution';
 
 type TestSuiteExecutionMaybeV2 = TestSuiteExecution & {stepResults?: any};
 
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index dcce699a5..1a4b9c464 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -1,4 +1,4 @@
-import {VariableInForm} from '@models/variable';
+import type {VariableInForm} from '@models/variable';
 
 export const validateDuplicateValueByKey = (value: string, list: VariableInForm[], key: keyof VariableInForm) => {
   let duplicateFlag = false;
diff --git a/src/utils/variables.ts b/src/utils/variables.ts
index 0e38cf512..b65a79c0b 100644
--- a/src/utils/variables.ts
+++ b/src/utils/variables.ts
@@ -1,4 +1,4 @@
-import {VariableInForm, Variables} from '@models/variable';
+import type {VariableInForm, Variables} from '@models/variable';
 
 export const formatVariables = (list: VariableInForm[]) => {
   const variables: Variables = {};