diff --git a/src/@fuse/core/FuseAuthorization/FuseAuthorization.js b/src/@fuse/core/FuseAuthorization/FuseAuthorization.js
index 6915dde..c4000ee 100644
--- a/src/@fuse/core/FuseAuthorization/FuseAuthorization.js
+++ b/src/@fuse/core/FuseAuthorization/FuseAuthorization.js
@@ -1,5 +1,5 @@
 import FuseUtils from '@fuse/utils';
-import AppContext from 'app/AppContext';
+import AppContext from 'src/app/contexts/AppContext';
 import { Component } from 'react';
 import { matchRoutes } from 'react-router-dom';
 import withRouter from '@fuse/core/withRouter';
@@ -50,6 +50,7 @@ class FuseAuthorization extends Component {
     const { location, userRole } = this.props;
     const { pathname } = location;
     const redirectUrl = loginRedirectUrl || this.defaultLoginRedirectUrl;
+    console.log(location, userRole, redirectUrl);
 
     /*
         User is guest
diff --git a/src/@fuse/core/FuseLayout/FuseLayout.js b/src/@fuse/core/FuseLayout/FuseLayout.js
index febcc93..d5975df 100644
--- a/src/@fuse/core/FuseLayout/FuseLayout.js
+++ b/src/@fuse/core/FuseLayout/FuseLayout.js
@@ -1,6 +1,6 @@
 import { useDeepCompareEffect } from '@fuse/hooks';
 import _ from '@lodash';
-import AppContext from 'app/AppContext';
+import AppContext from 'src/app/contexts/AppContext';
 import {
   generateSettings,
   selectFuseCurrentSettings,
diff --git a/src/app/App.js b/src/app/App.js
index 42d55c4..fcbd9a6 100644
--- a/src/app/App.js
+++ b/src/app/App.js
@@ -14,7 +14,7 @@ import { selectMainTheme } from 'app/store/fuse/settingsSlice';
 import FuseAuthorization from '@fuse/core/FuseAuthorization';
 import settingsConfig from 'app/configs/settingsConfig';
 import withAppProviders from './withAppProviders';
-import { AuthProvider } from './auth/AuthContext';
+import { AuthProvider } from './contexts/AuthContext';
 
 // import axios from 'axios';
 /**
diff --git a/src/app/AppContext.js b/src/app/contexts/AppContext.js
similarity index 100%
rename from src/app/AppContext.js
rename to src/app/contexts/AppContext.js
diff --git a/src/app/theme-layouts/layout1/Layout1.js b/src/app/theme-layouts/layout1/Layout1.js
index a77107b..d0f4a0d 100644
--- a/src/app/theme-layouts/layout1/Layout1.js
+++ b/src/app/theme-layouts/layout1/Layout1.js
@@ -2,7 +2,7 @@ import FuseDialog from '@fuse/core/FuseDialog';
 import FuseMessage from '@fuse/core/FuseMessage';
 import FuseSuspense from '@fuse/core/FuseSuspense';
 import { styled } from '@mui/material/styles';
-import AppContext from 'app/AppContext';
+import AppContext from 'src/app/contexts/AppContext';
 import { selectFuseCurrentLayoutConfig } from 'app/store/fuse/settingsSlice';
 import { memo, useContext } from 'react';
 import { useSelector } from 'react-redux';
diff --git a/src/app/theme-layouts/layout2/Layout2.js b/src/app/theme-layouts/layout2/Layout2.js
index 7c8c4ee..185d68d 100644
--- a/src/app/theme-layouts/layout2/Layout2.js
+++ b/src/app/theme-layouts/layout2/Layout2.js
@@ -1,11 +1,11 @@
 import FuseSuspense from '@fuse/core/FuseSuspense';
-import AppContext from 'app/AppContext';
+import AppContext from 'src/app/contexts/AppContext';
 import { selectFuseCurrentLayoutConfig } from 'app/store/fuse/settingsSlice';
 import i18next from 'i18next';
 import { memo, useContext } from 'react';
 import { useSelector } from 'react-redux';
 import { useRoutes } from 'react-router-dom';
-import { useAuth } from 'src/app/auth/AuthContext';
+import { useAuth } from 'src/app/contexts/AuthContext';
 import FooterLayout2 from './components/FooterLayout2';
 import HeaderLayout2 from './components/HeaderLayout2';
 
diff --git a/src/app/withAppProviders.js b/src/app/withAppProviders.js
index 5403160..9e78793 100644
--- a/src/app/withAppProviders.js
+++ b/src/app/withAppProviders.js
@@ -9,7 +9,7 @@ import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { StyledEngineProvider } from '@mui/material/styles';
 import routes from 'app/configs/routesConfig';
 import store from './store';
-import AppContext from './AppContext';
+import AppContext from './contexts/AppContext';
 
 const withAppProviders = (Component) => (props) => {
   const WrapperComponent = () => (