diff --git a/src/App.tsx b/src/App.tsx
index 702565ad5da9934f00b5f0eaa7ca81fa237c0975..fcee4551d310dcfc39201a1e3b865b0aafa0b482 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,11 +3,11 @@ import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 import { HomePage } from 'components/AuthUser/HomePage/HomePage';
 import { AuthUser } from 'components/AuthUser/AuthUser';
 import { LandingPage } from 'components/NonAuthUser/LandingPage/LandingPage';
-import { PrivateRoute } from 'components/api/PrivateRoute/PrivateRoute';
-import { AuthRoutes, NonAuthRoutes } from 'components/api/routes';
+import { PrivateRoute } from 'api/PrivateRoute/PrivateRoute';
+import { AuthRoutes, NonAuthRoutes } from 'api/routes';
 import { NotFound } from 'components/NonAuthUser/NotFound/NotFound';
-import { ProfilePage } from 'components/ProfilePage/ProfilePage';
-import { Roles } from 'components/api/userRoles';
+import { ProfilePage } from 'components/AuthUser/ProfilePage/ProfilePage';
+import { Roles } from 'api/userRoles';
 import { Unauthorized } from 'components/NonAuthUser/Unauthorized/Unauthorized';
 import axios from 'axios';
 
@@ -30,7 +30,7 @@ export const App: FC = () => {
       return null;
     };
     if (!isCookieFetched) fetchCookie();
-  }, []);
+  }, [isCookieFetched]);
 
   return (
     <Router>
diff --git a/src/components/api/PrivateRoute/PrivateRoute.tsx b/src/api/PrivateRoute/PrivateRoute.tsx
similarity index 96%
rename from src/components/api/PrivateRoute/PrivateRoute.tsx
rename to src/api/PrivateRoute/PrivateRoute.tsx
index e9e431cbf88b9a481bc95016c3729a2f30a0c9e9..95065f08148704ad25986fd8cfd369e73ed5e387 100644
--- a/src/components/api/PrivateRoute/PrivateRoute.tsx
+++ b/src/api/PrivateRoute/PrivateRoute.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 import { Route, Redirect, RouteProps } from 'react-router-dom';
-import { NonAuthRoutes } from 'components/api/routes';
+import { NonAuthRoutes } from 'api/routes';
 
 /**
  * A wrapper for <Route> that redirects to the login screen if you're not yet authenticated.
diff --git a/src/components/api/routes.ts b/src/api/routes.ts
similarity index 100%
rename from src/components/api/routes.ts
rename to src/api/routes.ts
diff --git a/src/components/api/userRoles.ts b/src/api/userRoles.ts
similarity index 100%
rename from src/components/api/userRoles.ts
rename to src/api/userRoles.ts