diff --git a/lib/design-system/src/blocks/Block/Block.stories.tsx b/lib/design-system/src/blocks/Block/Block.stories.tsx
index 6f4f2ff4cb..29540856a0 100644
--- a/lib/design-system/src/blocks/Block/Block.stories.tsx
+++ b/lib/design-system/src/blocks/Block/Block.stories.tsx
@@ -1,6 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { Flex } from '../../';
+import { Flex } from '../../../general';
 import { Block } from './Block';
 
 export default {
diff --git a/lib/design-system/src/blocks/Bubble/Bubble.stories.tsx b/lib/design-system/src/blocks/Bubble/Bubble.stories.tsx
index c507e6389a..1fd782ec90 100644
--- a/lib/design-system/src/blocks/Bubble/Bubble.stories.tsx
+++ b/lib/design-system/src/blocks/Bubble/Bubble.stories.tsx
@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { Box, Bubble, Flex } from '../../index';
+import { Box, Flex } from '../../../general';
+import { Bubble } from './Bubble';
 import { FragmentReactionType } from './Bubble.types';
 import { OnReactionPayload } from './Reaction';
 
diff --git a/lib/design-system/src/blocks/Bubble/Bubble.tsx b/lib/design-system/src/blocks/Bubble/Bubble.tsx
index 34dd059424..5a5c19bab7 100644
--- a/lib/design-system/src/blocks/Bubble/Bubble.tsx
+++ b/lib/design-system/src/blocks/Bubble/Bubble.tsx
@@ -1,14 +1,10 @@
 import { Ref, useEffect, useMemo, useState } from 'react';
 
+import { Box, BoxProps, Flex, Icon, Text } from '../../../general';
 import {
-  Box,
-  BoxProps,
   contrastAwareBlackOrWhiteHex,
-  Flex,
   flipColorIfLowContrast,
-  Icon,
-  Text,
-} from '../..';
+} from '../../../util';
 import { chatDate } from '../../util/date';
 import { BUBBLE_HEIGHT, STATUS_HEIGHT } from './Bubble.constants';
 import { BubbleAuthor, BubbleFooter, BubbleStyle } from './Bubble.styles';
diff --git a/lib/design-system/src/blocks/Bubble/Pinned.tsx b/lib/design-system/src/blocks/Bubble/Pinned.tsx
index 439cf810ee..3999786a96 100644
--- a/lib/design-system/src/blocks/Bubble/Pinned.tsx
+++ b/lib/design-system/src/blocks/Bubble/Pinned.tsx
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 
-import { Box, BoxProps, capitalizeFirstLetter, Flex, Text } from '../../index';
+import { Box, BoxProps, Flex, Text } from '../../../general';
+import { capitalizeFirstLetter } from '../../util/strings';
 import { BubbleAuthor } from './Bubble.styles';
 import { FragmentImageType, FragmentType, TEXT_TYPES } from './Bubble.types';
 import { renderFragment } from './renderFragment';
diff --git a/lib/design-system/src/general/CommButton/CommButton.stories.tsx b/lib/design-system/src/general/CommButton/CommButton.stories.tsx
index ed4def7bb8..3ddbeeb710 100644
--- a/lib/design-system/src/general/CommButton/CommButton.stories.tsx
+++ b/lib/design-system/src/general/CommButton/CommButton.stories.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { IconPathsType } from '../../';
+import { IconPathsType } from '../../../general';
 import { CommButton } from './CommButton';
 
 export default {
diff --git a/lib/design-system/src/general/ProgressBar/ProgressBar.stories.tsx b/lib/design-system/src/general/ProgressBar/ProgressBar.stories.tsx
index 2eba7ca505..a239e52526 100644
--- a/lib/design-system/src/general/ProgressBar/ProgressBar.stories.tsx
+++ b/lib/design-system/src/general/ProgressBar/ProgressBar.stories.tsx
@@ -1,6 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { Flex } from '../../';
+import { Flex } from '../../../general';
 import { ProgressBar } from './ProgressBar';
 
 export default {
diff --git a/lib/design-system/src/index.ts b/lib/design-system/src/index.ts
deleted file mode 100644
index a255e1b91d..0000000000
--- a/lib/design-system/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from '../blocks';
-export * from '../general';
-export * from '../inputs';
-export * from '../navigation';
-export * from '../os';
-export * from '../util';
diff --git a/lib/design-system/src/navigation/Menu/Menu.stories.tsx b/lib/design-system/src/navigation/Menu/Menu.stories.tsx
index 6f87d034b8..f4570028be 100644
--- a/lib/design-system/src/navigation/Menu/Menu.stories.tsx
+++ b/lib/design-system/src/navigation/Menu/Menu.stories.tsx
@@ -1,8 +1,9 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { Button, Icon } from '../../';
 import { Box } from '../../general/Box/Box';
+import { Button } from '../../general/Button/Button';
 import { Flex } from '../../general/Flex/Flex';
+import { Icon } from '../../general/Icon/Icon';
 import { Menu } from './Menu';
 
 export default {
diff --git a/lib/design-system/src/navigation/TreeView/TreeItem.tsx b/lib/design-system/src/navigation/TreeView/TreeItem.tsx
index 0e5226047f..1a0773187f 100644
--- a/lib/design-system/src/navigation/TreeView/TreeItem.tsx
+++ b/lib/design-system/src/navigation/TreeView/TreeItem.tsx
@@ -1,4 +1,4 @@
-import { BoxProps, Flex } from '../../';
+import { BoxProps, Flex } from '../../../general';
 
 type TreeItemProps = {
   myProp?: string;
diff --git a/lib/design-system/src/navigation/TreeView/TreeView.stories.tsx b/lib/design-system/src/navigation/TreeView/TreeView.stories.tsx
index e7ceee6622..47b0dce1f4 100644
--- a/lib/design-system/src/navigation/TreeView/TreeView.stories.tsx
+++ b/lib/design-system/src/navigation/TreeView/TreeView.stories.tsx
@@ -1,6 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 
-import { Flex } from '../../';
+import { Flex } from '../../../general';
 import { TreeView } from './';
 
 export default {
diff --git a/lib/design-system/src/navigation/TreeView/index.tsx b/lib/design-system/src/navigation/TreeView/index.tsx
index c5ea97bee6..db54ecab80 100644
--- a/lib/design-system/src/navigation/TreeView/index.tsx
+++ b/lib/design-system/src/navigation/TreeView/index.tsx
@@ -1,4 +1,4 @@
-import { BoxProps, Flex } from '../../';
+import { BoxProps, Flex } from '../../../general';
 
 type TreeViewProps = {
   myProp?: string;
diff --git a/lib/design-system/src/os/ConnectionStatus/ConnectionStatus.tsx b/lib/design-system/src/os/ConnectionStatus/ConnectionStatus.tsx
index 8205a744f2..c4eff4c547 100644
--- a/lib/design-system/src/os/ConnectionStatus/ConnectionStatus.tsx
+++ b/lib/design-system/src/os/ConnectionStatus/ConnectionStatus.tsx
@@ -3,7 +3,7 @@ import { motion } from 'framer-motion';
 import { darken, lighten, rgba, saturate } from 'polished';
 import styled, { css } from 'styled-components';
 
-import { Button, Flex, Icon, Spinner, Text } from '../../';
+import { Button, Flex, Icon, Spinner, Text } from '../../../general';
 
 interface ConnStatusStyleProps {
   baseColor: string;