diff --git a/frontend/src/pages/Organization/OrgScanHistory.tsx b/frontend/src/pages/Organization/OrgScanHistory.tsx
new file mode 100644
index 00000000..207e9e21
--- /dev/null
+++ b/frontend/src/pages/Organization/OrgScanHistory.tsx
@@ -0,0 +1,200 @@
+import React, { useState, useCallback } from 'react';
+import { useAuthContext } from 'context';
+import {
+  Organization as OrganizationType,
+  ScanTask,
+  Scan,
+  ScanSchema
+} from 'types';
+import { Button } from '@mui/material';
+import { Column } from 'react-table';
+import { Table } from 'components';
+// @ts-ignore:next-line
+import { formatDistanceToNow, parseISO } from 'date-fns';
+
+interface OrganizationScan extends Partial<OrganizationType> {
+  id: any;
+  granularScans: any;
+}
+
+type OrgScanHistoryProps = {
+  organization: OrganizationScan;
+  setOrganization: Function;
+  scanTasks: ScanTask[];
+};
+
+export const OrgScanHistory: React.FC<OrgScanHistoryProps> = ({
+  organization,
+  setOrganization,
+  scanTasks
+}) => {
+  const { apiGet, apiPost, user, setFeedbackMessage } = useAuthContext();
+  const [scans, setScans] = useState<Scan[]>([]);
+  const [scanSchema, setScanSchema] = useState<ScanSchema>({});
+
+  const dateAccessor = (date?: string) => {
+    return !date || new Date(date).getTime() === new Date(0).getTime()
+      ? 'None'
+      : `${formatDistanceToNow(parseISO(date))} ago`;
+  };
+
+  const fetchScans = useCallback(async () => {
+    try {
+      const response = await apiGet<{
+        scans: Scan[];
+        schema: ScanSchema;
+      }>('/granularScans/');
+      let { scans } = response;
+      const { schema } = response;
+
+      if (user?.userType !== 'globalAdmin')
+        scans = scans.filter(
+          (scan) =>
+            scan.name !== 'censysIpv4' && scan.name !== 'censysCertificates'
+        );
+
+      setScans(scans);
+      setScanSchema(schema);
+    } catch (e) {
+      console.error(e);
+    }
+  }, [apiGet, user]);
+
+  const updateScan = async (scan: Scan, enabled: boolean) => {
+    try {
+      if (!organization) return;
+      await apiPost(
+        `/organizations/${organization?.id}/granularScans/${scan.id}/update`,
+        {
+          body: {
+            enabled
+          }
+        }
+      );
+      setOrganization({
+        ...organization,
+        granularScans: enabled
+          ? organization.granularScans.concat([scan])
+          : organization.granularScans.filter(
+              (granularScan: { id: string }) => granularScan.id !== scan.id
+            )
+      });
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422 ? 'Error updating scan' : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+  const scanColumns: Column<Scan>[] = [
+    {
+      Header: 'Name',
+      accessor: 'name',
+      width: 150,
+      id: 'name',
+      disableFilters: true
+    },
+    {
+      Header: 'Description',
+      accessor: ({ name }) => scanSchema[name] && scanSchema[name].description,
+      width: 200,
+      minWidth: 200,
+      id: 'description',
+      disableFilters: true
+    },
+    {
+      Header: 'Mode',
+      accessor: ({ name }) =>
+        scanSchema[name] && scanSchema[name].isPassive ? 'Passive' : 'Active',
+      width: 150,
+      minWidth: 150,
+      id: 'mode',
+      disableFilters: true
+    },
+    {
+      Header: 'Action',
+      id: 'action',
+      maxWidth: 100,
+      Cell: ({ row }: { row: { index: number } }) => {
+        if (!organization) return null;
+        const enabled = organization.granularScans.find(
+          (scan: { id: string }) => scan.id === scans[row.index].id
+        );
+        return (
+          <Button
+            type="button"
+            onClick={() => {
+              updateScan(scans[row.index], !enabled);
+            }}
+          >
+            {enabled ? 'Disable' : 'Enable'}
+          </Button>
+        );
+      },
+      disableFilters: true
+    }
+  ];
+
+  const scanTaskColumns: Column<ScanTask>[] = [
+    {
+      Header: 'ID',
+      accessor: 'id',
+      disableFilters: true
+    },
+    {
+      Header: 'Status',
+      accessor: 'status',
+      disableFilters: true
+    },
+    {
+      Header: 'Type',
+      accessor: 'type',
+      disableFilters: true
+    },
+    {
+      Header: 'Name',
+      accessor: ({ scan }) => scan?.name,
+      disableFilters: true
+    },
+    {
+      Header: 'Created At',
+      accessor: ({ createdAt }) => dateAccessor(createdAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Requested At',
+      accessor: ({ requestedAt }) => dateAccessor(requestedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Started At',
+      accessor: ({ startedAt }) => dateAccessor(startedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Finished At',
+      accessor: ({ finishedAt }) => dateAccessor(finishedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Output',
+      accessor: 'output',
+      disableFilters: true
+    }
+  ];
+  return (
+    <>
+      <Table<Scan> columns={scanColumns} data={scans} fetchData={fetchScans} />
+      <h2>Organization Scan History</h2>
+      <Table<ScanTask> columns={scanTaskColumns} data={scanTasks} />
+    </>
+  );
+};
+
+export default OrgScanHistory;
diff --git a/frontend/src/pages/Organization/OrgSettings.tsx b/frontend/src/pages/Organization/OrgSettings.tsx
new file mode 100644
index 00000000..26473b8f
--- /dev/null
+++ b/frontend/src/pages/Organization/OrgSettings.tsx
@@ -0,0 +1,488 @@
+import React from 'react';
+import { useAuthContext } from 'context';
+import {
+  PendingDomain,
+  Organization as OrganizationType,
+  OrganizationTag
+} from 'types';
+import {
+  Alert,
+  Autocomplete,
+  Button,
+  Chip,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  Grid,
+  Stack,
+  Switch,
+  TextField,
+  Typography
+} from '@mui/material';
+import { CheckCircleOutline, Place, Public } from '@mui/icons-material';
+import InfoDialog from 'components/Dialog/InfoDialog';
+
+interface AutocompleteType extends Partial<OrganizationTag> {
+  title?: string;
+}
+
+interface OrgSettingsType extends Partial<OrganizationType> {
+  id: any;
+  granularScans: any;
+  rootDomains: string[];
+  ipBlocks: string[];
+  tags: OrganizationTag[];
+  pendingDomains: PendingDomain[];
+}
+
+type OrgSettingsProps = {
+  organization: OrgSettingsType;
+  setOrganization: Function;
+  tags: AutocompleteType[];
+};
+
+export const OrgSettings: React.FC<OrgSettingsProps> = ({
+  organization,
+  setOrganization,
+  tags
+}) => {
+  const { apiPut, apiPost, user, setFeedbackMessage } = useAuthContext();
+  const [inputValue, setInputValue] = React.useState('');
+  const [dialog, setDialog] = React.useState<{
+    open: boolean;
+    type?: 'rootDomains' | 'ipBlocks' | 'tags';
+    label?: string;
+    stage?: number;
+    domainVerificationStatusMessage?: string;
+  }>({ open: false });
+  const [isSaveDisabled, setIsSaveDisabled] = React.useState(true);
+  const [infoDialogOpen, setInfoDialogOpen] = React.useState(false);
+  const [chosenTags, setChosenTags] = React.useState<string[]>(
+    organization.tags ? organization.tags.map((tag) => tag.name) : []
+  );
+
+  const updateOrganization = async (body: any) => {
+    try {
+      const org = await apiPut('/organizations/' + organization?.id, {
+        body: organization
+      });
+      setOrganization(org);
+      setFeedbackMessage({
+        message: 'Organization successfully updated',
+        type: 'success'
+      });
+      setInfoDialogOpen(true);
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error updating organization'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const initiateDomainVerification = async (domain: string) => {
+    try {
+      if (!organization) return;
+      const pendingDomains: PendingDomain[] = await apiPost(
+        `/organizations/${organization?.id}/initiateDomainVerification`,
+        {
+          body: { domain }
+        }
+      );
+      setOrganization({ ...organization, pendingDomains });
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error creating domain'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const checkDomainVerification = async (domain: string) => {
+    try {
+      if (!organization) return;
+      const resp: { success: boolean; organization?: OrganizationType } =
+        await apiPost(
+          `/organizations/${organization?.id}/checkDomainVerification`,
+          {
+            body: { domain }
+          }
+        );
+      if (resp.success && resp.organization) {
+        setOrganization(resp.organization);
+        setDialog({ open: false });
+        setFeedbackMessage({
+          message: 'Domain ' + inputValue + ' successfully verified!',
+          type: 'success'
+        });
+      } else {
+        setDialog({
+          ...dialog,
+          domainVerificationStatusMessage:
+            'Record not yet found. Note that DNS records may take up to 72 hours to propagate. You can come back later to check the verification status.'
+        });
+      }
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error verifying domain'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const handleTagChange = (event: any, newValue: any) => {
+    setChosenTags(newValue);
+    setOrganization((prevValues: any) => ({
+      ...prevValues,
+      tags: newValue.map((tag: any) => ({ name: tag }))
+    }));
+    setIsSaveDisabled(false);
+  };
+
+  const ListInput = (props: {
+    type: 'rootDomains' | 'ipBlocks' | 'tags';
+    label: string;
+  }) => {
+    if (!organization) return null;
+    const elements: (string | OrganizationTag)[] = organization[props.type];
+    return (
+      <Grid container spacing={1}>
+        <Grid item xs={12} sm={3} lg={2} my={1}>
+          <Typography variant="body2">{props.label}</Typography>
+        </Grid>
+        {elements &&
+          elements.map((value: string | OrganizationTag, index: number) => (
+            <Grid item mb={1} key={index}>
+              <Chip
+                color={'primary'}
+                label={typeof value === 'string' ? value : value.name}
+                onDelete={() => {
+                  organization[props.type].splice(index, 1);
+                  setOrganization({ ...organization });
+                  if (chosenTags.length > 0) {
+                    chosenTags.splice(index, 1);
+                    setChosenTags(chosenTags);
+                  }
+                  setIsSaveDisabled(false);
+                }}
+              ></Chip>
+            </Grid>
+          ))}
+        {props.type === 'rootDomains' &&
+          organization.pendingDomains.map((domain, index: number) => (
+            <Grid item mb={1} key={index}>
+              <Chip
+                sx={{ backgroundColor: '#C4C4C4' }}
+                label={domain.name + ' (verification pending)'}
+                onDelete={() => {
+                  organization.pendingDomains.splice(index, 1);
+                  setOrganization({ ...organization });
+                }}
+                onClick={() => {
+                  setInputValue(domain.name);
+                  setDialog({
+                    open: true,
+                    type: props.type,
+                    label: props.label,
+                    stage: 1
+                  });
+                }}
+              ></Chip>
+            </Grid>
+          ))}
+        {(props.type === 'rootDomains' || user?.userType === 'globalAdmin') && (
+          <Grid item mb={1}>
+            <Chip
+              label="ADD"
+              variant="outlined"
+              color="secondary"
+              onClick={() => {
+                setDialog({
+                  open: true,
+                  type: props.type,
+                  label: props.label,
+                  stage: 0
+                });
+              }}
+            />
+          </Grid>
+        )}
+      </Grid>
+    );
+  };
+
+  if (!organization) return null;
+  return (
+    <>
+      <Dialog
+        open={dialog.open}
+        onClose={() => setDialog({ open: false })}
+        aria-labelledby="form-dialog-title"
+        maxWidth="xs"
+        fullWidth
+      >
+        <DialogTitle id="form-dialog-title">
+          {dialog.type === 'tags' ? 'Update ' : 'Add '}
+          {dialog.label && dialog.label.slice(0, -1)}(s)
+        </DialogTitle>
+        <DialogContent>
+          {dialog.type === 'tags' ? (
+            <>
+              <DialogContentText>
+                Use the dropdown to select or deselect existing tags.
+                <br />
+                -- OR --
+                <br />
+                Type and then press enter to add a new tag.
+              </DialogContentText>
+              <Autocomplete
+                value={chosenTags}
+                onChange={handleTagChange}
+                renderTags={(value: readonly string[], getTagProps) =>
+                  value.map((option: string, index: number) => {
+                    const { key, ...tagProps } = getTagProps({ index });
+                    return (
+                      <Chip
+                        variant="outlined"
+                        label={option}
+                        key={key}
+                        {...tagProps}
+                      />
+                    );
+                  })
+                }
+                sx={{ mt: 1 }}
+                multiple
+                options={tags
+                  .map((option) => option.name)
+                  .filter((name): name is string => name !== undefined)}
+                freeSolo
+                renderInput={(params) => (
+                  <TextField {...params} placeholder="Select or add tags" />
+                )}
+              />
+            </>
+          ) : dialog.type === 'rootDomains' && dialog.stage === 1 ? (
+            <>
+              <DialogContentText>
+                Add the following TXT record to {inputValue}&apos;s DNS
+                configuration and click Verify.
+              </DialogContentText>
+              <TextField
+                sx={{ width: '100%' }}
+                value={
+                  organization.pendingDomains.find(
+                    (domain) => domain.name === inputValue
+                  )?.token
+                }
+                onFocus={(event) => {
+                  event.target.select();
+                }}
+              />
+              {dialog.domainVerificationStatusMessage && (
+                <>
+                  <br></br>
+                  <br></br>
+                  <DialogContentText>
+                    {dialog.domainVerificationStatusMessage}
+                  </DialogContentText>
+                </>
+              )}
+            </>
+          ) : user?.userType === 'globalAdmin' ? (
+            <>
+              <DialogContentText>
+                Separate multiple entries by commas.
+              </DialogContentText>
+              <TextField
+                autoFocus
+                margin="dense"
+                id="name"
+                inputProps={{ maxLength: 255 }}
+                placeholder={
+                  dialog.label && 'Enter ' + dialog.label.slice(0, -1) + '(s)'
+                }
+                type="text"
+                fullWidth
+                onChange={(e) => setInputValue(e.target.value)}
+              />
+            </>
+          ) : dialog.type === 'rootDomains' && dialog.stage === 0 ? (
+            <>
+              <DialogContentText>
+                In order to add a root domain, you will need to verify ownership
+                of the domain.
+              </DialogContentText>
+              <TextField
+                autoFocus
+                margin="dense"
+                id="name"
+                label={dialog.label && dialog.label.slice(0, -1)}
+                type="text"
+                fullWidth
+                onChange={(e) => setInputValue(e.target.value)}
+              />
+            </>
+          ) : (
+            <></>
+          )}
+        </DialogContent>
+        <DialogActions>
+          <Button variant="outlined" onClick={() => setDialog({ open: false })}>
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            color="primary"
+            onClick={() => {
+              if (
+                dialog.type === 'rootDomains' &&
+                user?.userType !== 'globalAdmin'
+              ) {
+                if (dialog.stage === 0) {
+                  // Start verification process
+                  initiateDomainVerification(inputValue);
+                  setDialog({ ...dialog, stage: 1 });
+                  return;
+                } else {
+                  checkDomainVerification(inputValue);
+                  return;
+                }
+              } else if (dialog.type && dialog.type !== 'tags') {
+                if (inputValue) {
+                  // Allow adding multiple values with a comma delimiter
+                  organization[dialog.type].push(
+                    ...inputValue.split(',').map((e) => e.trim())
+                  );
+                  setOrganization({ ...organization });
+                  if (organization.rootDomains.length !== 0) {
+                    setIsSaveDisabled(false);
+                  }
+                }
+              }
+              setDialog({ open: false });
+              setInputValue('');
+            }}
+          >
+            {dialog.type === 'tags' ? 'Update' : 'Add'}
+          </Button>
+        </DialogActions>
+      </Dialog>
+      <InfoDialog
+        isOpen={infoDialogOpen}
+        handleClick={() => {
+          setInfoDialogOpen(false);
+          setIsSaveDisabled(true);
+        }}
+        icon={<CheckCircleOutline color="success" sx={{ fontSize: '80px' }} />}
+        title={<Typography variant="h4">Success </Typography>}
+        content={
+          <Typography variant="body1">
+            {organization.name} was successfully updated.
+          </Typography>
+        }
+      />
+      <Grid container spacing={1} p={3}>
+        <Grid item xs={12}>
+          <TextField
+            fullWidth
+            value={organization.name}
+            disabled
+            variant="standard"
+            InputProps={{
+              sx: { fontSize: '18px', fontWeight: 400 }
+            }}
+          ></TextField>
+        </Grid>
+        <Grid item xs={12} mt={2} mb={1}>
+          <Stack direction="row" alignItems="center" spacing={1}>
+            {organization.regionId && (
+              <>
+                <Public sx={{ color: 'gray' }} />
+                <Typography variant="body1" color="gray">
+                  Region {organization.regionId}
+                </Typography>
+              </>
+            )}
+            {(organization.stateName || organization.state) && (
+              <>
+                <Place sx={{ color: 'gray' }} />
+                <Typography variant="body1" color="gray">
+                  {organization.stateName || organization.state}
+                </Typography>
+              </>
+            )}
+          </Stack>
+        </Grid>
+        <Grid item xs={12}>
+          <ListInput label="Root Domains" type="rootDomains"></ListInput>
+        </Grid>
+        <Grid item xs={12}>
+          <ListInput label="IP Blocks" type="ipBlocks"></ListInput>
+        </Grid>
+        {user?.userType === 'globalAdmin' && (
+          <Grid item xs={12}>
+            <ListInput label="Tags" type="tags"></ListInput>
+          </Grid>
+        )}
+        <Grid item xs={12}>
+          <Grid container spacing={1}>
+            <Grid item xs={12} sm={3} lg={2} my={1}>
+              <Typography variant="body2">Passive Mode</Typography>
+            </Grid>
+            <Grid item ml={-1}>
+              <Switch
+                checked={organization.isPassive}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                  setOrganization({
+                    ...organization,
+                    isPassive: event.target.checked
+                  });
+                  if (!organization.isPassive) {
+                    setIsSaveDisabled(false);
+                  }
+                }}
+                color="primary"
+              />
+            </Grid>
+          </Grid>
+        </Grid>
+        {organization.rootDomains.length === 0 && (
+          <Grid item xs={12}>
+            <Alert severity="error">
+              An organization must have at least one Root Domain.
+            </Alert>
+          </Grid>
+        )}
+        <Grid item xs={12} mt={2}>
+          <Button variant="outlined" sx={{ mr: 1 }} href="/organizations">
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            onClick={updateOrganization}
+            disabled={organization.rootDomains.length === 0 || isSaveDisabled}
+          >
+            Save
+          </Button>
+        </Grid>
+      </Grid>
+    </>
+  );
+};
+
+export default OrgSettings;
diff --git a/frontend/src/pages/Organization/Organization.tsx b/frontend/src/pages/Organization/Organization.tsx
index f044a992..3e9c58ea 100644
--- a/frontend/src/pages/Organization/Organization.tsx
+++ b/frontend/src/pages/Organization/Organization.tsx
@@ -1,180 +1,42 @@
 import React, { useEffect, useState, useCallback } from 'react';
-import * as OrganizationStyles from './style';
-import { Link, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { useAuthContext } from 'context';
 import {
   Organization as OrganizationType,
   Role,
   ScanTask,
-  Scan,
-  ScanSchema,
-  OrganizationTag,
-  PendingDomain
+  OrganizationTag
 } from 'types';
-import { Column } from 'react-table';
-import { Table } from 'components';
-// @ts-ignore:next-line
-import { formatDistanceToNow, parseISO } from 'date-fns';
+
 import {
   Box,
   Breadcrumbs,
-  Chip,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
   Grid,
   Link as MuiLink,
   Paper,
-  Switch as SwitchInput,
   Tab,
-  TextField,
   Typography
 } from '@mui/material';
 import { TabContext, TabList, TabPanel } from '@mui/lab';
 import { ChevronRight } from '@mui/icons-material';
-import { Autocomplete } from '@mui/material';
-import { createFilterOptions } from '@mui/material/useAutocomplete';
-import { OrganizationList } from 'components/OrganizationList';
 import OrgMembers from './OrgMembers';
+import OrgScanHistory from './OrgScanHistory';
+import OrgSettings from './OrgSettings';
 
 interface AutocompleteType extends Partial<OrganizationTag> {
   title?: string;
 }
-
 export const Organization: React.FC = () => {
-  const { apiGet, apiPut, apiPost, user, setFeedbackMessage } =
-    useAuthContext();
+  const { apiGet } = useAuthContext();
   const { organizationId } = useParams<{ organizationId: string }>();
   const [organization, setOrganization] = useState<OrganizationType>();
   const [tags, setTags] = useState<AutocompleteType[]>([]);
   const [userRoles, setUserRoles] = useState<Role[]>([]);
   const [scanTasks, setScanTasks] = useState<ScanTask[]>([]);
-  const [scans, setScans] = useState<Scan[]>([]);
-  const [scanSchema, setScanSchema] = useState<ScanSchema>({});
   const [tabValue, setTabValue] = React.useState('1');
-  const [tagValue, setTagValue] = React.useState<AutocompleteType | null>(null);
-  const [inputValue, setInputValue] = React.useState('');
-  const [dialog, setDialog] = React.useState<{
-    open: boolean;
-    type?: 'rootDomains' | 'ipBlocks' | 'tags';
-    label?: string;
-    stage?: number;
-    domainVerificationStatusMessage?: string;
-  }>({ open: false });
   const handleTabChange = (event: React.SyntheticEvent, newValue: string) => {
     setTabValue(newValue);
   };
-  const dateAccessor = (date?: string) => {
-    return !date || new Date(date).getTime() === new Date(0).getTime()
-      ? 'None'
-      : `${formatDistanceToNow(parseISO(date))} ago`;
-  };
-
-  const organizationClasses = OrganizationStyles.organizationClasses;
-
-  const scanColumns: Column<Scan>[] = [
-    {
-      Header: 'Name',
-      accessor: 'name',
-      width: 150,
-      id: 'name',
-      disableFilters: true
-    },
-    {
-      Header: 'Description',
-      accessor: ({ name }) => scanSchema[name] && scanSchema[name].description,
-      width: 200,
-      minWidth: 200,
-      id: 'description',
-      disableFilters: true
-    },
-    {
-      Header: 'Mode',
-      accessor: ({ name }) =>
-        scanSchema[name] && scanSchema[name].isPassive ? 'Passive' : 'Active',
-      width: 150,
-      minWidth: 150,
-      id: 'mode',
-      disableFilters: true
-    },
-    {
-      Header: 'Action',
-      id: 'action',
-      maxWidth: 100,
-      Cell: ({ row }: { row: { index: number } }) => {
-        if (!organization) return null;
-        const enabled = organization.granularScans.find(
-          (scan) => scan.id === scans[row.index].id
-        );
-        return (
-          <Button
-            type="button"
-            onClick={() => {
-              updateScan(scans[row.index], !enabled);
-            }}
-          >
-            {enabled ? 'Disable' : 'Enable'}
-          </Button>
-        );
-      },
-      disableFilters: true
-    }
-  ];
-
-  const scanTaskColumns: Column<ScanTask>[] = [
-    {
-      Header: 'ID',
-      accessor: 'id',
-      disableFilters: true
-    },
-    {
-      Header: 'Status',
-      accessor: 'status',
-      disableFilters: true
-    },
-    {
-      Header: 'Type',
-      accessor: 'type',
-      disableFilters: true
-    },
-    {
-      Header: 'Name',
-      accessor: ({ scan }) => scan?.name,
-      disableFilters: true
-    },
-    {
-      Header: 'Created At',
-      accessor: ({ createdAt }) => dateAccessor(createdAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Requested At',
-      accessor: ({ requestedAt }) => dateAccessor(requestedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Started At',
-      accessor: ({ startedAt }) => dateAccessor(startedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Finished At',
-      accessor: ({ finishedAt }) => dateAccessor(finishedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Output',
-      accessor: 'output',
-      disableFilters: true
-    }
-  ];
 
   const fetchOrganization = useCallback(async () => {
     try {
@@ -195,453 +57,19 @@ export const Organization: React.FC = () => {
     }
   }, [apiGet, setOrganization, organizationId]);
 
-  const fetchScans = useCallback(async () => {
-    try {
-      const response = await apiGet<{
-        scans: Scan[];
-        schema: ScanSchema;
-      }>('/granularScans/');
-      let { scans } = response;
-      const { schema } = response;
-
-      if (user?.userType !== 'globalAdmin')
-        scans = scans.filter(
-          (scan) =>
-            scan.name !== 'censysIpv4' && scan.name !== 'censysCertificates'
-        );
-
-      setScans(scans);
-      setScanSchema(schema);
-    } catch (e) {
-      console.error(e);
-    }
-  }, [apiGet, user]);
-
-  const updateOrganization = async (body: any) => {
-    try {
-      const org = await apiPut('/organizations/' + organization?.id, {
-        body: organization
-      });
-      setOrganization(org);
-      setFeedbackMessage({
-        message: 'Organization successfully updated',
-        type: 'success'
-      });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error updating organization'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const updateScan = async (scan: Scan, enabled: boolean) => {
-    try {
-      if (!organization) return;
-      await apiPost(
-        `/organizations/${organization?.id}/granularScans/${scan.id}/update`,
-        {
-          body: {
-            enabled
-          }
-        }
-      );
-      setOrganization({
-        ...organization,
-        granularScans: enabled
-          ? organization.granularScans.concat([scan])
-          : organization.granularScans.filter(
-              (granularScan) => granularScan.id !== scan.id
-            )
-      });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422 ? 'Error updating scan' : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const initiateDomainVerification = async (domain: string) => {
-    try {
-      if (!organization) return;
-      const pendingDomains: PendingDomain[] = await apiPost(
-        `/organizations/${organization?.id}/initiateDomainVerification`,
-        {
-          body: { domain }
-        }
-      );
-      setOrganization({ ...organization, pendingDomains });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error creating domain'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const checkDomainVerification = async (domain: string) => {
-    try {
-      if (!organization) return;
-      const resp: { success: boolean; organization?: OrganizationType } =
-        await apiPost(
-          `/organizations/${organization?.id}/checkDomainVerification`,
-          {
-            body: { domain }
-          }
-        );
-      if (resp.success && resp.organization) {
-        setOrganization(resp.organization);
-        setDialog({ open: false });
-        setFeedbackMessage({
-          message: 'Domain ' + inputValue + ' successfully verified!',
-          type: 'success'
-        });
-      } else {
-        setDialog({
-          ...dialog,
-          domainVerificationStatusMessage:
-            'Record not yet found. Note that DNS records may take up to 72 hours to propagate. You can come back later to check the verification status.'
-        });
-      }
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error verifying domain'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
   useEffect(() => {
     fetchOrganization();
   }, [fetchOrganization]);
 
-  const filter = createFilterOptions<AutocompleteType>();
-
-  const ListInput = (props: {
-    type: 'rootDomains' | 'ipBlocks' | 'tags';
-    label: string;
-  }) => {
-    if (!organization) return null;
-    const elements: (string | OrganizationTag)[] = organization[props.type];
-    return (
-      <Grid container spacing={1}>
-        <Grid item xs={12} sm={3} lg={2} my={1}>
-          <Typography variant="body2">{props.label}</Typography>
-        </Grid>
-        {elements &&
-          elements.map((value: string | OrganizationTag, index: number) => (
-            <Grid item mb={1} key={index}>
-              <Chip
-                color={'primary'}
-                className={organizationClasses.chip}
-                label={typeof value === 'string' ? value : value.name}
-                onDelete={() => {
-                  organization[props.type].splice(index, 1);
-                  setOrganization({ ...organization });
-                }}
-              ></Chip>
-            </Grid>
-          ))}
-        {props.type === 'rootDomains' &&
-          organization.pendingDomains.map((domain, index: number) => (
-            <Grid item mb={1} key={index}>
-              <Chip
-                className={organizationClasses.chip}
-                style={{ backgroundColor: '#C4C4C4' }}
-                label={domain.name + ' (verification pending)'}
-                onDelete={() => {
-                  organization.pendingDomains.splice(index, 1);
-                  setOrganization({ ...organization });
-                }}
-                onClick={() => {
-                  setInputValue(domain.name);
-                  setDialog({
-                    open: true,
-                    type: props.type,
-                    label: props.label,
-                    stage: 1
-                  });
-                }}
-              ></Chip>
-            </Grid>
-          ))}
-        {(props.type === 'rootDomains' || user?.userType === 'globalAdmin') && (
-          <Grid item mb={1}>
-            <Chip
-              label="ADD"
-              variant="outlined"
-              color="secondary"
-              onClick={() => {
-                setDialog({
-                  open: true,
-                  type: props.type,
-                  label: props.label,
-                  stage: 0
-                });
-              }}
-            />
-          </Grid>
-        )}
-      </Grid>
-    );
-  };
-
   if (!organization) return null;
 
   const views = [
     <Paper key={0}>
-      <Dialog
-        open={dialog.open}
-        onClose={() => setDialog({ open: false })}
-        aria-labelledby="form-dialog-title"
-        maxWidth="xs"
-        fullWidth
-      >
-        <DialogTitle id="form-dialog-title">
-          Add {dialog.label && dialog.label.slice(0, -1)}
-        </DialogTitle>
-        <DialogContent>
-          {dialog.type === 'tags' ? (
-            <>
-              <DialogContentText>
-                Select an existing tag or add a new one.
-              </DialogContentText>
-              <Autocomplete
-                value={tagValue}
-                onChange={(event, newValue) => {
-                  if (typeof newValue === 'string') {
-                    setTagValue({
-                      name: newValue
-                    });
-                  } else {
-                    setTagValue(newValue);
-                  }
-                }}
-                filterOptions={(options, params) => {
-                  const filtered = filter(options, params);
-                  // Suggest the creation of a new value
-                  if (
-                    params.inputValue !== '' &&
-                    !filtered.find(
-                      (tag) =>
-                        tag.name?.toLowerCase() ===
-                        params.inputValue.toLowerCase()
-                    )
-                  ) {
-                    filtered.push({
-                      name: params.inputValue,
-                      title: `Add "${params.inputValue}"`
-                    });
-                  }
-                  return filtered;
-                }}
-                selectOnFocus
-                clearOnBlur
-                handleHomeEndKeys
-                options={tags}
-                getOptionLabel={(option) => {
-                  if (typeof option === 'string') {
-                    return option;
-                  }
-                  return (option as AutocompleteType).name ?? '';
-                }}
-                renderOption={(props, option) => {
-                  if (option.title) return option.title;
-                  return option.name ?? '';
-                }}
-                fullWidth
-                freeSolo
-                renderInput={(params) => (
-                  <TextField {...params} variant="outlined" />
-                )}
-              />
-            </>
-          ) : dialog.type === 'rootDomains' && dialog.stage === 1 ? (
-            <>
-              <DialogContentText>
-                Add the following TXT record to {inputValue}&apos;s DNS
-                configuration and click Verify.
-              </DialogContentText>
-              <TextField
-                style={{ width: '100%' }}
-                value={
-                  organization.pendingDomains.find(
-                    (domain) => domain.name === inputValue
-                  )?.token
-                }
-                onFocus={(event) => {
-                  event.target.select();
-                }}
-              />
-              {dialog.domainVerificationStatusMessage && (
-                <>
-                  <br></br>
-                  <br></br>
-                  <DialogContentText>
-                    {dialog.domainVerificationStatusMessage}
-                  </DialogContentText>
-                </>
-              )}
-            </>
-          ) : user?.userType === 'globalAdmin' ? (
-            <>
-              <DialogContentText>
-                Separate multiple entries by commas.
-              </DialogContentText>
-              <TextField
-                autoFocus
-                margin="dense"
-                id="name"
-                inputProps={{ maxLength: 255 }}
-                label={dialog.label && dialog.label.slice(0, -1)}
-                type="text"
-                fullWidth
-                onChange={(e) => setInputValue(e.target.value)}
-              />
-            </>
-          ) : dialog.type === 'rootDomains' && dialog.stage === 0 ? (
-            <>
-              <DialogContentText>
-                In order to add a root domain, you will need to verify ownership
-                of the domain.
-              </DialogContentText>
-              <TextField
-                autoFocus
-                margin="dense"
-                id="name"
-                label={dialog.label && dialog.label.slice(0, -1)}
-                type="text"
-                fullWidth
-                onChange={(e) => setInputValue(e.target.value)}
-              />
-            </>
-          ) : (
-            <></>
-          )}
-        </DialogContent>
-        <DialogActions>
-          <Button variant="outlined" onClick={() => setDialog({ open: false })}>
-            Cancel
-          </Button>
-          <Button
-            variant="contained"
-            color="primary"
-            onClick={() => {
-              if (
-                dialog.type === 'rootDomains' &&
-                user?.userType !== 'globalAdmin'
-              ) {
-                if (dialog.stage === 0) {
-                  // Start verification process
-                  initiateDomainVerification(inputValue);
-                  setDialog({ ...dialog, stage: 1 });
-                  return;
-                } else {
-                  checkDomainVerification(inputValue);
-                  return;
-                }
-              } else if (dialog.type && dialog.type !== 'tags') {
-                if (inputValue) {
-                  // Allow adding multiple values with a comma delimiter
-                  organization[dialog.type].push(
-                    ...inputValue.split(',').map((e) => e.trim())
-                  );
-                  setOrganization({ ...organization });
-                }
-              } else {
-                if (tagValue) {
-                  if (!organization.tags) organization.tags = [];
-                  organization.tags.push(tagValue as any);
-                  setOrganization({ ...organization });
-                }
-              }
-              setDialog({ open: false });
-              setInputValue('');
-              setTagValue(null);
-            }}
-          >
-            {dialog.type === 'rootDomains' && user?.userType !== 'globalAdmin'
-              ? dialog.stage === 0
-                ? 'Next'
-                : 'Verify'
-              : 'Add'}
-          </Button>
-        </DialogActions>
-      </Dialog>
-      <Grid container spacing={1} p={3}>
-        <Grid item xs={12}>
-          <TextField
-            value={organization.name}
-            disabled
-            variant="standard"
-            InputProps={{
-              className: organizationClasses.orgName
-            }}
-          ></TextField>
-        </Grid>
-        <Grid item xs={12}>
-          <ListInput label="Root Domains" type="rootDomains"></ListInput>
-        </Grid>
-        <Grid item xs={12}>
-          <ListInput label="IP Blocks" type="ipBlocks"></ListInput>
-        </Grid>
-        {user?.userType === 'globalAdmin' && (
-          <Grid item xs={12}>
-            <ListInput label="Tags" type="tags"></ListInput>
-          </Grid>
-        )}
-        <Grid item xs={12}>
-          <Grid container spacing={1}>
-            <Grid item xs={12} sm={3} lg={2} my={1}>
-              <Typography variant="body2">Passive Mode</Typography>
-            </Grid>
-            <Grid item ml={-1}>
-              <SwitchInput
-                checked={organization.isPassive}
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                  setOrganization({
-                    ...organization,
-                    isPassive: event.target.checked
-                  });
-                }}
-                color="primary"
-              />
-            </Grid>
-          </Grid>
-        </Grid>
-        <Grid item xs={12}>
-          <Link to={`/organizations`}>
-            <Button
-              variant="outlined"
-              style={{ marginRight: '10px', color: '#565C65' }}
-            >
-              Cancel
-            </Button>
-          </Link>
-          <Button
-            variant="contained"
-            onClick={updateOrganization}
-            style={{ background: '#565C65', color: 'white' }}
-          >
-            Save
-          </Button>
-        </Grid>
-      </Grid>
+      <OrgSettings
+        organization={organization}
+        setOrganization={setOrganization}
+        tags={tags}
+      />
     </Paper>,
     <React.Fragment key={1}>
       <OrgMembers
@@ -651,12 +79,11 @@ export const Organization: React.FC = () => {
       />
     </React.Fragment>,
     <React.Fragment key={2}>
-      <OrganizationList parent={organization}></OrganizationList>
-    </React.Fragment>,
-    <React.Fragment key={3}>
-      <Table<Scan> columns={scanColumns} data={scans} fetchData={fetchScans} />
-      <h2>Organization Scan History</h2>
-      <Table<ScanTask> columns={scanTaskColumns} data={scanTasks} />
+      <OrgScanHistory
+        organization={organization}
+        setOrganization={setOrganization}
+        scanTasks={scanTasks}
+      />
     </React.Fragment>
   ];
 
diff --git a/frontend/src/pages/Organization/style.ts b/frontend/src/pages/Organization/style.ts
deleted file mode 100644
index f30b2c22..00000000
--- a/frontend/src/pages/Organization/style.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { styled } from '@mui/material/styles';
-
-const PREFIX = 'Organization';
-
-export const organizationClasses = {
-  header: `${PREFIX}-header`,
-  headerLabel: `${PREFIX}-headerLabel`,
-  chip: `${PREFIX}-chip`,
-  settingsWrapper: `${PREFIX}-settingsWrapper`,
-  buttons: `${PREFIX}-buttons`,
-  orgName: `${PREFIX}-orgName`,
-  textField: `${PREFIX}-textField`,
-  root: `${PREFIX}-root`,
-  headerRow: `${PREFIX}-headerRow`
-};
-
-export const OrganizationRoot = styled('div')(({ theme }) => ({
-  [`& .${organizationClasses.header}`]: {
-    background: '#F9F9F9'
-  },
-
-  [`& .${organizationClasses.headerLabel}`]: {
-    margin: 0,
-    paddingTop: '1.5rem',
-    paddingBottom: '0.5rem',
-    marginLeft: '15%',
-    color: '#C9C9C9',
-    fontWeight: 500,
-    fontStyle: 'normal',
-    fontSize: '24px',
-    '& a': {
-      textDecoration: 'none',
-      color: '#C9C9C9'
-    },
-    '& svg': {
-      verticalAlign: 'middle',
-      lineHeight: '100%',
-      fontSize: '26px'
-    }
-  },
-
-  [`& .${organizationClasses.chip}`]: {
-    color: 'white',
-    marginRight: '10px',
-    marginTop: '10px'
-  },
-
-  [`& .${organizationClasses.settingsWrapper}`]: {
-    boxSizing: 'border-box',
-    border: '0px',
-    boxShadow: 'none',
-    borderRadius: '0px',
-    padding: '25px',
-    maxWidth: '900px',
-    margin: '0 auto'
-  },
-
-  [`& .${organizationClasses.buttons}`]: {
-    display: 'flex',
-    justifyContent: 'flex-end'
-  },
-
-  [`& .${organizationClasses.orgName}`]: {
-    background: '#F5F5F5 !important',
-    paddingBottom: '10px'
-  },
-
-  [`& .${organizationClasses.textField}`]: {
-    background: '#F5F5F5 !important'
-  },
-
-  [`& .${organizationClasses.root}`]: {
-    maxWidth: '1400px',
-    margin: '0 auto',
-    '@media screen and (min-width: 480px)': {
-      padding: '1rem 1rem'
-    },
-    '@media screen and (min-width: 640px)': {
-      padding: '1rem 1.5rem'
-    },
-    '@media screen and (min-width: 1024px)': {
-      padding: '1rem 2rem'
-    }
-  },
-
-  [`& .${organizationClasses.headerRow}`]: {
-    padding: '0.5rem 0',
-    width: '100%',
-    display: 'flex',
-    alignItems: 'center',
-    fontSize: '16px',
-    flexWrap: 'wrap',
-    '& label': {
-      flex: '1 0 100%',
-      fontWeight: 'bolder',
-      display: 'flex',
-      alignItems: 'center',
-      padding: '0.5rem 0',
-      '@media screen and (min-width: 640px)': {
-        flex: '0 0 220px',
-        padding: 0
-      }
-    },
-    '& span': {
-      display: 'block',
-      flex: '1 1 auto',
-      marginLeft: 'calc(1rem + 20px)',
-      '@media screen and (min-width: 640px)': {
-        marginLeft: 'calc(1rem + 20px)'
-      },
-      '@media screen and (min-width: 1024px)': {
-        marginLeft: 0
-      }
-    }
-  }
-}));