diff --git a/client/src/components/App.js b/client/src/components/App.js
index bab88a549..6f5f0899a 100644
--- a/client/src/components/App.js
+++ b/client/src/components/App.js
@@ -5,7 +5,7 @@ import { createBrowserHistory } from 'history';
 import { ReactQueryConfigProvider } from 'react-query';
 import { ReactQueryDevtools } from 'react-query-devtools';
 
-import PrivateRoute from 'components/PrivateRoute';
+import PrivateRoute from 'components/Guards/PrivateRoute';
 import Authentication from 'components/Authentication';
 import DashboardPrivatePages from 'components/Dashboard/PrivatePages';
 import GlobalErrors from 'containers/GlobalErrors/GlobalErrors';
diff --git a/client/src/components/Authentication.js b/client/src/components/Authentication.js
index e34d636e6..e029770bd 100644
--- a/client/src/components/Authentication.js
+++ b/client/src/components/Authentication.js
@@ -7,15 +7,10 @@ import { FormattedMessage as T } from 'react-intl';
 import withAuthentication from 'containers/Authentication/withAuthentication';
 import { compose } from 'utils';
 import Icon from 'components/Icon';
-import AuthCopyright from 'containers/Authentication/AuthCopyright';
 
 function PageFade(props) {
   return (
-    <CSSTransition
-      {...props}
-      classNames="authTransition"
-      timeout={500}
-    />
+    <CSSTransition {...props} classNames="authTransition" timeout={500} />
   );
 }
 
diff --git a/client/src/components/Dashboard/Dashboard.js b/client/src/components/Dashboard/Dashboard.js
index dbc19c433..047374735 100644
--- a/client/src/components/Dashboard/Dashboard.js
+++ b/client/src/components/Dashboard/Dashboard.js
@@ -11,7 +11,7 @@ import PreferencesContent from 'components/Preferences/PreferencesContent';
 import PreferencesSidebar from 'components/Preferences/PreferencesSidebar';
 import Search from 'containers/GeneralSearch/Search';
 import DashboardSplitPane from 'components/Dashboard/DashboardSplitePane';
-import EnsureOrganizationIsReady from './EnsureOrganizationIsReady';
+
 
 import withSettingsActions from 'containers/Settings/withSettingsActions';
 
@@ -27,7 +27,7 @@ function Dashboard({
   );
 
   return (
-    <EnsureOrganizationIsReady>
+    
       <DashboardLoadingIndicator isLoading={fetchOptions.isFetching}>
         <Switch>
           <Route path="/preferences">
@@ -49,7 +49,7 @@ function Dashboard({
         <Search />
         <DialogsContainer />
       </DashboardLoadingIndicator>
-    </EnsureOrganizationIsReady>
+    
   );
 }
 
diff --git a/client/src/components/Dashboard/PrivatePages.js b/client/src/components/Dashboard/PrivatePages.js
index b5909647b..6b00bc8e8 100644
--- a/client/src/components/Dashboard/PrivatePages.js
+++ b/client/src/components/Dashboard/PrivatePages.js
@@ -9,6 +9,8 @@ import DashboardLoadingIndicator from 'components/Dashboard/DashboardLoadingIndi
 import withOrganizationActions from 'containers/Organization/withOrganizationActions';
 import withSubscriptionsActions from 'containers/Subscriptions/withSubscriptionsActions';
 
+import EnsureOrganizationIsReady from 'components/Guards/EnsureOrganizationIsReady';
+import EnsureOrganizationIsNotReady from 'components/Guards/EnsureOrganizationIsNotReady';
 import { compose } from 'utils';
 
 /**
@@ -40,11 +42,15 @@ function DashboardPrivatePages({
     }>
       <Switch>
         <Route path={'/setup'}>
-          <SetupWizardPage />
+          <EnsureOrganizationIsNotReady>
+            <SetupWizardPage />
+          </EnsureOrganizationIsNotReady>
         </Route>
 
         <Route path='/'>
-          <Dashboard />
+          <EnsureOrganizationIsReady>
+            <Dashboard />
+          </EnsureOrganizationIsReady>
         </Route>
       </Switch>
     </DashboardLoadingIndicator>
diff --git a/client/src/containers/Setup/EnsureOrganizationIsNotReady.js b/client/src/components/Guards/EnsureOrganizationIsNotReady.js
similarity index 100%
rename from client/src/containers/Setup/EnsureOrganizationIsNotReady.js
rename to client/src/components/Guards/EnsureOrganizationIsNotReady.js
diff --git a/client/src/components/Dashboard/EnsureOrganizationIsReady.js b/client/src/components/Guards/EnsureOrganizationIsReady.js
similarity index 100%
rename from client/src/components/Dashboard/EnsureOrganizationIsReady.js
rename to client/src/components/Guards/EnsureOrganizationIsReady.js
diff --git a/client/src/components/PrivateRoute.js b/client/src/components/Guards/PrivateRoute.js
similarity index 100%
rename from client/src/components/PrivateRoute.js
rename to client/src/components/Guards/PrivateRoute.js
diff --git a/client/src/containers/Setup/WizardSetupPage.js b/client/src/containers/Setup/WizardSetupPage.js
index ba775531b..0a22bffd3 100644
--- a/client/src/containers/Setup/WizardSetupPage.js
+++ b/client/src/containers/Setup/WizardSetupPage.js
@@ -1,17 +1,13 @@
 import React from 'react';
-
-import EnsureOrganizationIsNotReady from './EnsureOrganizationIsNotReady';
 import SetupRightSection from './SetupRightSection';
 import SetupLeftSection from './SetupLeftSection';
 
 
 export default function WizardSetupPage() {
   return (
-    <EnsureOrganizationIsNotReady>
-      <div class="setup-page">
-        <SetupLeftSection />
-        <SetupRightSection />
-      </div>
-    </EnsureOrganizationIsNotReady>
+    <div class="setup-page">
+      <SetupLeftSection />
+      <SetupRightSection />
+    </div>
   );
 };
\ No newline at end of file