diff --git a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx
index aa5d44cd..8cefc062 100644
--- a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx
+++ b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen } from '@testing-library/react';
 import React, { useState } from 'react';
 import { cleanup, renderWithProviders } from 'app/mocks';
diff --git a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx
index 6b6e6642..5773b256 100644
--- a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx
+++ b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { cleanup, renderWithProviders } from 'app/mocks';
diff --git a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx
index eeb18b6e..41f2c117 100644
--- a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx
+++ b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { cleanup, renderWithProviders } from 'app/mocks';
diff --git a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx
index 19d464dc..d56dd1e3 100644
--- a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx
+++ b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { Sidebar } from '~/components/Layout/Sidebar/Sidebar';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Layout/TopNav/TopNav.spec.tsx b/client/app/components/Layout/TopNav/TopNav.spec.tsx
index 2f008b62..55f42e95 100644
--- a/client/app/components/Layout/TopNav/TopNav.spec.tsx
+++ b/client/app/components/Layout/TopNav/TopNav.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { TopNav } from '~/components/Layout/TopNav/TopNav';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Layout/TopNav/TopNav.tsx b/client/app/components/Layout/TopNav/TopNav.tsx
index 1eba8e4d..1a96287a 100644
--- a/client/app/components/Layout/TopNav/TopNav.tsx
+++ b/client/app/components/Layout/TopNav/TopNav.tsx
@@ -3,10 +3,11 @@ import { faArrowRightFromBracket, faBars, faGear, faUser } from '@fortawesome/fr
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { NavContext, NavContextProps } from '~/components/Layout/Root';
 import React, { useContext } from 'react';
-import { Button, Dropdown } from 'react-bootstrap';
+import { Button, Col, Dropdown, Row } from 'react-bootstrap';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link, useNavigate } from 'react-router-dom';
 import { removeCredentials, selectAuthenticated, useLogoutMutation } from '~/store';
+import { OrgSelect } from '~/components/Org/OrgSelect';
 
 export function TopNav() {
   const { showSidebar, setShowSidebar } = useContext<NavContextProps>(NavContext);
@@ -31,25 +32,32 @@ export function TopNav() {
   return (
     <nav className="sb-topnav navbar navbar-expand navbar-dark bg-dark d-flex">
       <div className="flex-grow-1">
-        <Button
-          aria-label="toggleSidebarNavigation"
-          aria-hidden={false}
-          id="sidebarToggle"
-          onClick={toggleSidebar}
-          variant="dark"
-          className="mx-3 rounded-circle btn-hover-dark"
-        >
-          <FontAwesomeIcon icon={faBars} />
-        </Button>
-        <Link to="/" className="navbar-brand ps-3 pe-5">
-          <img
-            src={logo}
-            alt="haztrak logo, hazardous waste tracking made easy."
-            width={125}
-            height={'auto'}
-            className="my-3"
-          />
-        </Link>
+        <Row className="align-items-center">
+          <Col xs={12} md={5}>
+            <Button
+              aria-label="toggleSidebarNavigation"
+              aria-hidden={false}
+              id="sidebarToggle"
+              onClick={toggleSidebar}
+              variant="dark"
+              className="mx-3 rounded-circle btn-hover-dark"
+            >
+              <FontAwesomeIcon icon={faBars} />
+            </Button>
+            <Link to="/" className="p-3 ">
+              <img
+                src={logo}
+                alt="haztrak logo, hazardous waste tracking made easy."
+                width={125}
+                height={'auto'}
+                className="my-3"
+              />
+            </Link>
+          </Col>
+          <Col md={5} className="me-5 d-none d-md-block">
+            <OrgSelect />
+          </Col>
+        </Row>
       </div>
       <ul className="navbar-nav ms-auto ms-md-0 me-3 me-lg-4 btn-hover-dark rounded-circle">
         <li className="nav-item dropdown">
diff --git a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx
index 9a4f9376..7b940ed5 100644
--- a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx
+++ b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { ManifestFABs } from '~/components/Manifest/Actions/ManifestFABs';
 import { ManifestContext } from '~/components/Manifest/ManifestForm';
 import { ManifestStatus } from '~/components/Manifest/manifestSchema';
diff --git a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx
index a50fef40..6ced7a23 100644
--- a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx
+++ b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { fireEvent } from '@testing-library/react';
 import { AdditionalInfoForm } from '~/components/Manifest/AdditionalInfo';
 import React from 'react';
diff --git a/client/app/components/Manifest/Address/AddressForm.spec.tsx b/client/app/components/Manifest/Address/AddressForm.spec.tsx
index 0d95c94b..de62d97e 100644
--- a/client/app/components/Manifest/Address/AddressForm.spec.tsx
+++ b/client/app/components/Manifest/Address/AddressForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
 import { AddressForm } from './AddressForm';
diff --git a/client/app/components/Manifest/Contact/ContactForm.spec.tsx b/client/app/components/Manifest/Contact/ContactForm.spec.tsx
index 833dba05..f8c591a9 100644
--- a/client/app/components/Manifest/Contact/ContactForm.spec.tsx
+++ b/client/app/components/Manifest/Contact/ContactForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
 import { ContactForm } from './ContactForm';
diff --git a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx
index e7b12815..3788c78d 100644
--- a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx
+++ b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { PhoneForm } from '~/components/Manifest/Contact';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx
index dd344818..df833a5e 100644
--- a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx
+++ b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
 import { afterEach, describe, expect, test } from 'vitest';
diff --git a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx
index 0c94b7ce..19450714 100644
--- a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx
+++ b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { ManifestStatusSelect } from '~/components/Manifest/GeneralInfo/ManifestStatusSelect';
 import { http, HttpResponse } from 'msw';
diff --git a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx
index 04a17a06..82dc46d5 100644
--- a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx
+++ b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { ManifestTypeSelect } from '~/components/Manifest/GeneralInfo/ManifestTypeSelect';
 import { setupServer } from 'msw/node';
diff --git a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx
index c8004e45..a915e735 100644
--- a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx
+++ b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { fireEvent } from '@testing-library/react';
 import { siteType } from '~/components/Manifest/manifestSchema';
 import React from 'react';
diff --git a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx
index e5a265a8..744f8373 100644
--- a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx
+++ b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
 import { createMockHandler } from '~/mocks/fixtures';
 import { afterEach, describe, expect, test } from 'vitest';
diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx
index e8591034..7c61d5e1 100644
--- a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx
+++ b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx
@@ -4,7 +4,7 @@ import { mockUserEndpoints } from 'app/mocks/handlers';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
-import '@testing-library/jest-dom';
+
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 import { createMockRcrainfoSite } from '~/mocks/fixtures';
 import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints';
diff --git a/client/app/components/Manifest/ManifestForm.spec.tsx b/client/app/components/Manifest/ManifestForm.spec.tsx
index 841e5439..281e56e3 100644
--- a/client/app/components/Manifest/ManifestForm.spec.tsx
+++ b/client/app/components/Manifest/ManifestForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { fireEvent, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ManifestForm } from '~/components/Manifest';
diff --git a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx
index 9537d235..a9e0c201 100644
--- a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx
+++ b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { QuickerSignForm } from '~/components/Manifest/QuickerSign';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
index 36052b85..2e2065b5 100644
--- a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
+++ b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { ManifestContext } from '~/components/Manifest/ManifestForm';
 import { Handler, RcraSiteType } from '~/components/Manifest/manifestSchema';
 import { QuickSignBtn } from '~/components/Manifest/QuickerSign/index';
diff --git a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx
index d519d8b1..28b5cbe2 100644
--- a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx
+++ b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { Transporter } from '~/components/Manifest';
 import { setupServer } from 'msw/node';
diff --git a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx
index 53f10f0a..41db1783 100644
--- a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx
+++ b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
 import { createMockHandler } from '~/mocks/fixtures';
 import { afterEach, describe, expect, test } from 'vitest';
diff --git a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx
index 9a69270f..941ac6dc 100644
--- a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx
+++ b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { QuantityForm } from '~/components/Manifest/WasteLine/QuantityForm';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx
index 4eeb19a0..4308fc00 100644
--- a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx
+++ b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { setupServer } from 'msw/node';
 import React from 'react';
diff --git a/client/app/components/Mtn/MtnTable.spec.tsx b/client/app/components/Mtn/MtnTable.spec.tsx
index 2ab22b16..46fb570b 100644
--- a/client/app/components/Mtn/MtnTable.spec.tsx
+++ b/client/app/components/Mtn/MtnTable.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { fireEvent } from '@testing-library/react';
 import { MtnDetails, MtnTable } from '~/components/Mtn';
 import React from 'react';
diff --git a/client/app/components/Org/OrgSelect.spec.tsx b/client/app/components/Org/OrgSelect.spec.tsx
new file mode 100644
index 00000000..88ac6b86
--- /dev/null
+++ b/client/app/components/Org/OrgSelect.spec.tsx
@@ -0,0 +1,22 @@
+import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { OrgSelect } from '~/components/Org/OrgSelect';
+import { cleanup, renderWithProviders } from '~/mocks';
+import { screen } from '@testing-library/react';
+import { setupServer } from 'msw/node';
+import { mockSiteEndpoints } from '~/mocks/handlers';
+
+const server = setupServer(...mockSiteEndpoints);
+afterEach(() => cleanup());
+beforeAll(() => server.listen());
+afterAll(() => server.close());
+
+describe('OrgSelect Component', () => {
+  it('renders', () => {
+    renderWithProviders(<OrgSelect />);
+    expect(screen.getByTestId('org-select')).toBeInTheDocument();
+  });
+  it('displays a select component', () => {
+    renderWithProviders(<OrgSelect />);
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+  });
+});
diff --git a/client/app/components/Org/OrgSelect.tsx b/client/app/components/Org/OrgSelect.tsx
new file mode 100644
index 00000000..3ab4edc8
--- /dev/null
+++ b/client/app/components/Org/OrgSelect.tsx
@@ -0,0 +1,47 @@
+import Select, { SingleValue } from 'react-select';
+import React, { useEffect, useState } from 'react';
+import { useGetOrgsQuery } from '~/store';
+import { useOrg } from '~/hooks/useOrg/useOrg';
+
+export const OrgSelect = () => {
+  const { isLoading, data: orgs } = useGetOrgsQuery();
+  const { orgId, setOrgId } = useOrg();
+  const [currentOrg, setCurrentOrg] = useState<
+    SingleValue<{
+      label: string;
+      value: string;
+    }>
+  >({
+    value: orgId ?? '',
+    label: orgs?.find((org) => org.slug === orgId)?.name ?? '',
+  });
+
+  useEffect(() => {
+    if (orgId && orgs) {
+      setCurrentOrg({
+        value: orgId,
+        label: orgs.find((org) => org.slug === orgId)?.name ?? '',
+      });
+    }
+  }, [orgId, orgs, setCurrentOrg]);
+
+  const onChange = (option: SingleValue<{ label: string; value: string }>) => {
+    if (!option) return;
+    setOrgId(option.value);
+    setCurrentOrg(option);
+  };
+
+  return (
+    <div data-testid="org-select">
+      <Select
+        value={currentOrg}
+        isLoading={isLoading}
+        options={orgs?.map((org) => ({ label: org.name, value: org.slug }))}
+        onChange={onChange}
+        classNames={{
+          control: () => 'form-control p-0',
+        }}
+      />
+    </div>
+  );
+};
diff --git a/client/app/components/Org/UserOrg.spec.tsx b/client/app/components/Org/UserOrg.spec.tsx
new file mode 100644
index 00000000..2d4cc489
--- /dev/null
+++ b/client/app/components/Org/UserOrg.spec.tsx
@@ -0,0 +1,72 @@
+import { screen } from '@testing-library/react';
+import { UserOrg } from '~/components/Org/UserOrg';
+import { ProfileSlice } from '~/store';
+import { v4 as uuidv4 } from 'uuid';
+import { describe, expect, it } from 'vitest';
+import { renderWithProviders } from '~/mocks';
+
+const mockProfileWithOrg: ProfileSlice = {
+  org: {
+    name: 'Test Organization',
+    rcrainfoIntegrated: true,
+    slug: 'test-organization',
+    id: uuidv4(),
+  },
+  sites: {},
+  user: 'testuser1',
+};
+
+const mockProfileWithoutOrg: ProfileSlice = {
+  org: null,
+  sites: {},
+  user: 'testuser1',
+};
+
+const mockProfileWithNonIntegratedOrg: ProfileSlice = {
+  org: {
+    name: 'Test Organization',
+    rcrainfoIntegrated: false,
+    slug: 'test-organization',
+    id: uuidv4(),
+  },
+  sites: {},
+  user: 'testuser1',
+};
+
+describe('UserOrg Component', () => {
+  it('renders nothing when profile has no org', () => {
+    renderWithProviders(<UserOrg profile={mockProfileWithoutOrg} />);
+    expect(screen.queryByText('Name')).toBeNull();
+  });
+
+  it('renders organization name when profile has org', () => {
+    renderWithProviders(<UserOrg profile={mockProfileWithOrg} />);
+    expect(screen.getByText('Test Organization')).toBeInTheDocument();
+  });
+
+  it('renders default organization name when org name is null', () => {
+    const profileWithNullOrgName = {
+      ...mockProfileWithOrg,
+      org: { ...mockProfileWithOrg.org, name: null },
+    };
+    // @ts-expect-error - intentionally passing invalid data to test default behavior
+    renderWithProviders(<UserOrg profile={profileWithNullOrgName} />);
+    expect(screen.getByText('My Organization')).toBeInTheDocument();
+  });
+
+  it('shows integrated status with check icon when rcrainfoIntegrated is true', () => {
+    renderWithProviders(<UserOrg profile={mockProfileWithOrg} />);
+    expect(screen.getByText('Yes')).toBeInTheDocument();
+  });
+
+  it('shows non-integrated status with cross icon when rcrainfoIntegrated is false', () => {
+    renderWithProviders(<UserOrg profile={mockProfileWithNonIntegratedOrg} />);
+    expect(screen.getByText('No')).toBeInTheDocument();
+  });
+
+  it('renders tabs for My Sites and Other Sites in My Organization', () => {
+    renderWithProviders(<UserOrg profile={mockProfileWithOrg} />);
+    expect(screen.getByText('My Sites')).toBeInTheDocument();
+    expect(screen.getByText('Other Sites in My Organization')).toBeInTheDocument();
+  });
+});
diff --git a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx
index 259512c1..a787bd96 100644
--- a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx
+++ b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { RcraSiteDetails } from '~/components/RcraSite';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx
index be2164cd..56f74a55 100644
--- a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx
+++ b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { RcraApiUserBtn } from '~/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx
index 02c251a4..d325b803 100644
--- a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx
+++ b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { SyncManifestBtn } from '~/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
diff --git a/client/app/components/UI/HtCard/HtCard.spec.tsx b/client/app/components/UI/HtCard/HtCard.spec.tsx
index 78ddba71..7b9d7aea 100644
--- a/client/app/components/UI/HtCard/HtCard.spec.tsx
+++ b/client/app/components/UI/HtCard/HtCard.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { HtCard } from '~/components/UI';
 import React from 'react';
 import { cleanup, render, screen } from 'app/mocks';
diff --git a/client/app/components/UI/HtModal/HtModal.spec.tsx b/client/app/components/UI/HtModal/HtModal.spec.tsx
index 8e339658..108ed14f 100644
--- a/client/app/components/UI/HtModal/HtModal.spec.tsx
+++ b/client/app/components/UI/HtModal/HtModal.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { HtModal } from '~/components/UI';
 import React from 'react';
 import { cleanup, render, screen } from 'app/mocks';
diff --git a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx
index 7fa87cf5..27587fc0 100644
--- a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx
+++ b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { HtPaginate } from '~/components/UI';
 import React from 'react';
 import { cleanup, render, screen } from 'app/mocks';
diff --git a/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx b/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx
index ceef707f..b9e9b384 100644
--- a/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx
+++ b/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup, fireEvent, render, screen } from '@testing-library/react';
 import { HtTooltip } from '~/components/UI';
 import React from 'react';
diff --git a/client/app/components/User/UserInfoForm.spec.tsx b/client/app/components/User/UserInfoForm.spec.tsx
index c4c0a1e3..eaf05829 100644
--- a/client/app/components/User/UserInfoForm.spec.tsx
+++ b/client/app/components/User/UserInfoForm.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { UserInfoForm } from '~/components/User/UserInfoForm';
diff --git a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx
index 7d2d4ba2..299d2b5f 100644
--- a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx
+++ b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { afterEach, describe, expect, it } from 'vitest';
 import { cleanup } from '@testing-library/react';
 import React from 'react';
diff --git a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx
index 16989f6c..9389c4b9 100644
--- a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx
+++ b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SiteType } from '~/components/Manifest/manifestSchema';
diff --git a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx
index d83ef34f..8f35ba9c 100644
--- a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx
+++ b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
diff --git a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx
index 77469311..6747f4a9 100644
--- a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx
+++ b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { Manifest } from '~/components/Manifest';
diff --git a/client/app/hooks/useDebounce/useDebounce.spec.tsx b/client/app/hooks/useDebounce/useDebounce.spec.tsx
index 0a57535f..98a0141c 100644
--- a/client/app/hooks/useDebounce/useDebounce.spec.tsx
+++ b/client/app/hooks/useDebounce/useDebounce.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { renderHook, act } from '@testing-library/react';
 import { useDebounce } from './useDebounce';
 import { beforeAll, afterAll, afterEach, describe, expect, it, vi } from 'vitest';
diff --git a/client/app/hooks/useOrg/useOrg.spec.tsx b/client/app/hooks/useOrg/useOrg.spec.tsx
new file mode 100644
index 00000000..f19b7d01
--- /dev/null
+++ b/client/app/hooks/useOrg/useOrg.spec.tsx
@@ -0,0 +1,43 @@
+import { useOrg } from './useOrg';
+import { useSearchParams } from 'react-router-dom';
+import { afterAll, afterEach, beforeAll, describe, expect, it, Mock, vi } from 'vitest';
+import { setupServer } from 'msw/node';
+import { mockSiteEndpoints } from '~/mocks/handlers';
+import { cleanup, renderHookWithProviders as renderHook } from '~/mocks';
+import { act } from '@testing-library/react';
+
+const server = setupServer(...mockSiteEndpoints);
+afterEach(() => cleanup());
+beforeAll(() => server.listen());
+afterAll(() => server.close());
+
+describe('useOrg Hook', () => {
+  vi.mock('react-router-dom', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('react-router-dom')>()),
+    useSearchParams: vi.fn(),
+  }));
+  it('returns the initial orgId from search params', async () => {
+    const setSearchParams = vi.fn();
+    const searchParams = new URLSearchParams('org=myOrg');
+    (useSearchParams as Mock).mockReturnValue([searchParams, setSearchParams]);
+
+    const { result } = renderHook(() => useOrg());
+
+    expect(result.current.orgId).toBe('myOrg');
+  });
+
+  it('sets the orgId state and updates search params', () => {
+    const setSearchParams = vi.fn();
+    const searchParams = new URLSearchParams();
+    (useSearchParams as Mock).mockReturnValue([searchParams, setSearchParams]);
+
+    const { result } = renderHook(() => useOrg());
+
+    act(() => {
+      result.current.setOrgId('new-org');
+    });
+
+    expect(result.current.orgId).toBe('new-org');
+    expect(setSearchParams).toHaveBeenCalledWith(new URLSearchParams('org=new-org'));
+  });
+});
diff --git a/client/app/hooks/useOrg/useOrg.tsx b/client/app/hooks/useOrg/useOrg.tsx
new file mode 100644
index 00000000..b8f6b0f9
--- /dev/null
+++ b/client/app/hooks/useOrg/useOrg.tsx
@@ -0,0 +1,49 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useGetOrgsQuery } from '~/store';
+
+export const useOrg = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { data: orgs } = useGetOrgsQuery();
+  const [orgSlug, setOrgSlug] = useState<string | null>(searchParams.get('org'));
+
+  const setOrgSlugState = useCallback(
+    (slug: string | null) => {
+      setOrgSlug(slug);
+      if (slug) {
+        searchParams.set('org', slug);
+      } else {
+        searchParams.delete('org');
+      }
+      setSearchParams(searchParams);
+    },
+    [searchParams, setSearchParams]
+  );
+
+  useEffect(() => {
+    const orgIdSearchParam = searchParams.get('org');
+
+    // If an orgId is set, and we have the users orgs, check if the orgId is valid, remove otherwise
+    if (orgIdSearchParam && orgs) {
+      if (!orgs.find((org) => org.slug === orgSlug)) {
+        const defaultOrg = orgs[0].slug;
+        searchParams.set('org', defaultOrg);
+        setSearchParams(searchParams);
+        setOrgSlugState(defaultOrg);
+      }
+    }
+
+    // if no org is set in the URL, and we have orgs, set the first org as the default
+    if (!orgIdSearchParam && orgs) {
+      searchParams.set('org', orgs[0].slug);
+      setSearchParams(searchParams);
+    }
+
+    // if URL is populated but not our state, set the state
+    if (orgIdSearchParam && !orgSlug) {
+      setOrgSlug(orgIdSearchParam);
+    }
+  }, [searchParams, setSearchParams, orgs, orgSlug]);
+
+  return { orgId: orgSlug, setOrgId: setOrgSlugState };
+};
diff --git a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx
index 4f843eb3..a1105d48 100644
--- a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx
+++ b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React, { useState } from 'react';
diff --git a/client/app/hooks/useTitle/useTitle.spec.tsx b/client/app/hooks/useTitle/useTitle.spec.tsx
index bfbc7bff..03ab8b9e 100644
--- a/client/app/hooks/useTitle/useTitle.spec.tsx
+++ b/client/app/hooks/useTitle/useTitle.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { describe, expect, afterEach, it } from 'vitest';
 import { cleanup, fireEvent } from '@testing-library/react';
 import React from 'react';
diff --git a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx
index bc8a0c10..6b5b5b4d 100644
--- a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx
+++ b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { cleanup, waitFor } from '@testing-library/react';
 import { useUserSiteIds } from '~/hooks';
 import { http, HttpResponse } from 'msw';
diff --git a/client/app/mocks/handlers/mockSiteEndpoints.ts b/client/app/mocks/handlers/mockSiteEndpoints.ts
index ab295596..aa0474c4 100644
--- a/client/app/mocks/handlers/mockSiteEndpoints.ts
+++ b/client/app/mocks/handlers/mockSiteEndpoints.ts
@@ -1,9 +1,18 @@
 import { http, HttpResponse } from 'msw';
 import { createMockHandler, createMockSite } from '../fixtures';
+import { createMockOrg } from '~/mocks/fixtures/mockUser';
 
 export const API_BASE_URL = import.meta.env.VITE_HT_API_URL;
 const mockEpaId = createMockHandler().epaSiteId;
 const mockSites = [createMockSite(), createMockSite()];
+const mockOrgs = [
+  createMockOrg(),
+  createMockOrg({
+    slug: 'org-2',
+    name: 'org number 2',
+    rcrainfoIntegrated: false,
+  }),
+];
 
 export const mockSiteEndpoints = [
   /** List user sites*/
@@ -14,4 +23,14 @@ export const mockSiteEndpoints = [
   http.get(`${API_BASE_URL}/api/site/${mockEpaId}`, () => {
     return HttpResponse.json(mockSites[0], { status: 200 });
   }),
+  /** Org list*/
+  http.get(`${API_BASE_URL}/api/orgs`, () => {
+    return HttpResponse.json(mockOrgs, { status: 200 });
+  }),
+  /** Org Details*/
+  http.get(`${API_BASE_URL}/api/orgs/:orgSlug`, (info) => {
+    const { orgSlug } = info.params;
+    const myOrg = mockOrgs.find((org) => org.slug === orgSlug);
+    return HttpResponse.json(myOrg, { status: 200 });
+  }),
 ];
diff --git a/client/app/mocks/index.ts b/client/app/mocks/index.ts
index 48367d80..7ab965c8 100644
--- a/client/app/mocks/index.ts
+++ b/client/app/mocks/index.ts
@@ -1,4 +1,2 @@
-import { renderWithProviders } from '~/mocks/render';
-
-export { renderWithProviders };
+export { renderWithProviders, renderHookWithProviders } from '~/mocks/render';
 export * from '@testing-library/react';
diff --git a/client/app/mocks/render.tsx b/client/app/mocks/render.tsx
index 43a24092..0ffb93d6 100644
--- a/client/app/mocks/render.tsx
+++ b/client/app/mocks/render.tsx
@@ -1,8 +1,8 @@
-import { render, RenderOptions } from '@testing-library/react';
+import { render, renderHook, RenderHookResult, RenderOptions } from '@testing-library/react';
 import React, { PropsWithChildren, ReactElement } from 'react';
 import { FormProvider, useForm, UseFormProps } from 'react-hook-form';
 import { Provider } from 'react-redux';
-import { BrowserRouter } from 'react-router-dom';
+import { MemoryRouter } from 'react-router-dom';
 import { AppStore, RootState, setupStore } from '~/store';
 
 interface ExtendedRenderOptions extends Omit<RenderOptions, 'queries'> {
@@ -41,12 +41,34 @@ export function renderWithProviders(
     const formMethods = useForm(useFormProps);
     return (
       <Provider store={store}>
-        <BrowserRouter>
+        <MemoryRouter>
           <FormProvider {...formMethods}>{children}</FormProvider>
-        </BrowserRouter>
+        </MemoryRouter>
       </Provider>
     );
   }
 
   return { store, ...render(ui, { wrapper: Wrapper, ...renderOptions }) };
 }
+
+export function renderHookWithProviders<T>(
+  hook: () => T,
+  {
+    preloadedState = {},
+    store = setupStore(preloadedState),
+    useFormProps = {},
+  }: ExtendedRenderOptions = {}
+): RenderHookResult<T, unknown> {
+  function Wrapper({ children }: PropsWithChildren<NonNullable<unknown>>): ReactElement {
+    const formMethods = useForm(useFormProps);
+    return (
+      <Provider store={store}>
+        <MemoryRouter>
+          <FormProvider {...formMethods}>{children}</FormProvider>
+        </MemoryRouter>
+      </Provider>
+    );
+  }
+
+  return { ...renderHook(hook, { wrapper: Wrapper }) };
+}
diff --git a/client/app/mocks/setupTests.ts b/client/app/mocks/setupTests.ts
index be149e55..dd533a97 100644
--- a/client/app/mocks/setupTests.ts
+++ b/client/app/mocks/setupTests.ts
@@ -1,5 +1,6 @@
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom/matchers';
+import '@testing-library/jest-dom';
 import { vi } from 'vitest';
 
 global.ResizeObserver = vi.fn().mockImplementation(() => ({
diff --git a/client/app/routes.tsx b/client/app/routes.tsx
index 6c5fbe4f..fcf7d995 100644
--- a/client/app/routes.tsx
+++ b/client/app/routes.tsx
@@ -1,13 +1,15 @@
 import { ErrorPage } from '~/routes/ErrorPage/ErrorPage';
-import { Login } from '~/routes/Login';
+import { Login } from '~/routes/login';
 import React from 'react';
 import { createBrowserRouter } from 'react-router-dom';
+import { orgsLoader } from '~/routes/org';
 
-const Dashboard = React.lazy(() => import('~/routes/Dashboard'));
-const Profile = React.lazy(() => import('~/routes/Profile'));
+const Dashboard = React.lazy(() => import('~/routes/dashboard'));
+const Profile = React.lazy(() => import('~/routes/profile'));
 const SiteList = React.lazy(() => import('~/routes/SiteList'));
 const SiteDetails = React.lazy(() => import('~/routes/SiteDetails'));
-const Help = React.lazy(() => import('~/routes/About'));
+const Help = React.lazy(() => import('~/routes/about'));
+const Org = React.lazy(() => import('~/routes/org'));
 
 export const router = createBrowserRouter([
   {
@@ -16,37 +18,44 @@ export const router = createBrowserRouter([
     children: [
       {
         path: '',
-        element: <Dashboard />,
-      },
-      {
-        path: '/profile',
-        element: <Profile />,
-      },
-      {
-        path: '/site',
+        element: <Org />,
+        loader: orgsLoader,
         children: [
           {
             path: '',
-            element: <SiteList />,
+            element: <Dashboard />,
           },
           {
-            path: ':siteId',
-            element: <SiteDetails />,
+            path: '/profile',
+            element: <Profile />,
           },
           {
-            path: ':siteId/manifest',
+            path: '/site',
             children: [
               {
                 path: '',
-                lazy: () => import('./routes/ManifestList'),
+                element: <SiteList />,
               },
               {
-                path: 'new',
-                lazy: () => import('./routes/NewManifest'),
+                path: ':siteId',
+                element: <SiteDetails />,
               },
               {
-                path: ':mtn/:action',
-                lazy: () => import('./routes/ManifestDetails'),
+                path: ':siteId/manifest',
+                children: [
+                  {
+                    path: '',
+                    lazy: () => import('./routes/ManifestList'),
+                  },
+                  {
+                    path: 'new',
+                    lazy: () => import('./routes/NewManifest'),
+                  },
+                  {
+                    path: ':mtn/:action',
+                    lazy: () => import('./routes/ManifestDetails'),
+                  },
+                ],
               },
             ],
           },
@@ -81,7 +90,7 @@ export const router = createBrowserRouter([
   },
   {
     path: '/register',
-    lazy: () => import('./routes/RegisterHero'),
+    lazy: () => import('./routes/register'),
   },
   {
     path: '*',
diff --git a/client/app/routes/NewManifest/NewManifest.spec.tsx b/client/app/routes/NewManifest/NewManifest.spec.tsx
index 2043f816..d50aa7e2 100644
--- a/client/app/routes/NewManifest/NewManifest.spec.tsx
+++ b/client/app/routes/NewManifest/NewManifest.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import { NewManifest } from '~/routes/NewManifest/NewManifest';
 import { http, HttpResponse } from 'msw';
diff --git a/client/app/routes/README.md b/client/app/routes/README.md
new file mode 100644
index 00000000..ddd96285
--- /dev/null
+++ b/client/app/routes/README.md
@@ -0,0 +1,6 @@
+# What is going on in this directory?
+
+We're currently in the progress of gearing up for react-router v7.
+In light of the [Remix's team announcement that remix v3 will
+**be** react-router v7](https://remix.run/blog/merging-remix-and-react-router), we are preparing for
+a transition to file based routes.
diff --git a/client/app/routes/About/About.tsx b/client/app/routes/about/About.tsx
similarity index 100%
rename from client/app/routes/About/About.tsx
rename to client/app/routes/about/About.tsx
diff --git a/client/app/routes/About/index.ts b/client/app/routes/about/index.ts
similarity index 100%
rename from client/app/routes/About/index.ts
rename to client/app/routes/about/index.ts
diff --git a/client/app/routes/Dashboard/Dashboard.spec.tsx b/client/app/routes/dashboard/Dashboard.spec.tsx
similarity index 93%
rename from client/app/routes/Dashboard/Dashboard.spec.tsx
rename to client/app/routes/dashboard/Dashboard.spec.tsx
index 324574a1..de459ed4 100644
--- a/client/app/routes/Dashboard/Dashboard.spec.tsx
+++ b/client/app/routes/dashboard/Dashboard.spec.tsx
@@ -1,5 +1,4 @@
-import '@testing-library/jest-dom';
-import { Dashboard } from '~/routes/Dashboard/Dashboard';
+import { Dashboard } from './Dashboard';
 import { setupServer } from 'msw/node';
 import React, { createElement } from 'react';
 import { cleanup, renderWithProviders, screen } from 'app/mocks';
diff --git a/client/app/routes/Dashboard/Dashboard.tsx b/client/app/routes/dashboard/Dashboard.tsx
similarity index 100%
rename from client/app/routes/Dashboard/Dashboard.tsx
rename to client/app/routes/dashboard/Dashboard.tsx
diff --git a/client/app/routes/Dashboard/index.ts b/client/app/routes/dashboard/index.ts
similarity index 51%
rename from client/app/routes/Dashboard/index.ts
rename to client/app/routes/dashboard/index.ts
index 1db2db83..732f5b95 100644
--- a/client/app/routes/Dashboard/index.ts
+++ b/client/app/routes/dashboard/index.ts
@@ -1,4 +1,4 @@
-import { Dashboard } from '~/routes/Dashboard/Dashboard';
+import { Dashboard } from './Dashboard';
 
 export { Dashboard as Component };
 export default Dashboard;
diff --git a/client/app/routes/Login/Login.tsx b/client/app/routes/login/Login.tsx
similarity index 100%
rename from client/app/routes/Login/Login.tsx
rename to client/app/routes/login/Login.tsx
diff --git a/client/app/routes/Login/index.ts b/client/app/routes/login/index.ts
similarity index 100%
rename from client/app/routes/Login/index.ts
rename to client/app/routes/login/index.ts
diff --git a/client/app/routes/Login/login.spec.tsx b/client/app/routes/login/login.spec.tsx
similarity index 85%
rename from client/app/routes/Login/login.spec.tsx
rename to client/app/routes/login/login.spec.tsx
index ff8c39ff..f6f4e368 100644
--- a/client/app/routes/Login/login.spec.tsx
+++ b/client/app/routes/login/login.spec.tsx
@@ -1,7 +1,6 @@
-import '@testing-library/jest-dom';
 import React from 'react';
 import { renderWithProviders, screen } from 'app/mocks';
-import { Login } from '~/routes/Login';
+import { Login } from 'app/routes/login';
 import { describe, expect, test } from 'vitest';
 
 describe('Login component', () => {
diff --git a/client/app/routes/org/Org.spec.tsx b/client/app/routes/org/Org.spec.tsx
new file mode 100644
index 00000000..fe4524b9
--- /dev/null
+++ b/client/app/routes/org/Org.spec.tsx
@@ -0,0 +1,49 @@
+import { useSearchParams } from 'react-router-dom';
+import { Org } from './Org';
+import { afterAll, afterEach, beforeAll, describe, expect, it, Mock, vi } from 'vitest';
+import { cleanup, renderWithProviders } from '~/mocks';
+import { setupServer } from 'msw/node';
+import { mockSiteEndpoints } from '~/mocks/handlers';
+import { waitFor } from '@testing-library/react';
+
+const server = setupServer(...mockSiteEndpoints);
+afterEach(() => cleanup());
+beforeAll(() => server.listen());
+afterAll(() => server.close());
+
+describe('Org', () => {
+  vi.mock('react-router-dom', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('react-router-dom')>()),
+    useSearchParams: vi.fn(),
+  }));
+  it('sets default org search param if not present', async () => {
+    const setSearchParams = vi.fn();
+    const searchParams = new URLSearchParams();
+    (useSearchParams as Mock).mockReturnValue([searchParams, setSearchParams]);
+
+    renderWithProviders(<Org />);
+
+    await waitFor(() => expect(setSearchParams).toHaveBeenCalled(), { timeout: 400 });
+  });
+
+  it('does not change org search param if already present', () => {
+    const setSearchParams = vi.fn();
+    const searchParams = new URLSearchParams('org=existing');
+    (useSearchParams as Mock).mockReturnValue([searchParams, setSearchParams]);
+
+    renderWithProviders(<Org />);
+
+    expect(setSearchParams).not.toHaveBeenCalled();
+  });
+
+  it('removes org search param if it does not match any existing org', async () => {
+    const setSearchParams = vi.fn();
+    const searchParams = new URLSearchParams('org=nonexistent');
+    (useSearchParams as Mock).mockReturnValue([searchParams, setSearchParams]);
+
+    renderWithProviders(<Org />);
+
+    await waitFor(() => expect(setSearchParams).toHaveBeenCalled(), { timeout: 400 });
+    expect(setSearchParams).toHaveBeenCalled();
+  });
+});
diff --git a/client/app/routes/org/Org.tsx b/client/app/routes/org/Org.tsx
new file mode 100644
index 00000000..dd748aa4
--- /dev/null
+++ b/client/app/routes/org/Org.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { LoaderFunction, Outlet } from 'react-router-dom';
+import { rootStore as store } from '~/store';
+import { haztrakApi } from '~/store/htApi.slice';
+import { useOrg } from '~/hooks/useOrg/useOrg';
+
+export const orgsLoader: LoaderFunction = async () => {
+  const p = store.dispatch(haztrakApi.endpoints.getOrgs.initiate());
+
+  try {
+    return await p.unwrap();
+  } catch (_error) {
+    console.error('Error fetching orgs');
+    throw Error('Error fetching orgs');
+  } finally {
+    p.unsubscribe();
+  }
+};
+
+export const Org = () => {
+  useOrg();
+
+  return <Outlet />;
+};
diff --git a/client/app/routes/org/index.ts b/client/app/routes/org/index.ts
new file mode 100644
index 00000000..3c2af7ed
--- /dev/null
+++ b/client/app/routes/org/index.ts
@@ -0,0 +1,6 @@
+import { Org } from './Org';
+
+export { orgsLoader } from './Org';
+
+export { Org as Component };
+export default Org;
diff --git a/client/app/routes/Profile/Profile.tsx b/client/app/routes/profile/Profile.tsx
similarity index 100%
rename from client/app/routes/Profile/Profile.tsx
rename to client/app/routes/profile/Profile.tsx
diff --git a/client/app/routes/Profile/index.ts b/client/app/routes/profile/index.ts
similarity index 100%
rename from client/app/routes/Profile/index.ts
rename to client/app/routes/profile/index.ts
diff --git a/client/app/routes/RegisterHero/RegisterHero.tsx b/client/app/routes/register/RegisterHero.tsx
similarity index 100%
rename from client/app/routes/RegisterHero/RegisterHero.tsx
rename to client/app/routes/register/RegisterHero.tsx
diff --git a/client/app/routes/RegisterHero/index.ts b/client/app/routes/register/index.ts
similarity index 50%
rename from client/app/routes/RegisterHero/index.ts
rename to client/app/routes/register/index.ts
index 38dbc2fb..53e17bec 100644
--- a/client/app/routes/RegisterHero/index.ts
+++ b/client/app/routes/register/index.ts
@@ -1,4 +1,4 @@
-import { RegisterHero } from '~/routes/RegisterHero/RegisterHero';
+import { RegisterHero } from '~/routes/register/RegisterHero';
 
 export { RegisterHero as Component };
 export default RegisterHero;
diff --git a/client/app/store/authSlice/auth.slice.spec.tsx b/client/app/store/authSlice/auth.slice.spec.tsx
index e36c46f8..2bdf1f2c 100644
--- a/client/app/store/authSlice/auth.slice.spec.tsx
+++ b/client/app/store/authSlice/auth.slice.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 import {
   removeCredentials,
diff --git a/client/app/store/htApi.slice.ts b/client/app/store/htApi.slice.ts
index cae32ec4..577f87dc 100644
--- a/client/app/store/htApi.slice.ts
+++ b/client/app/store/htApi.slice.ts
@@ -125,6 +125,11 @@ export const haztrakApi = createApi({
       providesTags: ['org'],
     }),
     // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getOrgs: build.query<Organization[], void>({
+      query: () => ({ url: 'orgs', method: 'get' }),
+      providesTags: ['org'],
+    }),
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
     getUserHaztrakSites: build.query<HaztrakSite[], void>({
       query: () => ({ url: 'site', method: 'get' }),
       providesTags: ['site'],
diff --git a/client/app/store/index.ts b/client/app/store/index.ts
index cef4e8e7..02ad351d 100644
--- a/client/app/store/index.ts
+++ b/client/app/store/index.ts
@@ -25,6 +25,7 @@ export const {
   useUpdateManifestMutation,
   useGetManifestQuery,
   useGetRcrainfoSiteQuery,
+  useGetOrgsQuery,
 } = haztrakApi;
 
 export const {
diff --git a/client/app/store/manifestSlice/manifest.slice.spec.tsx b/client/app/store/manifestSlice/manifest.slice.spec.tsx
index f1702f33..38ab64ef 100644
--- a/client/app/store/manifestSlice/manifest.slice.spec.tsx
+++ b/client/app/store/manifestSlice/manifest.slice.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { useAppSelector } from '~/store';
 import reducer, {
   ManifestSlice,
diff --git a/client/app/store/userSlice/user.slice.spec.tsx b/client/app/store/userSlice/user.slice.spec.tsx
index 1f5f1d22..1d980eb3 100644
--- a/client/app/store/userSlice/user.slice.spec.tsx
+++ b/client/app/store/userSlice/user.slice.spec.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { waitFor } from '@testing-library/react';
 import { setupServer } from 'msw/node';
 import { useEffect, useState } from 'react';
diff --git a/client/package-lock.json b/client/package-lock.json
index 1f27d8e6..e94a6d43 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -28,7 +28,7 @@
         "react-router-dom": "^6.24.1",
         "react-select": "^5.8.0",
         "react-toastify": "^10.0.5",
-        "recharts": "^2.12.7",
+        "recharts": "^2.13.0-alpha.4",
         "sass": "^1.77.6",
         "uuid": "^10.0.0",
         "zod": "^3.23.8"
@@ -6909,14 +6909,15 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.7.tgz",
-      "integrity": "sha512-hlLJMhPQfv4/3NBSAyq3gzGg4h2v69RJh6KU7b3pXYNNAELs9kEoXOjbkxdXpALqKBoVmVptGfLpxdaVYqjmXQ==",
+      "version": "2.13.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.13.0-alpha.4.tgz",
+      "integrity": "sha512-K9naL6F7pEcDYJE6yFQASSCQecSLPP0JagnvQ9hPtA/aHgsxsnIOjouLP5yrFZehxzfCkV5TEORr7/uNtSr7Qw==",
+      "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.21",
-        "react-is": "^16.10.2",
+        "react-is": "^18.3.1",
         "react-smooth": "^4.0.0",
         "recharts-scale": "^0.4.4",
         "tiny-invariant": "^1.3.1",
@@ -6939,9 +6940,10 @@
       }
     },
     "node_modules/recharts/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
     },
     "node_modules/redent": {
       "version": "3.0.0",
diff --git a/client/package.json b/client/package.json
index a18cd403..f9da421c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -37,7 +37,7 @@
     "react-router-dom": "^6.24.1",
     "react-select": "^5.8.0",
     "react-toastify": "^10.0.5",
-    "recharts": "^2.12.7",
+    "recharts": "^2.13.0-alpha.4",
     "sass": "^1.77.6",
     "uuid": "^10.0.0",
     "zod": "^3.23.8"