29 files changed, 33 insertions, 29 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/index.ts
deleted file mode 100644
index 95c029cdb9..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './logo/Logo';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Box.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/Box.tsx
index 548d0e7361..387264b8d2 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Box.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/Box.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { Layout, LayoutProps } from './Layout';
+import { Layout, LayoutProps } from '../layout';
 
 interface BoxProps extends LayoutProps {
   $width?: string;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/index.ts
new file mode 100644
index 0000000000..305f81d78b
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/index.ts
@@ -0,0 +1 @@
+export * from './Box';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/Button.tsx
index ef783c12ec..5c8f9d05b3 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/Button.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import { Colors, Radius, Spacings } from '../../foundations';
 import { buttonReset } from '../../styles';
-import { Flex } from '../layout';
+import { Flex } from '../flex';
 import { BodySmallSemiBold } from '../typography';
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/index.ts
new file mode 100644
index 0000000000..8b166a86e4
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/index.ts
@@ -0,0 +1 @@
+export * from './Button';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Container.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/Container.tsx
index 66a76c02ec..94b609fa96 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Container.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/Container.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Spacings } from '../../foundations';
-import { Flex, FlexProps } from './Flex';
+import { Flex, FlexProps } from '../flex';
 
 export interface ContainerProps extends FlexProps {
   size?: '3' | '4';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/index.ts
new file mode 100644
index 0000000000..8a1103ffa4
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/index.ts
@@ -0,0 +1 @@
+export * from './Container';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Flex.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/Flex.tsx
index cba52c5f9f..4709b96be5 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Flex.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/Flex.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Spacings } from '../../foundations';
-import { Layout, LayoutProps } from './Layout';
+import { Layout, LayoutProps } from '../layout';
 
 export interface FlexProps extends LayoutProps {
   $gap?: Spacings;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/index.ts
new file mode 100644
index 0000000000..7cf460b021
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/index.ts
@@ -0,0 +1 @@
+export * from './Flex';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/icon-button/IconButton.tsx
index 586ab0e76d..586ab0e76d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/icon-button/IconButton.tsx
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/icon-button/index.ts
index 66f0cf90a7..1a85f0f725 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/icon-button/index.ts
@@ -1,2 +1 @@
-export * from './Button';
 export * from './IconButton';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts
index 8a398fe7a2..6ca0b4a51c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts
@@ -1,5 +1,11 @@
+export * from './box';
+export * from './button';
+export * from './container';
+export * from './flex';
+export * from './icon-button';
 export * from './layout';
-export * from './atoms';
+export * from './logo';
+export * from './main-header';
+export * from './navigation-header';
+export * from './theme';
 export * from './typography';
-export * from './molecules';
-export * from './organisms';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts
index a3f4f59096..9877e7f4ae 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts
@@ -1,5 +1 @@
-export * from './Box';
-export * from './Container';
-export * from './Flex';
 export * from './Layout';
-export * from './Theme';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/logo/Logo.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/Logo.tsx
index edc0c5aec3..c30f35b3e0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/logo/Logo.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/Logo.tsx
@@ -1,6 +1,6 @@
-import ImageView from '../../../../components/ImageView';
-import { Spacings } from '../../../foundations';
-import { Flex } from '../../layout';
+import ImageView from '../../../components/ImageView';
+import { Spacings } from '../../foundations';
+import { Flex } from '../flex';
 
 export interface LogoProps {
   variant?: 'icon' | 'text' | 'both';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/index.ts
new file mode 100644
index 0000000000..d97c6951e2
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/index.ts
@@ -0,0 +1 @@
+export * from './Logo';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/MainHeader.tsx
index b3cf54c9d2..07327803f8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/MainHeader.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import { Colors, Spacings } from '../../../foundations';
-import { TransientProps } from '../../../types';
-import { Flex } from '../../layout';
+import { Colors, Spacings } from '../../foundations';
+import { TransientProps } from '../../types';
+import { Flex } from '../flex';
 import { MainHeaderIconButton } from './components';
 
 export type HeaderProps = React.PropsWithChildren<{
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/components/MainHeaderIconButton.tsx
index 907f48cb00..86d7138ec8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/components/MainHeaderIconButton.tsx
@@ -1,4 +1,4 @@
-import { IconButton, IconButtonProps } from '../../../molecules';
+import { IconButton, IconButtonProps } from '../../icon-button';
 
 export const MainHeaderIconButton = (props: IconButtonProps) => {
   return <IconButton variant="secondary" {...props} />;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/components/index.ts
index 4d837fe571..4d837fe571 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/components/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/index.ts
index 3d8a1927af..3d8a1927af 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/main-header/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/NavigationHeader.tsx
index c3025c1459..a291c40718 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/NavigationHeader.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import { Colors, Spacings } from '../../../foundations';
-import { TransientProps } from '../../../types';
-import { Flex } from '../../layout';
+import { Colors, Spacings } from '../../foundations';
+import { TransientProps } from '../../types';
+import { Flex } from '../flex';
 import {
   NavigationHeaderButtonGroup,
   NavigationHeaderIconButton,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeaderContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/NavigationHeaderContext.tsx
index d0111b50bd..d0111b50bd 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeaderContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/NavigationHeaderContext.tsx
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderButtonGroup.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderButtonGroup.tsx
index b6fc317554..e256944021 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderButtonGroup.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderButtonGroup.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
-import { Spacings } from '../../../../foundations';
-import { Flex } from '../../../layout';
+import { Spacings } from '../../../foundations';
+import { Flex } from '../../flex';
 
 export const NavigationHeaderButtonGroup = styled(Flex).attrs({
   $gap: Spacings.spacing6,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderIconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderIconButton.tsx
index 531e97eafd..f3350ad339 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderIconButton.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderIconButton.tsx
@@ -1,4 +1,4 @@
-import { IconButton, IconButtonProps } from '../../../molecules';
+import { IconButton, IconButtonProps } from '../../icon-button';
 
 export const NavigationHeaderIconButton = (props: IconButtonProps) => {
   return <IconButton variant="secondary" {...props} />;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderTitle.tsx
index be4b31b9d0..7d50dacfb4 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/NavigationHeaderTitle.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { TitleMedium } from '../../../typography';
+import { TitleMedium } from '../../typography';
 import { useNavigationHeader } from '../NavigationHeaderContext';
 
 export interface NavigationHeaderTitleProps {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/index.ts
index 1869233158..1869233158 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/components/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/index.ts
index e5022e8bf9..e5022e8bf9 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/navigation-header/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
deleted file mode 100644
index 5b82330cdf..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './main-header';
-export * from './navigation-header';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/Theme.tsx
index 63c762c4c1..63c762c4c1 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/Theme.tsx
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/index.ts
new file mode 100644
index 0000000000..d54caf893f
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/index.ts
@@ -0,0 +1 @@
+export * from './Theme';