diff --git a/src/App.tsx b/src/App.tsx
index 801d8e3a0e8309cf87d3a0c5f54c226dc5920831..0bb4729bf1301431012e153cc9fc400a16827097 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,24 +1,19 @@
-import React, { FC, useEffect, useState } from 'react';
+import React, { FC } from 'react';
 import { ThemeProvider } from '@material-ui/core/styles';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-import { AuthUser } from 'components/AuthUser/AuthUser';
-import { LandingPage } from 'components/NonAuthUser/LandingPage/LandingPage';
-import { PrivateRoute } from 'components/PrivateRoute/PrivateRoute';
 import { AuthRoutes, NonAuthRoutes } from 'api/routes';
-import { NotFound } from 'components/NonAuthUser/NotFound/NotFound';
-import { ProfilePage } from 'components/AuthUser/Dashboard/ProfilePage/ProfilePage';
 import { Roles } from 'api/userRoles';
-import { Unauthorized } from 'components/NonAuthUser/Unauthorized/Unauthorized';
-import { HomePage } from 'components/AuthUser/Dashboard/HomePage/HomePage';
-import { AuthContext } from 'components/AuthUser/AuthContext';
 import { configDjangoCookieName } from 'api/configDjangoCookieName';
-import { Dashboard } from 'components/AuthUser/Dashboard/Dashboard';
-import { isAuthenticated } from 'api/isAuthenticated';
 import { muiTheme } from 'App.style';
-import { getRole } from 'api/getRole';
 import { withAuthorization } from 'components/Authorization/Authorization';
 import { useRole } from 'hooks/useRole';
 import { useAuth } from 'hooks/useAuth';
+import { AuthUser } from 'components/Auth/Auth';
+import { AuthContext } from 'components/Auth/AuthContext';
+import { Dashboard } from 'components/Dashboard/Dashboard';
+import { NotFound } from 'components/NotFound/NotFound';
+import { Unauthorized } from 'components/Unauthorized/Unauthorized';
+import { LandingPage } from 'components/LandingPage/LandingPage';
 
 const Personal = withAuthorization(Dashboard);
 
@@ -39,7 +34,6 @@ export const App: FC = () => {
           <Router>
             <Switch>
               <Route exact path={NonAuthRoutes.home} component={LandingPage} />
-
               <Route path={NonAuthRoutes.auth} component={AuthUser} />
               <Route
                 path={AuthRoutes.dashboard}