diff --git a/src/components/auth/login/LoginAnimatedScene/index.tsx b/src/containers/dialogs/LoginDialog/components/LoginAnimatedScene/index.tsx
similarity index 100%
rename from src/components/auth/login/LoginAnimatedScene/index.tsx
rename to src/containers/dialogs/LoginDialog/components/LoginAnimatedScene/index.tsx
diff --git a/src/components/auth/login/LoginAnimatedScene/styles.module.scss b/src/containers/dialogs/LoginDialog/components/LoginAnimatedScene/styles.module.scss
similarity index 100%
rename from src/components/auth/login/LoginAnimatedScene/styles.module.scss
rename to src/containers/dialogs/LoginDialog/components/LoginAnimatedScene/styles.module.scss
diff --git a/src/components/auth/login/LoginDialogButtons/index.tsx b/src/containers/dialogs/LoginDialog/components/LoginDialogButtons/index.tsx
similarity index 100%
rename from src/components/auth/login/LoginDialogButtons/index.tsx
rename to src/containers/dialogs/LoginDialog/components/LoginDialogButtons/index.tsx
diff --git a/src/components/auth/login/LoginDialogButtons/styles.module.scss b/src/containers/dialogs/LoginDialog/components/LoginDialogButtons/styles.module.scss
similarity index 100%
rename from src/components/auth/login/LoginDialogButtons/styles.module.scss
rename to src/containers/dialogs/LoginDialog/components/LoginDialogButtons/styles.module.scss
diff --git a/src/components/auth/oauth/LoginSocialRegisterButtons/index.tsx b/src/containers/dialogs/LoginDialog/components/LoginSocialRegisterButtons/index.tsx
similarity index 100%
rename from src/components/auth/oauth/LoginSocialRegisterButtons/index.tsx
rename to src/containers/dialogs/LoginDialog/components/LoginSocialRegisterButtons/index.tsx
diff --git a/src/components/auth/oauth/LoginSocialRegisterButtons/styles.module.scss b/src/containers/dialogs/LoginDialog/components/LoginSocialRegisterButtons/styles.module.scss
similarity index 100%
rename from src/components/auth/oauth/LoginSocialRegisterButtons/styles.module.scss
rename to src/containers/dialogs/LoginDialog/components/LoginSocialRegisterButtons/styles.module.scss
diff --git a/src/components/auth/login/LoginStaticScene/index.tsx b/src/containers/dialogs/LoginDialog/components/LoginStaticScene/index.tsx
similarity index 100%
rename from src/components/auth/login/LoginStaticScene/index.tsx
rename to src/containers/dialogs/LoginDialog/components/LoginStaticScene/index.tsx
diff --git a/src/components/auth/login/LoginStaticScene/styles.module.scss b/src/containers/dialogs/LoginDialog/components/LoginStaticScene/styles.module.scss
similarity index 100%
rename from src/components/auth/login/LoginStaticScene/styles.module.scss
rename to src/containers/dialogs/LoginDialog/components/LoginStaticScene/styles.module.scss
diff --git a/src/components/auth/oauth/TelegramLoginForm/index.tsx b/src/containers/dialogs/LoginDialog/components/TelegramLoginForm/index.tsx
similarity index 100%
rename from src/components/auth/oauth/TelegramLoginForm/index.tsx
rename to src/containers/dialogs/LoginDialog/components/TelegramLoginForm/index.tsx
diff --git a/src/components/auth/oauth/TelegramLoginForm/styles.module.scss b/src/containers/dialogs/LoginDialog/components/TelegramLoginForm/styles.module.scss
similarity index 100%
rename from src/components/auth/oauth/TelegramLoginForm/styles.module.scss
rename to src/containers/dialogs/LoginDialog/components/TelegramLoginForm/styles.module.scss
diff --git a/src/containers/dialogs/LoginDialog/index.tsx b/src/containers/dialogs/LoginDialog/index.tsx
index 8abe8bad..a930009d 100644
--- a/src/containers/dialogs/LoginDialog/index.tsx
+++ b/src/containers/dialogs/LoginDialog/index.tsx
@@ -1,7 +1,5 @@
 import { FC, useCallback, useRef } from 'react';
 
-import { LoginDialogButtons } from '~/components/auth/login/LoginDialogButtons';
-import { LoginStaticScene } from '~/components/auth/login/LoginStaticScene';
 import { Group } from '~/components/containers/Group';
 import { Padder } from '~/components/containers/Padder';
 import { BetterScrollDialog } from '~/components/dialogs/BetterScrollDialog';
@@ -9,6 +7,8 @@ import { DialogTitle } from '~/components/dialogs/DialogTitle';
 import { Button } from '~/components/input/Button';
 import { InputText } from '~/components/input/InputText';
 import { Dialog } from '~/constants/modal';
+import { LoginDialogButtons } from '~/containers/dialogs/LoginDialog/components/LoginDialogButtons';
+import { LoginStaticScene } from '~/containers/dialogs/LoginDialog/components/LoginStaticScene';
 import { useCloseOnEscape } from '~/hooks';
 import { useAuth } from '~/hooks/auth/useAuth';
 import { useLoginForm } from '~/hooks/auth/useLoginForm';
diff --git a/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx b/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx
index bedc5cc3..7cab611b 100644
--- a/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx
+++ b/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx
@@ -1,7 +1,6 @@
 import React, { FC, useCallback, useState } from 'react';
 
 import { apiLoginWithSocial } from '~/api/auth';
-import { LoginSocialRegisterButtons } from '~/components/auth/oauth/LoginSocialRegisterButtons';
 import { Group } from '~/components/containers/Group';
 import { Padder } from '~/components/containers/Padder';
 import { BetterScrollDialog } from '~/components/dialogs/BetterScrollDialog';
@@ -9,6 +8,7 @@ import { DialogTitle } from '~/components/dialogs/DialogTitle';
 import { InputText } from '~/components/input/InputText';
 import { Toggle } from '~/components/input/Toggle';
 import { getRandomPhrase } from '~/constants/phrases';
+import { LoginSocialRegisterButtons } from '~/containers/dialogs/LoginDialog/components/LoginSocialRegisterButtons';
 import { useCloseOnEscape } from '~/hooks';
 import { useSocialRegisterForm } from '~/hooks/auth/useSocialRegisterForm';
 import { useModal } from '~/hooks/modal/useModal';
@@ -35,13 +35,13 @@ const LoginSocialRegisterDialog: FC<LoginSocialRegisterDialogProps> = ({
       auth.setToken(loginToken);
       hideModal();
     },
-    [auth, hideModal]
+    [auth, hideModal],
   );
 
   const { values, errors, handleChange, handleSubmit } = useSocialRegisterForm(
     token,
     apiLoginWithSocial,
-    onSuccess
+    onSuccess,
   );
 
   return (
@@ -73,12 +73,20 @@ const LoginSocialRegisterDialog: FC<LoginSocialRegisterDialogProps> = ({
                 autoComplete="new-password"
               />
 
-              <div className={styles.check} onClick={() => setIsDryingPants(!isDryingPants)}>
+              <div
+                className={styles.check}
+                onClick={() => setIsDryingPants(!isDryingPants)}
+              >
                 <Toggle value={isDryingPants} color="primary" />
-                <span>Это не мои штаны сушатся на радиаторе в третьей лаборатории</span>
+                <span>
+                  Это не мои штаны сушатся на радиаторе в третьей лаборатории
+                </span>
               </div>
 
-              <div className={styles.check} onClick={() => setIsDryingPants(!isDryingPants)}>
+              <div
+                className={styles.check}
+                onClick={() => setIsDryingPants(!isDryingPants)}
+              >
                 <Toggle value={!isDryingPants} color="primary" />
                 <span>{phrase}</span>
               </div>
diff --git a/src/components/auth/restore/RestoreInvalidCode/index.tsx b/src/containers/dialogs/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx
similarity index 100%
rename from src/components/auth/restore/RestoreInvalidCode/index.tsx
rename to src/containers/dialogs/RestorePasswordDialog/components/RestoreInvalidCode/index.tsx
diff --git a/src/components/auth/restore/RestoreInvalidCode/styles.module.scss b/src/containers/dialogs/RestorePasswordDialog/components/RestoreInvalidCode/styles.module.scss
similarity index 100%
rename from src/components/auth/restore/RestoreInvalidCode/styles.module.scss
rename to src/containers/dialogs/RestorePasswordDialog/components/RestoreInvalidCode/styles.module.scss
diff --git a/src/components/auth/restore/RestoreSuccess/index.tsx b/src/containers/dialogs/RestorePasswordDialog/components/RestoreSuccess/index.tsx
similarity index 100%
rename from src/components/auth/restore/RestoreSuccess/index.tsx
rename to src/containers/dialogs/RestorePasswordDialog/components/RestoreSuccess/index.tsx
diff --git a/src/components/auth/restore/RestoreSent/styles.module.scss b/src/containers/dialogs/RestorePasswordDialog/components/RestoreSuccess/styles.module.scss
similarity index 100%
rename from src/components/auth/restore/RestoreSent/styles.module.scss
rename to src/containers/dialogs/RestorePasswordDialog/components/RestoreSuccess/styles.module.scss
diff --git a/src/containers/dialogs/RestorePasswordDialog/index.tsx b/src/containers/dialogs/RestorePasswordDialog/index.tsx
index d1ba1c61..07e89961 100644
--- a/src/containers/dialogs/RestorePasswordDialog/index.tsx
+++ b/src/containers/dialogs/RestorePasswordDialog/index.tsx
@@ -1,8 +1,6 @@
 import React, { FC, useCallback, useMemo, useState } from 'react';
 
 import { apiRestoreCode } from '~/api/auth';
-import { RestoreInvalidCode } from '~/components/auth/restore/RestoreInvalidCode';
-import { RestoreSuccess } from '~/components/auth/restore/RestoreSuccess';
 import { Group } from '~/components/containers/Group';
 import { Button } from '~/components/input/Button';
 import { InputText } from '~/components/input/InputText';
@@ -13,13 +11,18 @@ import { DialogComponentProps } from '~/types/modal';
 
 import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog';
 
+import { RestoreInvalidCode } from './components/RestoreInvalidCode';
+import { RestoreSuccess } from './components/RestoreSuccess';
 import styles from './styles.module.scss';
 
 type RestorePasswordDialogProps = DialogComponentProps & {
   code: string;
 };
 
-const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({ onRequestClose, code }) => {
+const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({
+  onRequestClose,
+  code,
+}) => {
   useCloseOnEscape(onRequestClose);
 
   const { codeUser, isLoading, error } = useRestoreCode(code);
@@ -30,7 +33,7 @@ const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({ onRequestClose,
   const { handleChange, handleSubmit, values, errors } = useRestorePasswordForm(
     code,
     apiRestoreCode,
-    onSent
+    onSent,
   );
 
   const buttons = useMemo(
@@ -39,12 +42,17 @@ const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({ onRequestClose,
         <Button color="primary">Восстановить</Button>
       </Group>
     ),
-    []
+    [],
   );
 
   const overlay = useMemo(() => {
     if (isSent) {
-      return <RestoreSuccess username={codeUser?.username} onClick={onRequestClose} />;
+      return (
+        <RestoreSuccess
+          username={codeUser?.username}
+          onClick={onRequestClose}
+        />
+      );
     }
 
     if (error) {
@@ -67,7 +75,9 @@ const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({ onRequestClose,
       >
         <div className={styles.wrap}>
           <Group>
-            <div className={styles.header}>Пришло время сменить пароль, {codeUser?.username}</div>
+            <div className={styles.header}>
+              Пришло время сменить пароль, {codeUser?.username}
+            </div>
 
             <InputText
               title="Новый пароль"
@@ -89,8 +99,8 @@ const RestorePasswordDialog: FC<RestorePasswordDialogProps> = ({ onRequestClose,
             <Group className={styles.text}>
               <p>Новый пароль должен быть не короче 6 символов.</p>
               <p>
-                Вряд ли кто-нибудь будет пытаться нас взломать, но сложный пароль всегда лучше
-                простого.
+                Вряд ли кто-нибудь будет пытаться нас взломать, но сложный
+                пароль всегда лучше простого.
               </p>
             </Group>
           </Group>
diff --git a/src/components/auth/restore/RestoreSent/index.tsx b/src/containers/dialogs/RestoreRequestDialog/components/RestoreSent/index.tsx
similarity index 100%
rename from src/components/auth/restore/RestoreSent/index.tsx
rename to src/containers/dialogs/RestoreRequestDialog/components/RestoreSent/index.tsx
diff --git a/src/components/auth/restore/RestoreSuccess/styles.module.scss b/src/containers/dialogs/RestoreRequestDialog/components/RestoreSent/styles.module.scss
similarity index 100%
rename from src/components/auth/restore/RestoreSuccess/styles.module.scss
rename to src/containers/dialogs/RestoreRequestDialog/components/RestoreSent/styles.module.scss
diff --git a/src/containers/dialogs/RestoreRequestDialog/index.tsx b/src/containers/dialogs/RestoreRequestDialog/index.tsx
index 6df79950..76ab4db4 100644
--- a/src/containers/dialogs/RestoreRequestDialog/index.tsx
+++ b/src/containers/dialogs/RestoreRequestDialog/index.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useMemo, useState, VFC } from 'react';
 
 import { apiRequestRestoreCode } from '~/api/auth';
-import { RestoreSent } from '~/components/auth/restore/RestoreSent';
 import { Group } from '~/components/containers/Group';
 import { Button } from '~/components/input/Button';
 import { InputText } from '~/components/input/InputText';
@@ -11,6 +10,7 @@ import { DialogComponentProps } from '~/types/modal';
 
 import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog';
 
+import { RestoreSent } from './components/RestoreSent';
 import styles from './styles.module.scss';
 
 interface RestoreRequestDialogProps extends DialogComponentProps {}
diff --git a/src/containers/dialogs/TelegramAttachDialog/index.tsx b/src/containers/dialogs/TelegramAttachDialog/index.tsx
index a7283d0a..0df8fd82 100644
--- a/src/containers/dialogs/TelegramAttachDialog/index.tsx
+++ b/src/containers/dialogs/TelegramAttachDialog/index.tsx
@@ -7,8 +7,8 @@ import { Button } from '~/components/input/Button';
 import { useTelegramAccount } from '~/hooks/auth/useTelegramAccount';
 import { DialogComponentProps } from '~/types/modal';
 
-import { TelegramLoginForm } from '../../../components/auth/oauth/TelegramLoginForm/index';
 import { BetterScrollDialog } from '../../../components/dialogs/BetterScrollDialog';
+import { TelegramLoginForm } from '../LoginDialog/components/TelegramLoginForm/index';
 
 interface TelegramAttachDialogProps extends DialogComponentProps {}