3 files changed, 31 insertions, 22 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
index 492199c76f..16fa8bcbda 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
@@ -2,8 +2,8 @@ import { useCallback, useRef } from 'react';
 import { Route, Switch } from 'react-router';
 
 import { RoutePath } from '../../shared/routes';
-import LoginPage from '../components/Login';
 import SelectLocation from '../components/select-location/SelectLocationContainer';
+import LoginPage from '../components/views/login/Login';
 import { useViewTransitions } from '../lib/transition-hooks';
 import Account from './Account';
 import ApiAccessMethods from './ApiAccessMethods';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Login.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/Login.tsx
index 8662c669f9..4446ae96ff 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/Login.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/Login.tsx
@@ -2,22 +2,31 @@ import React, { useCallback } from 'react';
 import { sprintf } from 'sprintf-js';
 import styled from 'styled-components';
 
-import { Url } from '../../shared/constants';
-import { AccountDataError, AccountNumber } from '../../shared/daemon-rpc-types';
-import { messages } from '../../shared/gettext';
-import { useAppContext } from '../context';
-import { formatAccountNumber } from '../lib/account';
-import useActions from '../lib/actionsHook';
-import { Box, Button, Flex, Icon, Label, LabelTiny, Spinner, TitleMedium } from '../lib/components';
-import { colors } from '../lib/foundations';
-import { formatHtml } from '../lib/html-formatter';
-import { IconBadge } from '../lib/icon-badge';
-import accountActions from '../redux/account/actions';
-import { LoginState } from '../redux/account/reducers';
-import { useSelector } from '../redux/store';
-import Accordion from './Accordion';
-import { AppMainHeader } from './app-main-header';
-import { Container, Layout } from './Layout';
+import { Url } from '../../../../shared/constants';
+import { AccountDataError, AccountNumber } from '../../../../shared/daemon-rpc-types';
+import { messages } from '../../../../shared/gettext';
+import { useAppContext } from '../../../context';
+import { formatAccountNumber } from '../../../lib/account';
+import useActions from '../../../lib/actionsHook';
+import {
+  Box,
+  Button,
+  Flex,
+  Icon,
+  Label,
+  LabelTiny,
+  Spinner,
+  TitleMedium,
+} from '../../../lib/components';
+import { colors } from '../../../lib/foundations';
+import { formatHtml } from '../../../lib/html-formatter';
+import { IconBadge } from '../../../lib/icon-badge';
+import accountActions from '../../../redux/account/actions';
+import { LoginState } from '../../../redux/account/reducers';
+import { useSelector } from '../../../redux/store';
+import Accordion from '../../Accordion';
+import { AppMainHeader } from '../../app-main-header';
+import { Container, Layout } from '../../Layout';
 import {
   StyledAccountDropdownContainer,
   StyledAccountDropdownItem,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginStyles.tsx
index 68824f564c..54bdeab8b4 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/login/LoginStyles.tsx
@@ -1,10 +1,10 @@
 import styled from 'styled-components';
 
-import { Icon } from '../lib/components';
-import { colors, spacings } from '../lib/foundations';
-import { hugeText, largeText, measurements, smallText, tinyText } from './common-styles';
-import FormattableTextInput from './FormattableTextInput';
-import { Footer } from './Layout';
+import { Icon } from '../../../lib/components';
+import { colors, spacings } from '../../../lib/foundations';
+import { hugeText, largeText, measurements, smallText, tinyText } from '../../common-styles';
+import FormattableTextInput from '../../FormattableTextInput';
+import { Footer } from '../../Layout';
 
 export const StyledAccountDropdownContainer = styled.ul({
   display: 'flex',