Move contexts to component root folder and update imports

40 files changed, 41 insertions, 41 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/SettingsListbox.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/SettingsListbox.tsx
index 098700ee21..0fca7d4357 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/SettingsListbox.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/SettingsListbox.tsx
@@ -1,6 +1,6 @@
 import { ScrollToAnchorId } from '../../../shared/ipc-types';
 import { useScrollToListItem } from '../../hooks';
-import { Listbox, ListboxProps } from '../../lib/components/listbox/Listbox';
+import { Listbox, ListboxProps } from '../../lib/components/listbox';
 import { BaseOption, InputOption, SplitOption } from './components';
 
 export type SettingsListboxProps<T> = Omit<ListboxProps<T>, 'animation'> & {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/base-option/BaseOption.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/base-option/BaseOption.tsx
index 7b916cd027..9c618f8c2f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/base-option/BaseOption.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/base-option/BaseOption.tsx
@@ -1,5 +1,5 @@
+import { Listbox } from '../../../../lib/components/listbox';
 import { ListboxOptionProps } from '../../../../lib/components/listbox/components';
-import { Listbox } from '../../../../lib/components/listbox/Listbox';
 
 export type BaseOptionProps<T> = ListboxOptionProps<T>;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/InputOption.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/InputOption.tsx
index 3317901e62..090c6b8aaf 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/InputOption.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/InputOption.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
+import { Listbox } from '../../../../lib/components/listbox';
 import { ListboxOptionProps } from '../../../../lib/components/listbox/components';
-import { Listbox } from '../../../../lib/components/listbox/Listbox';
 import { InputOptionInput, InputOptionLabel, InputOptionTrigger } from './components';
 import { InputOptionProvider } from './InputOptionContext';
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-input/InputOptionInput.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-input/InputOptionInput.tsx
index 34f1b1b368..ec3044ef2d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-input/InputOptionInput.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-input/InputOptionInput.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
 import { ListItem } from '../../../../../../lib/components/list-item';
-import { ListItemTextFieldInputProps } from '../../../../../../lib/components/list-item/components/list-item-text-field/list-item-text-field-input';
-import { useListboxContext } from '../../../../../../lib/components/listbox/components';
+import { ListItemTextFieldInputProps } from '../../../../../../lib/components/list-item/components/list-item-text-field/components';
+import { useListboxContext } from '../../../../../../lib/components/listbox';
 import { useTextField } from '../../../../../../lib/components/text-field';
 import { useInputOptionContext } from '../../InputOptionContext';
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-label/InputOptionLabel.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-label/InputOptionLabel.tsx
index 0a64b54f5d..b2b5fb705d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-label/InputOptionLabel.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-label/InputOptionLabel.tsx
@@ -1,4 +1,4 @@
-import { Listbox } from '../../../../../../lib/components/listbox/Listbox';
+import { Listbox } from '../../../../../../lib/components/listbox';
 import { useInputOptionContext } from '../../InputOptionContext';
 
 export type InputOptionLabelProps = {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-trigger/InputOptionTrigger.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-trigger/InputOptionTrigger.tsx
index b5341c590b..ae8f4d6c4e 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-trigger/InputOptionTrigger.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/input-option/components/input-option-trigger/InputOptionTrigger.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { useListboxContext } from '../../../../../../lib/components/listbox/components';
+import { useListboxContext } from '../../../../../../lib/components/listbox/';
+import { useListboxOptionContext } from '../../../../../../lib/components/listbox/components/listbox-option/';
 import {
   ListboxOptionTriggerProps,
   StyledListItemOptionItem,
-  useListboxOptionContext,
 } from '../../../../../../lib/components/listbox/components/listbox-option/components';
 import { colors } from '../../../../../../lib/foundations';
 import { useInputOptionContext } from '../../InputOptionContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/SplitOption.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/SplitOption.tsx
index 1e11445240..4c02f43cb0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/SplitOption.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/SplitOption.tsx
@@ -1,6 +1,6 @@
 import { Flex } from '../../../../lib/components';
+import { Listbox } from '../../../../lib/components/listbox';
 import { ListboxOptionProps } from '../../../../lib/components/listbox/components';
-import { Listbox } from '../../../../lib/components/listbox/Listbox';
 import { SplitOptionItem, SplitOptionNavigateButton } from './components';
 
 export type SplitOptionProps<T> = ListboxOptionProps<T>;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/components/split-option-item/SplitOptionItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/components/split-option-item/SplitOptionItem.tsx
index 3c4dc15d45..cbe431ad7e 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/components/split-option-item/SplitOptionItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-listbox/components/split-option/components/split-option-item/SplitOptionItem.tsx
@@ -1,4 +1,4 @@
-import { Listbox } from '../../../../../../lib/components/listbox/Listbox';
+import { Listbox } from '../../../../../../lib/components/listbox';
 
 export type ListBoxOptionWithNavigationProps = React.ComponentPropsWithRef<'li'>;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/Listbox.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/Listbox.tsx
index 4633ac8a77..c207e66849 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/Listbox.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/Listbox.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { ListItem, ListItemProps } from '../list-item';
-import { ListboxLabel, ListboxOption, ListboxOptions, ListboxProvider } from './components';
+import { ListboxLabel, ListboxOption, ListboxOptions } from './components';
+import { ListboxProvider } from './ListboxContext';
 
 export type ListboxProps<T> = ListItemProps & {
   onValueChange?: (value: T) => Promise<void>;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-context/ListboxContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/ListboxContext.tsx
index 1491795922..e7a9e89fd0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-context/ListboxContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/ListboxContext.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { ListboxProps } from '../../Listbox';
+import { ListboxProps } from './Listbox';
 
 type ListboxContext<T> = Pick<ListboxProps<T>, 'value' | 'onValueChange'> & {
   labelId: string;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/index.ts
index 43f433a2ea..4808f57313 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/index.ts
@@ -1,4 +1,3 @@
-export * from './listbox-context';
 export * from './listbox-label';
 export * from './listbox-option';
 export * from './listbox-options';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-label/ListboxLabel.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-label/ListboxLabel.tsx
index 42897c7c3e..fc0c0acbc3 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-label/ListboxLabel.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-label/ListboxLabel.tsx
@@ -1,5 +1,5 @@
 import { ListItemLabel, ListItemLabelProps } from '../../../list-item/components';
-import { useListboxContext } from '../listbox-context';
+import { useListboxContext } from '../../';
 
 export type ListboxLabelProps = ListItemLabelProps;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOption.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOption.tsx
index 0423f98ba8..139d40b1a9 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOption.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOption.tsx
@@ -3,9 +3,9 @@ import {
   ListboxOptionIcon,
   ListboxOptionItem,
   ListboxOptionLabel,
-  ListboxOptionProvider,
   ListboxOptionTrigger,
 } from './components';
+import { ListboxOptionProvider } from './ListboxOptionContext';
 
 export type ListboxOptionProps<T> = ListItemProps & {
   value: T;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-context/ListboxOptionContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOptionContext.tsx
index 2a87c7e703..2f4e23450b 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-context/ListboxOptionContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/ListboxOptionContext.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { ListboxOptionProps } from '../../ListboxOption';
+import { ListboxOptionProps } from './ListboxOption';
 
 type ListboxOptionContext<T> = Pick<ListboxOptionProps<T>, 'value'>;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/index.ts
index f41b29f151..19d312f8dc 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/index.ts
@@ -1,4 +1,3 @@
-export * from './listbox-option-context';
 export * from './listbox-option-icon';
 export * from './listbox-option-label';
 export * from './listbox-option-item';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-context/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-context/index.ts
deleted file mode 100644
index f14e2d2d4f..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-context/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ListboxOptionContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-icon/ListboxOptionIcon.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-icon/ListboxOptionIcon.tsx
index b08b14cc4b..8ace35d43f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-icon/ListboxOptionIcon.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-icon/ListboxOptionIcon.tsx
@@ -2,8 +2,8 @@ import styled from 'styled-components';
 
 import { ListItem } from '../../../../../list-item';
 import { ListItemIconProps } from '../../../../../list-item/components';
-import { useListboxContext } from '../../../listbox-context';
-import { useListboxOptionContext } from '../listbox-option-context/ListboxOptionContext';
+import { useListboxContext } from '../../../../';
+import { useListboxOptionContext } from '../../';
 
 export type ListboxOptionIconProps = ListItemIconProps;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-item/ListboxOptionItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-item/ListboxOptionItem.tsx
index b3e43d25da..a434c676c4 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-item/ListboxOptionItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-item/ListboxOptionItem.tsx
@@ -3,8 +3,8 @@ import styled, { css } from 'styled-components';
 import { colors } from '../../../../../../foundations';
 import { ListItem } from '../../../../../list-item';
 import { ListItemItemProps } from '../../../../../list-item/components';
-import { useListboxContext } from '../../../listbox-context';
-import { useListboxOptionContext } from '../listbox-option-context';
+import { useListboxContext } from '../../../../';
+import { useListboxOptionContext } from '../../';
 
 export type ListItemOptionItemProps = ListItemItemProps;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-trigger/ListboxOptionTrigger.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-trigger/ListboxOptionTrigger.tsx
index 48cb00db5b..9a587e826d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-trigger/ListboxOptionTrigger.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/components/listbox-option-trigger/ListboxOptionTrigger.tsx
@@ -3,8 +3,8 @@ import styled, { css } from 'styled-components';
 
 import { colors } from '../../../../../../foundations';
 import { useListItemContext } from '../../../../../list-item/ListItemContext';
-import { useListboxContext } from '../../../listbox-context';
-import { useListboxOptionContext } from '../';
+import { useListboxContext } from '../../../../';
+import { useListboxOptionContext } from '../../';
 import { StyledListItemOptionItem } from '../';
 
 export type ListboxOptionTriggerProps = React.ComponentPropsWithRef<'li'>;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/index.ts
index 34f4b8fbe5..00a7794f36 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-option/index.ts
@@ -1 +1,2 @@
 export * from './ListboxOption';
+export * from './ListboxOptionContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/ListboxOptions.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/ListboxOptions.tsx
index dc11214e8b..3ceccfad54 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/ListboxOptions.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/ListboxOptions.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { useListboxContext } from '../listbox-context';
+import { useListboxContext } from '../../';
 import { useChildrenValues, useHandleKeyboardNavigation } from './hooks';
 
 export type ListboxOptionsProps = {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/hooks/useHandleKeyboardNavigation.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/hooks/useHandleKeyboardNavigation.ts
index e705cfba64..335b2d12f0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/hooks/useHandleKeyboardNavigation.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-options/hooks/useHandleKeyboardNavigation.ts
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { useListboxContext } from '../../listbox-context';
+import { useListboxContext } from '../../../';
 
 export const useHandleKeyboardNavigation = <T>(options: T[]) => {
   const { value: selectedValue, focusedValue, setFocusedValue } = useListboxContext<T>();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-context/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/index.ts
index b1c14d7397..94e7f641ab 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/components/listbox-context/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/listbox/index.ts
@@ -1 +1,2 @@
+export * from './Listbox';
 export * from './ListboxContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/Switch.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/Switch.tsx
index 748c689a9c..df90c19bd8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/Switch.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/Switch.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { SwitchLabel, SwitchProvider, SwitchThumb, SwitchTrigger } from './components';
+import { SwitchLabel, SwitchThumb, SwitchTrigger } from './components';
+import { SwitchProvider } from './SwitchContext';
 
 export interface SwitchProps {
   checked?: boolean;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-context/SwitchContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/SwitchContext.tsx
index 6e798e24a2..78520c0e9a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-context/SwitchContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/SwitchContext.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SwitchProps } from '../../Switch';
+import { SwitchProps } from './Switch';
 
 interface SwitchContextProps {
   labelId: string;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/index.ts
index 54c6e9e6b9..8d691b187b 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/index.ts
@@ -1,4 +1,3 @@
 export * from './switch-thumb';
 export * from './switch-trigger';
 export * from './switch-label';
-export * from './switch-context';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-context/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-context/index.ts
deleted file mode 100644
index d4faa81ef4..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-context/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './SwitchContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-label/SwitchLabel.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-label/SwitchLabel.tsx
index 9350cf2804..2a2481863a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-label/SwitchLabel.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-label/SwitchLabel.tsx
@@ -1,5 +1,5 @@
 import { Text, TextProps } from '../../../typography';
-import { useSwitchContext } from '../switch-context';
+import { useSwitchContext } from '../../';
 
 export type SwitchLabelProps = TextProps;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/SwitchThumb.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/SwitchThumb.tsx
index 2a365b6b63..2a7cbb075e 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/SwitchThumb.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/SwitchThumb.tsx
@@ -3,7 +3,7 @@ import styled, { css } from 'styled-components';
 
 import { colors } from '../../../../foundations';
 import { Dot } from '../../../dot';
-import { useSwitchContext } from '../switch-context';
+import { useSwitchContext } from '../../';
 import { useBackgroundColor, useBorderColor } from './hooks';
 
 export type SwitchThumbProps = React.HtmlHTMLAttributes<HTMLDivElement>;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBackgroundColor.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBackgroundColor.ts
index 6f80aee0ba..38c6eba50e 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBackgroundColor.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBackgroundColor.ts
@@ -1,5 +1,5 @@
 import { Colors } from '../../../../../foundations';
-import { useSwitchContext } from '../../switch-context';
+import { useSwitchContext } from '../../../SwitchContext';
 
 export const useBackgroundColor = (): Colors => {
   const { disabled, checked } = useSwitchContext();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBorderColor.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBorderColor.ts
index 37c270a86e..51ee5d53f5 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBorderColor.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-thumb/hooks/useBorderColor.ts
@@ -1,5 +1,5 @@
 import { Colors } from '../../../../../foundations';
-import { useSwitchContext } from '../../switch-context';
+import { useSwitchContext } from '../../../SwitchContext';
 
 export const useBorderColor = (): Colors => {
   const { disabled } = useSwitchContext();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-trigger/SwitchTrigger.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-trigger/SwitchTrigger.tsx
index cbef07c6ff..a14883e4f6 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-trigger/SwitchTrigger.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/components/switch-trigger/SwitchTrigger.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { colors } from '../../../../foundations';
-import { useSwitchContext } from '../switch-context';
+import { useSwitchContext } from '../../';
 
 export type SwitchTriggerProps = React.ComponentPropsWithRef<'button'>;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/index.ts
index 1b19c1d39c..48400ce7ec 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/switch/index.ts
@@ -1 +1,2 @@
 export * from './Switch';
+export * from './SwitchContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextField.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextField.tsx
index 0f79deff75..2e531a7766 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextField.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextField.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { FlexColumn } from '../flex-column';
-import { TextFieldInput, TextFieldLabel, TextFieldProvider } from './components';
+import { TextFieldInput, TextFieldLabel } from './components';
+import { TextFieldProvider } from './TextFieldContext';
 
 export type TextFieldProps = React.PropsWithChildren<{
   invalid?: boolean;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-context/TextFieldContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextFieldContext.tsx
index abd9a8147e..aa58c69b34 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-context/TextFieldContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/TextFieldContext.tsx
@@ -1,6 +1,6 @@
 import { createContext, ReactNode, useContext } from 'react';
 
-import { TextFieldProps } from '../../TextField';
+import { TextFieldProps } from './TextField';
 
 type TextFieldContextType = TextFieldProps & {
   labelId: string;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/index.ts
index dd393f2b40..411fe35816 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/index.ts
@@ -1,3 +1,2 @@
-export * from './text-field-context';
 export * from './text-field-input';
 export * from './text-field-label';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-context/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-context/index.ts
deleted file mode 100644
index f3ee72b76e..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-context/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './TextFieldContext';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-input/TextFieldInput.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-input/TextFieldInput.tsx
index 10cbbb5adb..e2e15bb541 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-input/TextFieldInput.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-input/TextFieldInput.tsx
@@ -1,7 +1,7 @@
 import styled, { css } from 'styled-components';
 
 import { colors, Radius, spacings } from '../../../../foundations';
-import { useTextFieldContext } from '../text-field-context/TextFieldContext';
+import { useTextFieldContext } from '../../';
 
 export type TextFieldInputProps = React.ComponentPropsWithRef<'input'>;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-label/TextFieldLabel.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-label/TextFieldLabel.tsx
index 26ff388db0..dad212cf43 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-label/TextFieldLabel.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/components/text-field-label/TextFieldLabel.tsx
@@ -1,5 +1,5 @@
 import { Text, TextProps } from '../../../typography';
-import { useTextFieldContext } from '../text-field-context';
+import { useTextFieldContext } from '../../';
 
 export type TextFieldLabelProps = TextProps;
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/index.ts
index e9364df1c1..a1efba7306 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/text-field/index.ts
@@ -1,2 +1,3 @@
 export * from './TextField';
+export * from './TextFieldContext';
 export * from './hooks';