diff --git a/__tests__/pages/Organizations/index.test.jsx b/__tests__/pages/Organizations/Organizations.test.jsx
similarity index 88%
rename from __tests__/pages/Organizations/index.test.jsx
rename to __tests__/pages/Organizations/Organizations.test.jsx
index 293769f4fa..3f288050cd 100644
--- a/__tests__/pages/Organizations/index.test.jsx
+++ b/__tests__/pages/Organizations/Organizations.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@lingui/react';
-import Organizations from '../../../src/pages/Organizations/index';
+import Organizations from '../../../src/pages/Organizations/Organizations';
 
 describe('<Organizations />', () => {
   test('initially renders succesfully', () => {
diff --git a/__tests__/pages/Organizations/views/Organization.view.test.jsx b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
similarity index 82%
rename from __tests__/pages/Organizations/views/Organization.view.test.jsx
rename to __tests__/pages/Organizations/screens/Organization/Organization.test.jsx
index 9e388cb83c..ac147e2631 100644
--- a/__tests__/pages/Organizations/views/Organization.view.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
@@ -2,14 +2,14 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
-import OrganizationView from '../../../../src/pages/Organizations/views/Organization.view';
+import Organization from '../../../../../src/pages/Organizations/screens/Organization/Organization';
 
 describe('<OrganizationView />', () => {
   test('initially renders succesfully', () => {
     mount(
       <I18nProvider>
         <MemoryRouter initialEntries={['/organizations/1']} initialIndex={0}>
-          <OrganizationView
+          <Organization
             match={{ path: '/organizations/:id', url: '/organizations/1' }}
             location={{ search: '', pathname: '/organizations/1' }}
           />
diff --git a/__tests__/pages/Organizations/components/OrganizationDetail.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx
similarity index 84%
rename from __tests__/pages/Organizations/components/OrganizationDetail.test.jsx
rename to __tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx
index a683582af0..aaaa7adde4 100644
--- a/__tests__/pages/Organizations/components/OrganizationDetail.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/OrganizationDetail.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
-import OrganizationDetail from '../../../../src/pages/Organizations/components/OrganizationDetail';
+import OrganizationDetail from '../../../../../src/pages/Organizations/screens/Organization/OrganizationDetail';
 
 describe('<OrganizationDetail />', () => {
   test('initially renders succesfully', () => {
diff --git a/__tests__/pages/Organizations/components/OrganizationEdit.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
similarity index 81%
rename from __tests__/pages/Organizations/components/OrganizationEdit.test.jsx
rename to __tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
index 6a99eb2d84..6bcb5c6b37 100644
--- a/__tests__/pages/Organizations/components/OrganizationEdit.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
-import OrganizationEdit from '../../../../src/pages/Organizations/components/OrganizationEdit';
+import OrganizationEdit from '../../../../../src/pages/Organizations/screens/Organization/OrganizationEdit';
 
 describe('<OrganizationEdit />', () => {
   test('initially renders succesfully', () => {
diff --git a/__tests__/pages/Organizations/views/Organization.add.test.jsx b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
similarity index 96%
rename from __tests__/pages/Organizations/views/Organization.add.test.jsx
rename to __tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
index 30990942a4..577ce56441 100644
--- a/__tests__/pages/Organizations/views/Organization.add.test.jsx
+++ b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
@@ -17,7 +17,7 @@ const getAppWithConfigContext = (context = {
   });
 
   // Return the updated OrganizationAdd module with mocked context
-  return require('../../../../src/pages/Organizations/views/Organization.add').default;
+  return require('../../../../src/pages/Organizations/screens/OrganizationAdd').default;
 };
 
 beforeEach(() => {
diff --git a/__tests__/pages/Organizations/views/Organizations.list.test.jsx b/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx
similarity index 95%
rename from __tests__/pages/Organizations/views/Organizations.list.test.jsx
rename to __tests__/pages/Organizations/screens/OrganizationsList.test.jsx
index 79b01ff8fb..6b7f49646d 100644
--- a/__tests__/pages/Organizations/views/Organizations.list.test.jsx
+++ b/__tests__/pages/Organizations/screens/OrganizationsList.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
-import OrganizationsList from '../../../../src/pages/Organizations/views/Organizations.list';
+import OrganizationsList from '../../../../src/pages/Organizations/screens/OrganizationsList';
 
 describe('<OrganizationsList />', () => {
   test('initially renders succesfully', () => {
diff --git a/src/index.jsx b/src/index.jsx
index dfd6b421d9..fb867c361e 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -34,7 +34,7 @@ import Jobs from './pages/Jobs';
 import Login from './pages/Login';
 import ManagementJobs from './pages/ManagementJobs';
 import NotificationTemplates from './pages/NotificationTemplates';
-import Organizations from './pages/Organizations';
+import Organizations from './pages/Organizations/Organizations';
 import Portal from './pages/Portal';
 import Projects from './pages/Projects';
 import Schedules from './pages/Schedules';
diff --git a/src/pages/Organizations/index.jsx b/src/pages/Organizations/Organizations.jsx
similarity index 72%
rename from src/pages/Organizations/index.jsx
rename to src/pages/Organizations/Organizations.jsx
index b3a13a0161..97ff6ad83f 100644
--- a/src/pages/Organizations/index.jsx
+++ b/src/pages/Organizations/Organizations.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
-import OrganizationAdd from './views/Organization.add';
-import OrganizationView from './views/Organization.view';
-import OrganizationsList from './views/Organizations.list';
+import OrganizationsList from './screens/OrganizationsList';
+import OrganizationAdd from './screens/OrganizationAdd'
+import Organization from './screens/Organization/Organization';
 
 export default ({ api, match }) => (
   <Switch>
@@ -18,7 +18,7 @@ export default ({ api, match }) => (
     <Route
       path={`${match.path}/:id`}
       render={() => (
-        <OrganizationView
+        <Organization
           api={api}
         />
       )}
diff --git a/src/pages/Organizations/components/OrganizationEdit.jsx b/src/pages/Organizations/components/OrganizationEdit.jsx
deleted file mode 100644
index 3f56c95431..0000000000
--- a/src/pages/Organizations/components/OrganizationEdit.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import { Trans } from '@lingui/macro';
-import {
-  Card,
-  CardBody,
-  PageSection,
-  PageSectionVariants
-} from '@patternfly/react-core';
-import {
-  Link
-} from 'react-router-dom';
-
-const OrganizationEdit = ({ match, parentBreadcrumbObj, organization }) => {
-  const { medium } = PageSectionVariants;
-
-  return (
-    <PageSection variant={medium}>
-      <Card className="at-c-orgPane">
-        <CardBody>
-          <Trans>edit view   </Trans>
-          <Link to={{ pathname: `/organizations/${match.params.id}`, state: { breadcrumb: parentBreadcrumbObj, organization } }}>
-            <Trans>save/cancel and go back to view</Trans>
-          </Link>
-        </CardBody>
-      </Card>
-    </PageSection>
-  );
-};
-
-export default OrganizationEdit;
diff --git a/src/pages/Organizations/views/Organization.view.jsx b/src/pages/Organizations/screens/Organization/Organization.jsx
similarity index 62%
rename from src/pages/Organizations/views/Organization.view.jsx
rename to src/pages/Organizations/screens/Organization/Organization.jsx
index 608e064662..f1415e3ebc 100644
--- a/src/pages/Organizations/views/Organization.view.jsx
+++ b/src/pages/Organizations/screens/Organization/Organization.jsx
@@ -5,11 +5,15 @@ import {
   Route,
   withRouter,
 } from 'react-router-dom';
-import OrganizationBreadcrumb from '../components/OrganizationBreadcrumb';
-import OrganizationDetail from '../components/OrganizationDetail';
-import OrganizationEdit from '../components/OrganizationEdit';
+import {
+  PageSection
+} from '@patternfly/react-core';
 
-class OrganizationView extends Component {
+import OrganizationBreadcrumb from '../../components/OrganizationBreadcrumb';
+import OrganizationDetail from './OrganizationDetail';
+import OrganizationEdit from './OrganizationEdit';
+
+class Organization extends Component {
   constructor (props) {
     super(props);
 
@@ -84,39 +88,41 @@ class OrganizationView extends Component {
           location={location}
           organization={organization}
         />
-        <Switch>
-          <Route
-            path={`${match.path}/edit`}
-            component={() => (
-              <OrganizationEdit
-                location={location}
-                match={match}
-                parentBreadcrumbObj={parentBreadcrumbObj}
-                organization={organization}
-                params={params}
-                currentTab={currentTab}
-              />
-            )}
-          />
-          <Route
-            path={`${match.path}`}
-            component={() => (
-              <OrganizationDetail
-                location={location}
-                match={match}
-                parentBreadcrumbObj={parentBreadcrumbObj}
-                organization={organization}
-                params={params}
-                currentTab={currentTab}
-              />
-            )}
-          />
-        </Switch>
-        {error ? 'error!' : ''}
-        {loading ? 'loading...' : ''}
+        <PageSection>
+          <Switch>
+            <Route
+              path={`${match.path}/edit`}
+              component={() => (
+                <OrganizationEdit
+                  location={location}
+                  match={match}
+                  parentBreadcrumbObj={parentBreadcrumbObj}
+                  organization={organization}
+                  params={params}
+                  currentTab={currentTab}
+                />
+              )}
+            />
+            <Route
+              path={`${match.path}`}
+              component={() => (
+                <OrganizationDetail
+                  location={location}
+                  match={match}
+                  parentBreadcrumbObj={parentBreadcrumbObj}
+                  organization={organization}
+                  params={params}
+                  currentTab={currentTab}
+                />
+              )}
+            />
+          </Switch>
+          {error ? 'error!' : ''}
+          {loading ? 'loading...' : ''}
+        </PageSection>
       </Fragment>
     );
   }
 }
 
-export default withRouter(OrganizationView);
+export default withRouter(Organization);
diff --git a/src/pages/Organizations/components/OrganizationDetail.jsx b/src/pages/Organizations/screens/Organization/OrganizationDetail.jsx
similarity index 54%
rename from src/pages/Organizations/components/OrganizationDetail.jsx
rename to src/pages/Organizations/screens/Organization/OrganizationDetail.jsx
index b76bc40e2e..e9e230132b 100644
--- a/src/pages/Organizations/components/OrganizationDetail.jsx
+++ b/src/pages/Organizations/screens/Organization/OrganizationDetail.jsx
@@ -5,8 +5,6 @@ import {
   Card,
   CardHeader,
   CardBody,
-  PageSection,
-  PageSectionVariants
 } from '@patternfly/react-core';
 import {
   Switch,
@@ -14,9 +12,9 @@ import {
   Route
 } from 'react-router-dom';
 
-import Tab from '../../../components/Tabs/Tab';
-import Tabs from '../../../components/Tabs/Tabs';
-import getTabName from '../utils';
+import Tab from '../../../../components/Tabs/Tab';
+import Tabs from '../../../../components/Tabs/Tabs';
+import getTabName from '../../utils';
 
 
 const OrganizationDetail = ({
@@ -28,7 +26,6 @@ const OrganizationDetail = ({
   currentTab
 }) => {
   // TODO: set objectName by param or through grabbing org detail get from api
-  const { medium } = PageSectionVariants;
   const tabList=['details', 'access', 'teams', 'notifications'];
 
   const deleteResourceView = () => (
@@ -64,46 +61,44 @@ const OrganizationDetail = ({
 
 
   return (
-    <PageSection variant={medium}>
-      <Card className="at-c-orgPane">
-        <CardHeader>
-          <I18n>
-            {({ i18n }) => (
-              <Tabs labelText={i18n._(t`Organization detail tabs`)}>
-                {tabList.map(tab => (
-                  <Tab
-                    key={tab}
-                    tab={tab}
-                    location={location}
-                    match={match}
-                    currentTab={currentTab}
-                    breadcrumb={parentBreadcrumbObj}
-                  >
-                    <Trans>{getTabName(tab)}</Trans>
-                  </Tab>
-                ))}
-              </Tabs>
-            )}
-          </I18n>
-        </CardHeader>
-        <CardBody>
-          {(currentTab && currentTab !== 'details') ? (
-            <Switch>
-              <Route path={`${match.path}/delete-resources`} component={() => deleteResourceView()} />
-              <Route path={`${match.path}/add-resource`} component={() => addResourceView()} />
-              <Route path={`${match.path}`} component={() => resourceView()} />
-            </Switch>
-          ) : (
-            <Fragment>
-              {'detail view  '}
-              <Link to={{ pathname: `${match.url}/edit`, state: { breadcrumb: parentBreadcrumbObj, organization } }}>
-                {'edit'}
-              </Link>
-            </Fragment>
+    <Card className="at-c-orgPane">
+      <CardHeader>
+        <I18n>
+          {({ i18n }) => (
+            <Tabs labelText={i18n._(t`Organization detail tabs`)}>
+              {tabList.map(tab => (
+                <Tab
+                  key={tab}
+                  tab={tab}
+                  location={location}
+                  match={match}
+                  currentTab={currentTab}
+                  breadcrumb={parentBreadcrumbObj}
+                >
+                  <Trans>{getTabName(tab)}</Trans>
+                </Tab>
+              ))}
+            </Tabs>
           )}
-        </CardBody>
-      </Card>
-    </PageSection>
+        </I18n>
+      </CardHeader>
+      <CardBody>
+        {(currentTab && currentTab !== 'details') ? (
+          <Switch>
+            <Route path={`${match.path}/delete-resources`} component={() => deleteResourceView()} />
+            <Route path={`${match.path}/add-resource`} component={() => addResourceView()} />
+            <Route path={`${match.path}`} component={() => resourceView()} />
+          </Switch>
+        ) : (
+          <Fragment>
+            {'detail view  '}
+            <Link to={{ pathname: `${match.url}/edit`, state: { breadcrumb: parentBreadcrumbObj, organization } }}>
+              {'edit'}
+            </Link>
+          </Fragment>
+        )}
+      </CardBody>
+    </Card>
   );
 };
 
diff --git a/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
new file mode 100644
index 0000000000..13e5208bd6
--- /dev/null
+++ b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Trans } from '@lingui/macro';
+import {
+  Card,
+  CardBody
+} from '@patternfly/react-core';
+import {
+  Link
+} from 'react-router-dom';
+
+const OrganizationEdit = ({ match, parentBreadcrumbObj, organization }) => {
+
+  return (
+    <Card className="at-c-orgPane">
+      <CardBody>
+        <Trans>edit view   </Trans>
+        <Link to={{ pathname: `/organizations/${match.params.id}`, state: { breadcrumb: parentBreadcrumbObj, organization } }}>
+          <Trans>save/cancel and go back to view</Trans>
+        </Link>
+      </CardBody>
+    </Card>
+  );
+};
+
+export default OrganizationEdit;
diff --git a/src/pages/Organizations/views/Organization.add.jsx b/src/pages/Organizations/screens/OrganizationAdd.jsx
similarity index 100%
rename from src/pages/Organizations/views/Organization.add.jsx
rename to src/pages/Organizations/screens/OrganizationAdd.jsx
diff --git a/src/pages/Organizations/views/Organizations.list.jsx b/src/pages/Organizations/screens/OrganizationsList.jsx
similarity index 98%
rename from src/pages/Organizations/views/Organizations.list.jsx
rename to src/pages/Organizations/screens/OrganizationsList.jsx
index 5784f7f3b8..0ff60fcaf1 100644
--- a/src/pages/Organizations/views/Organizations.list.jsx
+++ b/src/pages/Organizations/screens/OrganizationsList.jsx
@@ -22,7 +22,7 @@ import {
   parseQueryString,
 } from '../../../qs';
 
-class Organizations extends Component {
+class OrganizationsList extends Component {
   columns = [
     { name: i18nMark('Name'), key: 'name', isSortable: true },
     { name: i18nMark('Modified'), key: 'modified', isSortable: true, isNumeric: true },
@@ -248,4 +248,4 @@ class Organizations extends Component {
   }
 }
 
-export default withRouter(Organizations);
+export default withRouter(OrganizationsList);