diff --git a/awx/ui_next/CONTRIBUTING.md b/awx/ui_next/CONTRIBUTING.md
index b5dd40d386..15aaa783fe 100644
--- a/awx/ui_next/CONTRIBUTING.md
+++ b/awx/ui_next/CONTRIBUTING.md
@@ -156,6 +156,7 @@ Inside these folders, the internal structure is:
 - **/api** - All classes used to interact with API's are found here. See [AWX REST API Interaction](#awx-rest-api-interaction) for more information.
 - **/components** - All generic components that are meant to be used in multiple contexts throughout awx. Things like buttons, tabs go here.
 - **/contexts** - Components which utilize react's context api.
+- **/hooks** - Custom react [hooks](https://reactjs.org/docs/hooks-custom.html)
 - **/locales** - [Internationalization](#internationalization) config and source files.
 - **/screens** - Based on the various routes of awx.
   - **/shared** - Components that are meant to be used specifically by a particular route, but might be sharable across pages of that route. For example, a form component which is used on both add and edit screens.
diff --git a/awx/ui_next/src/components/About/About.js b/awx/ui_next/src/components/About/About.js
index f996fc7457..39842f0623 100644
--- a/awx/ui_next/src/components/About/About.js
+++ b/awx/ui_next/src/components/About/About.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { t } from '@lingui/macro';
 import { AboutModal } from '@patternfly/react-core';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 
 function About({ version, isOpen, onClose }) {
   const brandName = useBrandName();
diff --git a/awx/ui_next/src/components/About/About.test.js b/awx/ui_next/src/components/About/About.test.js
index d2cb8a4637..baf7392948 100644
--- a/awx/ui_next/src/components/About/About.test.js
+++ b/awx/ui_next/src/components/About/About.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import About from './About';
 
-jest.mock('../../util/useBrandName', () => ({
+jest.mock('../../hooks/useBrandName', () => ({
   __esModule: true,
   default: () => ({
     current: 'AWX',
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.js b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.js
index 7104cfb6da..f3bddc6abf 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.js
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, DropdownItem } from '@patternfly/react-core';
 
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { InventoriesAPI, CredentialTypesAPI } from 'api';
 
 import { KebabifiedContext } from 'contexts/Kebabified';
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.js b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.js
index 7389e6a93d..94a8038b54 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.js
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.js
@@ -7,7 +7,7 @@ import { useField } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import Popover from '../Popover';
 
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.js b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.js
index 155f6c77a2..0b92e14d84 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.js
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.js
@@ -7,7 +7,7 @@ import { useField } from 'formik';
 import { Form, FormGroup, Switch, Checkbox } from '@patternfly/react-core';
 import styled from 'styled-components';
 import { required } from 'util/validators';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 import AnsibleSelect from '../AnsibleSelect';
 import FormField from '../FormField';
 import { VariablesField } from '../CodeEditor';
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js
index d2d4e54029..6e75c618c4 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js
@@ -6,7 +6,7 @@ import { Form, FormGroup } from '@patternfly/react-core';
 import { ExecutionEnvironmentsAPI } from 'api';
 
 import { parseQueryString, getQSConfig, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import ContentError from '../ContentError';
 import ContentLoading from '../ContentLoading';
diff --git a/awx/ui_next/src/components/AddRole/SelectResourceStep.js b/awx/ui_next/src/components/AddRole/SelectResourceStep.js
index dfaefeb16d..6121a7abae 100644
--- a/awx/ui_next/src/components/AddRole/SelectResourceStep.js
+++ b/awx/ui_next/src/components/AddRole/SelectResourceStep.js
@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SearchColumns, SortColumns } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import DataListToolbar from '../DataListToolbar';
diff --git a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.js b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.js
index 1682469ef0..487ec0f0c6 100644
--- a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.js
+++ b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.js
@@ -21,7 +21,7 @@ import {
   UserIcon,
 } from '@patternfly/react-icons';
 import { WorkflowApprovalsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import getDocsBaseUrl from 'util/getDocsBaseUrl';
 import { useConfig } from 'contexts/Config';
 import useWsPendingApprovalCount from './useWsPendingApprovalCount';
diff --git a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js b/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js
index 443a311823..da0f713ef4 100644
--- a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js
+++ b/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 
 export default function useWsPendingApprovalCount(
   initialCount,
diff --git a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.test.js b/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.test.js
index 51091a12d2..1a1d5cd1b6 100644
--- a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.test.js
+++ b/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.test.js
@@ -23,7 +23,7 @@ describe('useWsPendingApprovalCount hook', () => {
       Jest mock timers don’t play well with jest-websocket-mock,
       so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../util/useThrottle', () => ({
+    jest.mock('../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));
diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.js b/awx/ui_next/src/components/AssociateModal/AssociateModal.js
index e959d6395a..57330f4f01 100644
--- a/awx/ui_next/src/components/AssociateModal/AssociateModal.js
+++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.js
@@ -3,9 +3,9 @@ import { useHistory } from 'react-router-dom';
 
 import { t } from '@lingui/macro';
 import { Button, Modal } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import OptionsList from '../OptionsList';
 
 const QS_CONFIG = (order_by = 'name') => {
diff --git a/awx/ui_next/src/components/CopyButton/CopyButton.js b/awx/ui_next/src/components/CopyButton/CopyButton.js
index 021f1a8e81..a6caa26a7e 100644
--- a/awx/ui_next/src/components/CopyButton/CopyButton.js
+++ b/awx/ui_next/src/components/CopyButton/CopyButton.js
@@ -3,7 +3,7 @@ import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { CopyIcon } from '@patternfly/react-icons';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
 
diff --git a/awx/ui_next/src/components/HostToggle/HostToggle.js b/awx/ui_next/src/components/HostToggle/HostToggle.js
index d590583fc9..1085f5659d 100644
--- a/awx/ui_next/src/components/HostToggle/HostToggle.js
+++ b/awx/ui_next/src/components/HostToggle/HostToggle.js
@@ -3,7 +3,7 @@ import React, { Fragment, useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { HostsAPI } from 'api';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
diff --git a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.js b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.js
index 476c55d694..9ff2f6ec8f 100644
--- a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.js
+++ b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstancesAPI } from 'api';
 import { useConfig } from 'contexts/Config';
 import ErrorDetail from '../ErrorDetail';
diff --git a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.js b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.js
index 7e0d470d06..beab662f81 100644
--- a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.js
+++ b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.js
@@ -3,7 +3,7 @@ import { t } from '@lingui/macro';
 import { MinusCircleIcon } from '@patternfly/react-icons';
 import { Button, Tooltip } from '@patternfly/react-core';
 import { getJobModel } from 'util/jobs';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
 
diff --git a/awx/ui_next/src/components/JobList/JobList.js b/awx/ui_next/src/components/JobList/JobList.js
index c150f6eea7..c2c4c4606e 100644
--- a/awx/ui_next/src/components/JobList/JobList.js
+++ b/awx/ui_next/src/components/JobList/JobList.js
@@ -6,10 +6,10 @@ import { Card } from '@patternfly/react-core';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
+} from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
-import useSelected from 'util/useSelected';
-import useExpanded from 'util/useExpanded';
+import useSelected from 'hooks/useSelected';
+import useExpanded from 'hooks/useExpanded';
 import { isJobRunning, getJobModel } from 'util/jobs';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { UnifiedJobsAPI } from 'api';
diff --git a/awx/ui_next/src/components/JobList/useWsJobs.js b/awx/ui_next/src/components/JobList/useWsJobs.js
index e2bd5ff137..d1bd5a5ded 100644
--- a/awx/ui_next/src/components/JobList/useWsJobs.js
+++ b/awx/ui_next/src/components/JobList/useWsJobs.js
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 import { parseQueryString } from 'util/qs';
 import sortJobs from './sortJobs';
 
diff --git a/awx/ui_next/src/components/JobList/useWsJobs.test.js b/awx/ui_next/src/components/JobList/useWsJobs.test.js
index f88e4c822f..3cc6dc1b72 100644
--- a/awx/ui_next/src/components/JobList/useWsJobs.test.js
+++ b/awx/ui_next/src/components/JobList/useWsJobs.test.js
@@ -21,7 +21,7 @@ describe('useWsJobs hook', () => {
       Jest mock timers don’t play well with jest-websocket-mock,
       so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../util/useThrottle', () => ({
+    jest.mock('../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));
diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.js b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.js
index 0f2fb1aedf..042917523b 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.js
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ExpandableSection, Wizard } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
-import { useDismissableError } from 'util/useRequest';
+import { useDismissableError } from 'hooks/useRequest';
 import mergeExtraVars from 'util/prompt/mergeExtraVars';
 import getSurveyValues from 'util/prompt/getSurveyValues';
 import ContentLoading from '../ContentLoading';
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.js b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.js
index e04efda7a6..ae777a5a0e 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.js
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.js
@@ -8,7 +8,7 @@ import styled from 'styled-components';
 import { Alert, ToolbarItem } from '@patternfly/react-core';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import AnsibleSelect from '../../AnsibleSelect';
 import OptionsList from '../../OptionsList';
 import ContentLoading from '../../ContentLoading';
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.js b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.js
index d391b326c5..cf1f45dce2 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.js
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.js
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Alert } from '@patternfly/react-core';
 import { InventoriesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import OptionsList from '../../OptionsList';
 import ContentLoading from '../../ContentLoading';
 import ContentError from '../../ContentError';
diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.js b/awx/ui_next/src/components/Lookup/ApplicationLookup.js
index 6a5b98d1b6..2a78c63cbf 100644
--- a/awx/ui_next/src/components/Lookup/ApplicationLookup.js
+++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.js
@@ -6,7 +6,7 @@ import { FormGroup } from '@patternfly/react-core';
 import { ApplicationsAPI } from 'api';
 import { Application } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';
 import LookupErrorMessage from './shared/LookupErrorMessage';
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.js b/awx/ui_next/src/components/Lookup/CredentialLookup.js
index 68b1c00eeb..d76c4ba800 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.js
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.js
@@ -15,8 +15,8 @@ import { FormGroup } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
 import { Credential } from 'types';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
-import useRequest from 'util/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';
diff --git a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.js b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.js
index 0d4de7dec7..2636915750 100644
--- a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.js
+++ b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.js
@@ -6,7 +6,7 @@ import { FormGroup, Tooltip } from '@patternfly/react-core';
 import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api';
 import { ExecutionEnvironment } from 'types';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import OptionsList from '../OptionsList';
 
diff --git a/awx/ui_next/src/components/Lookup/HostFilterLookup.js b/awx/ui_next/src/components/Lookup/HostFilterLookup.js
index ee232aecbb..3ca74cb37b 100644
--- a/awx/ui_next/src/components/Lookup/HostFilterLookup.js
+++ b/awx/ui_next/src/components/Lookup/HostFilterLookup.js
@@ -16,7 +16,7 @@ import {
 } from '@patternfly/react-core';
 import { HostsAPI } from 'api';
 import { getQSConfig, mergeParams, parseQueryString } from 'util/qs';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import ChipGroup from '../ChipGroup';
 import Popover from '../Popover';
 import DataListToolbar from '../DataListToolbar';
diff --git a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.js b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.js
index 96f9e857b0..9af24e872c 100644
--- a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.js
+++ b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.js
@@ -7,7 +7,7 @@ import { FormGroup } from '@patternfly/react-core';
 import { InstanceGroupsAPI } from 'api';
 import { InstanceGroup } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import OptionsList from '../OptionsList';
 import Lookup from './Lookup';
diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.js b/awx/ui_next/src/components/Lookup/InventoryLookup.js
index d5947af4d0..30fb3df9ac 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.js
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.js
@@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { InventoriesAPI } from 'api';
 import { Inventory } from 'types';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';
diff --git a/awx/ui_next/src/components/Lookup/Lookup.js b/awx/ui_next/src/components/Lookup/Lookup.js
index d8865373b9..b0cfee323b 100644
--- a/awx/ui_next/src/components/Lookup/Lookup.js
+++ b/awx/ui_next/src/components/Lookup/Lookup.js
@@ -22,7 +22,7 @@ import {
 } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
-import useDebounce from 'util/useDebounce';
+import useDebounce from 'hooks/useDebounce';
 import { QSConfig } from 'types';
 import ChipGroup from '../ChipGroup';
 import reducer, { initReducer } from './shared/reducer';
diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.js b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.js
index dbad506f98..2a436e010b 100644
--- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.js
+++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.js
@@ -5,9 +5,9 @@ import PropTypes from 'prop-types';
 import { t } from '@lingui/macro';
 import { ToolbarItem, Alert } from '@patternfly/react-core';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import AnsibleSelect from '../AnsibleSelect';
 import CredentialChip from '../CredentialChip';
 import OptionsList from '../OptionsList';
diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.js b/awx/ui_next/src/components/Lookup/OrganizationLookup.js
index 347907d629..78650465e1 100644
--- a/awx/ui_next/src/components/Lookup/OrganizationLookup.js
+++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.js
@@ -6,8 +6,8 @@ import { FormGroup } from '@patternfly/react-core';
 import { OrganizationsAPI } from 'api';
 import { Organization } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
 import OptionsList from '../OptionsList';
 import Lookup from './Lookup';
 import LookupErrorMessage from './shared/LookupErrorMessage';
diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.js b/awx/ui_next/src/components/Lookup/ProjectLookup.js
index 7e96fcc768..631d46494c 100644
--- a/awx/ui_next/src/components/Lookup/ProjectLookup.js
+++ b/awx/ui_next/src/components/Lookup/ProjectLookup.js
@@ -5,8 +5,8 @@ import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { ProjectsAPI } from 'api';
 import { Project } from 'types';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
-import useRequest from 'util/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import OptionsList from '../OptionsList';
 import Popover from '../Popover';
diff --git a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js b/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
index 6244e55c2a..55b6c3b4c9 100644
--- a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
+++ b/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 
 /*
   Hook for using PatternFly's <Select> component when a pre-existing value
diff --git a/awx/ui_next/src/components/NotificationList/NotificationList.js b/awx/ui_next/src/components/NotificationList/NotificationList.js
index ca05d4fbe2..81aad8a797 100644
--- a/awx/ui_next/src/components/NotificationList/NotificationList.js
+++ b/awx/ui_next/src/components/NotificationList/NotificationList.js
@@ -4,7 +4,7 @@ import { number, shape, bool } from 'prop-types';
 
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { NotificationTemplatesAPI } from 'api';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.js b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.js
index 4725d757d3..e99f160b21 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.js
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.js
@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { RolesAPI, TeamsAPI, UsersAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import AddResourceRole from '../AddRole/AddResourceRole';
 import AlertModal from '../AlertModal';
 import DataListToolbar from '../DataListToolbar';
diff --git a/awx/ui_next/src/components/Schedule/Schedule.js b/awx/ui_next/src/components/Schedule/Schedule.js
index 926d16e8ce..d362544ba4 100644
--- a/awx/ui_next/src/components/Schedule/Schedule.js
+++ b/awx/ui_next/src/components/Schedule/Schedule.js
@@ -11,7 +11,7 @@ import {
 } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { SchedulesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from '../RoutedTabs';
 import ContentError from '../ContentError';
 import ContentLoading from '../ContentLoading';
diff --git a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.js b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.js
index 8ca59a79ec..3f426faae0 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.js
+++ b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.js
@@ -8,7 +8,7 @@ import { t } from '@lingui/macro';
 import { Chip, Divider, Title, Button } from '@patternfly/react-core';
 import { Schedule } from 'types';
 import { formatDateString } from 'util/dates';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { JobTemplatesAPI, SchedulesAPI, WorkflowJobTemplatesAPI } from 'api';
 import { parseVariableField, jsonToYaml } from 'util/yaml';
 import AlertModal from '../../AlertModal';
diff --git a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.js b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.js
index 5e3a42bf25..d60a10d423 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.js
+++ b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.js
@@ -4,8 +4,8 @@ import { bool, func } from 'prop-types';
 
 import { t } from '@lingui/macro';
 import { SchedulesAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import AlertModal from '../../AlertModal';
 import ErrorDetail from '../../ErrorDetail';
diff --git a/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.js b/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.js
index 19a1afdb2e..19008c0417 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.js
+++ b/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.js
@@ -3,7 +3,7 @@ import React, { Fragment, useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SchedulesAPI } from 'api';
 import AlertModal from '../../AlertModal';
 import ErrorDetail from '../../ErrorDetail';
diff --git a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.js b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.js
index b810483586..39e18e4d82 100644
--- a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.js
+++ b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.js
@@ -14,7 +14,7 @@ import {
 import { Config } from 'contexts/Config';
 import { SchedulesAPI } from 'api';
 import { dateToInputDateTime } from 'util/dates';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import { parseVariableField } from 'util/yaml';
 import AnsibleSelect from '../../AnsibleSelect';
diff --git a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.js b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.js
index 0ff6674d6e..1931e88d4c 100644
--- a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.js
+++ b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ExpandableSection, Wizard } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { useFormikContext } from 'formik';
-import { useDismissableError } from 'util/useRequest';
+import { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../../AlertModal';
 import ContentError from '../../ContentError';
 import ContentLoading from '../../ContentLoading';
diff --git a/awx/ui_next/src/components/TemplateList/TemplateList.js b/awx/ui_next/src/components/TemplateList/TemplateList.js
index 71d1ff5969..dea3ae1182 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateList.js
+++ b/awx/ui_next/src/components/TemplateList/TemplateList.js
@@ -7,11 +7,11 @@ import {
   UnifiedJobTemplatesAPI,
   WorkflowJobTemplatesAPI,
 } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
-import useExpanded from 'util/useExpanded';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
+import useExpanded from 'hooks/useExpanded';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useWsTemplates from 'util/useWsTemplates';
+import useWsTemplates from 'hooks/useWsTemplates';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import AlertModal from '../AlertModal';
 import DatalistToolbar from '../DataListToolbar';
diff --git a/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.js b/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.js
index 9cee313ac9..1c3068bfa0 100644
--- a/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.js
+++ b/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.js
@@ -2,8 +2,8 @@ import React, { useState, useCallback } from 'react';
 import { t } from '@lingui/macro';
 import { useParams } from 'react-router-dom';
 import styled from 'styled-components';
-import useRequest from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import SelectableCard from '../SelectableCard';
 import Wizard from '../Wizard/Wizard';
 import SelectResourceStep from '../AddRole/SelectResourceStep';
diff --git a/awx/ui_next/src/contexts/Config.js b/awx/ui_next/src/contexts/Config.js
index cf03faa175..5b153edd09 100644
--- a/awx/ui_next/src/contexts/Config.js
+++ b/awx/ui_next/src/contexts/Config.js
@@ -4,7 +4,7 @@ import { useRouteMatch } from 'react-router-dom';
 import { t } from '@lingui/macro';
 
 import { ConfigAPI, MeAPI, UsersAPI, OrganizationsAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
 import { useSession } from './Session';
diff --git a/awx/ui_next/src/util/useAutoPopulateLookup.js b/awx/ui_next/src/hooks/useAutoPopulateLookup.js
similarity index 100%
rename from awx/ui_next/src/util/useAutoPopulateLookup.js
rename to awx/ui_next/src/hooks/useAutoPopulateLookup.js
diff --git a/awx/ui_next/src/util/useBrandName.js b/awx/ui_next/src/hooks/useBrandName.js
similarity index 100%
rename from awx/ui_next/src/util/useBrandName.js
rename to awx/ui_next/src/hooks/useBrandName.js
diff --git a/awx/ui_next/src/util/useDebounce.js b/awx/ui_next/src/hooks/useDebounce.js
similarity index 100%
rename from awx/ui_next/src/util/useDebounce.js
rename to awx/ui_next/src/hooks/useDebounce.js
diff --git a/awx/ui_next/src/util/useDebounce.test.js b/awx/ui_next/src/hooks/useDebounce.test.js
similarity index 100%
rename from awx/ui_next/src/util/useDebounce.test.js
rename to awx/ui_next/src/hooks/useDebounce.test.js
diff --git a/awx/ui_next/src/util/useExpanded.js b/awx/ui_next/src/hooks/useExpanded.js
similarity index 100%
rename from awx/ui_next/src/util/useExpanded.js
rename to awx/ui_next/src/hooks/useExpanded.js
diff --git a/awx/ui_next/src/util/useExpanded.test.js b/awx/ui_next/src/hooks/useExpanded.test.js
similarity index 100%
rename from awx/ui_next/src/util/useExpanded.test.js
rename to awx/ui_next/src/hooks/useExpanded.test.js
diff --git a/awx/ui_next/src/util/useInterval.js b/awx/ui_next/src/hooks/useInterval.js
similarity index 100%
rename from awx/ui_next/src/util/useInterval.js
rename to awx/ui_next/src/hooks/useInterval.js
diff --git a/awx/ui_next/src/util/useIsMounted.js b/awx/ui_next/src/hooks/useIsMounted.js
similarity index 100%
rename from awx/ui_next/src/util/useIsMounted.js
rename to awx/ui_next/src/hooks/useIsMounted.js
diff --git a/awx/ui_next/src/util/useModal.js b/awx/ui_next/src/hooks/useModal.js
similarity index 100%
rename from awx/ui_next/src/util/useModal.js
rename to awx/ui_next/src/hooks/useModal.js
diff --git a/awx/ui_next/src/util/useModal.test.js b/awx/ui_next/src/hooks/useModal.test.js
similarity index 100%
rename from awx/ui_next/src/util/useModal.test.js
rename to awx/ui_next/src/hooks/useModal.test.js
diff --git a/awx/ui_next/src/util/useRequest.js b/awx/ui_next/src/hooks/useRequest.js
similarity index 98%
rename from awx/ui_next/src/util/useRequest.js
rename to awx/ui_next/src/hooks/useRequest.js
index 22809f5b78..fca9da0a7a 100644
--- a/awx/ui_next/src/util/useRequest.js
+++ b/awx/ui_next/src/hooks/useRequest.js
@@ -1,6 +1,6 @@
 import { useEffect, useState, useCallback } from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
-import { parseQueryString, updateQueryString } from './qs';
+import { parseQueryString, updateQueryString } from 'util/qs';
 import useIsMounted from './useIsMounted';
 
 /*
diff --git a/awx/ui_next/src/util/useRequest.test.js b/awx/ui_next/src/hooks/useRequest.test.js
similarity index 100%
rename from awx/ui_next/src/util/useRequest.test.js
rename to awx/ui_next/src/hooks/useRequest.test.js
diff --git a/awx/ui_next/src/util/useSelected.js b/awx/ui_next/src/hooks/useSelected.js
similarity index 100%
rename from awx/ui_next/src/util/useSelected.js
rename to awx/ui_next/src/hooks/useSelected.js
diff --git a/awx/ui_next/src/util/useSelected.test.js b/awx/ui_next/src/hooks/useSelected.test.js
similarity index 100%
rename from awx/ui_next/src/util/useSelected.test.js
rename to awx/ui_next/src/hooks/useSelected.test.js
diff --git a/awx/ui_next/src/util/useThrottle.js b/awx/ui_next/src/hooks/useThrottle.js
similarity index 100%
rename from awx/ui_next/src/util/useThrottle.js
rename to awx/ui_next/src/hooks/useThrottle.js
diff --git a/awx/ui_next/src/util/useWebsocket.js b/awx/ui_next/src/hooks/useWebsocket.js
similarity index 100%
rename from awx/ui_next/src/util/useWebsocket.js
rename to awx/ui_next/src/hooks/useWebsocket.js
diff --git a/awx/ui_next/src/util/useWsTemplates.js b/awx/ui_next/src/hooks/useWsTemplates.js
similarity index 100%
rename from awx/ui_next/src/util/useWsTemplates.js
rename to awx/ui_next/src/hooks/useWsTemplates.js
diff --git a/awx/ui_next/src/util/useWsTemplates.test.js b/awx/ui_next/src/hooks/useWsTemplates.test.js
similarity index 100%
rename from awx/ui_next/src/util/useWsTemplates.test.js
rename to awx/ui_next/src/hooks/useWsTemplates.test.js
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStream.js b/awx/ui_next/src/screens/ActivityStream/ActivityStream.js
index 2b61d34ad4..6253b05c47 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStream.js
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStream.js
@@ -18,7 +18,7 @@ import PaginatedTable, {
   HeaderRow,
   HeaderCell,
 } from 'components/PaginatedTable';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString, updateQueryString } from 'util/qs';
 import { ActivityStreamAPI } from 'api';
 
diff --git a/awx/ui_next/src/screens/Application/Application/Application.js b/awx/ui_next/src/screens/Application/Application/Application.js
index 7012b2f528..e83898dfb3 100644
--- a/awx/ui_next/src/screens/Application/Application/Application.js
+++ b/awx/ui_next/src/screens/Application/Application/Application.js
@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ApplicationsAPI } from 'api';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
diff --git a/awx/ui_next/src/screens/Application/ApplicationAdd/ApplicationAdd.js b/awx/ui_next/src/screens/Application/ApplicationAdd/ApplicationAdd.js
index 780450a07d..2b224261b1 100644
--- a/awx/ui_next/src/screens/Application/ApplicationAdd/ApplicationAdd.js
+++ b/awx/ui_next/src/screens/Application/ApplicationAdd/ApplicationAdd.js
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
 import { Card, PageSection } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import { ApplicationsAPI } from 'api';
 import { CardBody } from 'components/Card';
diff --git a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.js b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.js
index b6d52ca3a6..1ae544d1dc 100644
--- a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.js
+++ b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.js
@@ -4,7 +4,7 @@ import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
 
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
diff --git a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.js b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.js
index 0dc57833ac..ce016a79a9 100644
--- a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.js
+++ b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.js
@@ -11,8 +11,8 @@ import { getQSConfig, parseQueryString } from 'util/qs';
 import { TokensAPI, ApplicationsAPI } from 'api';
 import ErrorDetail from 'components/ErrorDetail';
 import AlertModal from 'components/AlertModal';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import DatalistToolbar from 'components/DataListToolbar';
 import ApplicationTokenListItem from './ApplicationTokenListItem';
 
diff --git a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.js b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.js
index 47d735ec04..d22bfb212d 100644
--- a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.js
+++ b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.js
@@ -5,7 +5,7 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { Card, PageSection } from '@patternfly/react-core';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import ErrorDetail from 'components/ErrorDetail';
 import AlertModal from 'components/AlertModal';
 
@@ -17,7 +17,7 @@ import PaginatedTable, {
   ToolbarDeleteButton,
   ToolbarAddButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 
 import ApplicationListItem from './ApplicationListItem';
 
diff --git a/awx/ui_next/src/screens/Credential/Credential.js b/awx/ui_next/src/screens/Credential/Credential.js
index d6c89a4e5e..2304737dca 100644
--- a/awx/ui_next/src/screens/Credential/Credential.js
+++ b/awx/ui_next/src/screens/Credential/Credential.js
@@ -12,7 +12,7 @@ import {
   Redirect,
   Link,
 } from 'react-router-dom';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ResourceAccessList } from 'components/ResourceAccessList';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.js b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.js
index 927b3460d6..ce7c2a73c2 100644
--- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.js
+++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.js
@@ -9,7 +9,7 @@ import {
   CredentialTypesAPI,
   CredentialsAPI,
 } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import CredentialForm from '../shared/CredentialForm';
 
 function CredentialAdd({ me }) {
diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.js b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.js
index 55e0f7fc9c..f42991f498 100644
--- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.js
+++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.js
@@ -21,7 +21,7 @@ import CredentialChip from 'components/CredentialChip';
 import ErrorDetail from 'components/ErrorDetail';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
 import { Credential } from 'types';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 
 const PluginInputMetadata = styled.div`
diff --git a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.js b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.js
index 6347aa56ab..81fd922432 100644
--- a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.js
+++ b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.js
@@ -10,7 +10,7 @@ import {
 } from 'api';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import { Credential } from 'types';
 import CredentialForm from '../shared/CredentialForm';
diff --git a/awx/ui_next/src/screens/Credential/CredentialList/CredentialList.js b/awx/ui_next/src/screens/Credential/CredentialList/CredentialList.js
index 8965d1fc19..ae8525453f 100644
--- a/awx/ui_next/src/screens/Credential/CredentialList/CredentialList.js
+++ b/awx/ui_next/src/screens/Credential/CredentialList/CredentialList.js
@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 import { t, Plural } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
 import DataListToolbar from 'components/DataListToolbar';
@@ -13,7 +13,7 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import CredentialListItem from './CredentialListItem';
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.js b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.js
index 72a61c304d..8f6506498b 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.js
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.js
@@ -10,7 +10,7 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import CredentialsStep from './CredentialsStep';
 import MetadataStep from './MetadataStep';
 import { CredentialPluginTestAlert } from '..';
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.js b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.js
index a6c8ab5bef..2ed81b9564 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.js
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.js
@@ -8,7 +8,7 @@ import CheckboxListItem from 'components/CheckboxListItem';
 import ContentError from 'components/ContentError';
 import DataListToolbar from 'components/DataListToolbar';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import PaginatedTable, {
   HeaderCell,
   HeaderRow,
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.js b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.js
index 46908ccab2..17ea760707 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.js
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import FormField from 'components/FormField';
 import { FormFullWidthLayout } from 'components/FormLayout';
 import Popover from 'components/Popover';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 
 function MetadataStep() {
diff --git a/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.js b/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.js
index 794ab46457..8d6afe1aca 100644
--- a/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.js
+++ b/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.js
@@ -10,7 +10,7 @@ import FormField from 'components/FormField';
 import { FormFullWidthLayout } from 'components/FormLayout';
 import Popover from 'components/Popover';
 import { required } from 'util/validators';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CredentialPluginTestAlert } from './CredentialPlugins';
 
 function ExternalTestModal({
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialType.js b/awx/ui_next/src/screens/CredentialType/CredentialType.js
index ac19fb5512..07942674f9 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialType.js
+++ b/awx/ui_next/src/screens/CredentialType/CredentialType.js
@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CredentialTypesAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.js b/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.js
index 89ea6c51ba..cd39d3b76f 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.js
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.js
@@ -9,7 +9,7 @@ import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { CredentialTypesAPI } from 'api';
 import { jsonToYaml } from 'util/yaml';
 import {
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.js b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.js
index 3fc164325c..87e86530de 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.js
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.js
@@ -6,8 +6,8 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { CredentialTypesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
diff --git a/awx/ui_next/src/screens/Dashboard/Dashboard.js b/awx/ui_next/src/screens/Dashboard/Dashboard.js
index 73d027ea38..db995835bd 100644
--- a/awx/ui_next/src/screens/Dashboard/Dashboard.js
+++ b/awx/ui_next/src/screens/Dashboard/Dashboard.js
@@ -10,7 +10,7 @@ import {
   TabTitleText,
 } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DashboardAPI } from 'api';
 import ScreenHeader from 'components/ScreenHeader';
 import JobList from 'components/JobList';
diff --git a/awx/ui_next/src/screens/Dashboard/DashboardGraph.js b/awx/ui_next/src/screens/Dashboard/DashboardGraph.js
index 287f94f70c..132b37e6ec 100644
--- a/awx/ui_next/src/screens/Dashboard/DashboardGraph.js
+++ b/awx/ui_next/src/screens/Dashboard/DashboardGraph.js
@@ -13,7 +13,7 @@ import {
   SelectOption,
 } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DashboardAPI } from 'api';
 import ContentLoading from 'components/ContentLoading';
 import LineChart from './shared/LineChart';
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.js b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.js
index df6522e239..846bd31433 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.js
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.js
@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ExecutionEnvironmentsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
index d121748c0f..a290c18349 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
@@ -8,7 +8,7 @@ import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { toTitleCase } from 'util/strings';
 import { ExecutionEnvironmentsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.js b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.js
index ccadb2bfaa..00a5bc0986 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.js
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.js
@@ -5,8 +5,8 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { ExecutionEnvironmentsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.js b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.js
index 97cefec9d5..30e6d5e96a 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.js
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.js
@@ -6,7 +6,7 @@ import { Card } from '@patternfly/react-core';
 
 import { ExecutionEnvironmentsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DatalistToolbar from 'components/DataListToolbar';
 import PaginatedTable, {
   HeaderCell,
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.js b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.js
index a4ef58b52b..575d39dd15 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.js
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.js
@@ -13,7 +13,7 @@ import { OrganizationLookup } from 'components/Lookup';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { required } from 'util/validators';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 function ExecutionEnvironmentFormFields({
   me,
diff --git a/awx/ui_next/src/screens/Host/Host.js b/awx/ui_next/src/screens/Host/Host.js
index d4deeae9ba..e02f73b47f 100644
--- a/awx/ui_next/src/screens/Host/Host.js
+++ b/awx/ui_next/src/screens/Host/Host.js
@@ -16,7 +16,7 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import JobList from 'components/JobList';
 import { HostsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import HostFacts from './HostFacts';
 import HostDetail from './HostDetail';
 import HostEdit from './HostEdit';
diff --git a/awx/ui_next/src/screens/Host/HostFacts/HostFacts.js b/awx/ui_next/src/screens/Host/HostFacts/HostFacts.js
index 1a77abb86b..6b1914e9ec 100644
--- a/awx/ui_next/src/screens/Host/HostFacts/HostFacts.js
+++ b/awx/ui_next/src/screens/Host/HostFacts/HostFacts.js
@@ -7,7 +7,7 @@ import { DetailList } from 'components/DetailList';
 import { VariablesDetail } from 'components/CodeEditor';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { HostsAPI } from 'api';
 
 function HostFacts({ host }) {
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.js b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.js
index 61b4c8ed54..8c4ac3dd70 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.js
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.js
@@ -6,8 +6,8 @@ import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 import useRequest, {
   useDismissableError,
   useDeleteItems,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { HostsAPI, InventoriesAPI } from 'api';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
diff --git a/awx/ui_next/src/screens/Host/HostList/HostList.js b/awx/ui_next/src/screens/Host/HostList/HostList.js
index 3bad971355..6477cbcfc4 100644
--- a/awx/ui_next/src/screens/Host/HostList/HostList.js
+++ b/awx/ui_next/src/screens/Host/HostList/HostList.js
@@ -12,8 +12,8 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { encodeQueryString, getQSConfig, parseQueryString } from 'util/qs';
 
 import HostListItem from './HostListItem';
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.js b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.js
index c468524004..598c4796e6 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.js
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.js
@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupAdd/ContainerGroupAdd.js b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupAdd/ContainerGroupAdd.js
index 7c3d1199b8..c2c7fa6b9f 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupAdd/ContainerGroupAdd.js
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupAdd/ContainerGroupAdd.js
@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
 
 import { CardBody } from 'components/Card';
 import { InstanceGroupsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { jsonToYaml, isJsonString } from 'util/yaml';
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.js b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.js
index 1ed7038053..491ab35d9d 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.js
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.js
@@ -10,7 +10,7 @@ import ErrorDetail from 'components/ErrorDetail';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { jsonToYaml, isJsonString } from 'util/yaml';
 import { InstanceGroupsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
index 8f93fa2695..fea58adbe4 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
@@ -4,7 +4,7 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { CardBody } from 'components/Card';
 import { InstanceGroupsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import ContainerGroupForm from '../shared/ContainerGroupForm';
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.js b/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.js
index ef2f88c905..10e713fb79 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.js
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.js
@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.js b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.js
index 073051e438..9567193b60 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.js
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.js
@@ -15,7 +15,7 @@ import {
   UserDateDetail,
   DetailBadge,
 } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { InstanceGroupsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.js b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.js
index f5534adf5e..a4e1f80703 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.js
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.js
@@ -6,8 +6,8 @@ import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
 
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.js b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.js
index d24eaaccc3..1e871650cd 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.js
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.js
@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 
 import ScreenHeader from 'components/ScreenHeader';
diff --git a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.js b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.js
index f01fd9185e..a860e957fb 100644
--- a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.js
+++ b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.js
@@ -18,8 +18,8 @@ import ErrorDetail from 'components/ErrorDetail';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { InstanceGroupsAPI, InstancesAPI } from 'api';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 
diff --git a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.js b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.js
index 3a5c640c72..8c787a0407 100644
--- a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.js
+++ b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.js
@@ -14,8 +14,8 @@ import { Tr, Td } from '@patternfly/react-table';
 import { ActionsTd, ActionItem } from 'components/PaginatedTable';
 import InstanceToggle from 'components/InstanceToggle';
 import { Instance } from 'types';
-import useRequest, { useDismissableError } from 'util/useRequest';
-import useDebounce from 'util/useDebounce';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
+import useDebounce from 'hooks/useDebounce';
 import { InstancesAPI } from 'api';
 import { useConfig } from 'contexts/Config';
 import AlertModal from 'components/AlertModal';
diff --git a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.test.js b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.test.js
index 251f2cea49..071b177a8c 100644
--- a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.test.js
+++ b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.test.js
@@ -2,13 +2,13 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 
 import { InstancesAPI } from 'api';
-import useDebounce from 'util/useDebounce';
+import useDebounce from 'hooks/useDebounce';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 
 import InstanceListItem from './InstanceListItem';
 
 jest.mock('../../../api');
-jest.mock('../../../util/useDebounce');
+jest.mock('../../../hooks/useDebounce');
 
 const instance = [
   {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.js b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.js
index 3a66426f56..28cff4cc8b 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.js
@@ -13,7 +13,7 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import ChipGroup from 'components/ChipGroup';
 import { InventoriesAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { Inventory } from 'types';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 
diff --git a/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.js b/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.js
index 18f8d74281..9914159ab4 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.js
@@ -5,7 +5,7 @@ import { object } from 'prop-types';
 import { CardBody } from 'components/Card';
 import { InventoriesAPI } from 'api';
 import ContentLoading from 'components/ContentLoading';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import InventoryForm from '../shared/InventoryForm';
 
 function InventoryEdit({ inventory }) {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.js b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.js
index 8d9d79cf50..79185a648c 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.js
@@ -9,8 +9,8 @@ import { GroupsAPI, InventoriesAPI } from 'api';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import AlertModal from 'components/AlertModal';
 import DataListToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.js b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.js
index 03b42c5f8a..e0093da827 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.js
@@ -3,8 +3,8 @@ import { useParams, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { Tooltip } from '@patternfly/react-core';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useSelected from 'util/useSelected';
-import useRequest from 'util/useRequest';
+import useSelected from 'hooks/useSelected';
+import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
 import DataListToolbar from 'components/DataListToolbar';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.js b/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.js
index 4f312d1941..9f39d7f6a6 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.js
@@ -11,7 +11,7 @@ import {
 } from 'react-router-dom';
 import { Card } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 import { InventoriesAPI } from 'api';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.js b/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.js
index 2bf5ef3ff6..332b25f23d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.js
@@ -7,7 +7,7 @@ import { DetailList } from 'components/DetailList';
 import { VariablesDetail } from 'components/CodeEditor';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { HostsAPI } from 'api';
 
 function InventoryHostFacts({ host }) {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.js b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.js
index c8b3b5ef6a..0659332f58 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.js
@@ -6,8 +6,8 @@ import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 import useRequest, {
   useDismissableError,
   useDeleteItems,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { HostsAPI, InventoriesAPI } from 'api';
 import DataListToolbar from 'components/DataListToolbar';
 import AlertModal from 'components/AlertModal';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.js b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.js
index d7eb76ef36..0113757f11 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.js
@@ -3,7 +3,7 @@ import { useParams, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { InventoriesAPI, HostsAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import DataListToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
@@ -13,7 +13,7 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import AdHocCommands from 'components/AdHocCommands/AdHocCommands';
 import InventoryHostItem from './InventoryHostItem';
 
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.js b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.js
index 7a7bcd2132..db661b0281 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.js
@@ -3,8 +3,8 @@ import { useLocation, useRouteMatch, Link } from 'react-router-dom';
 import { t, Plural } from '@lingui/macro';
 import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
 import { InventoriesAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import AlertModal from 'components/AlertModal';
 import DatalistToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.js b/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.js
index 03051d5f54..0b7080a1c3 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.js
@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
 import { parseQueryString, updateQueryString } from 'util/qs';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 
 export default function useWsInventories(
   initialInventories,
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.test.js b/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.test.js
index d7e04eaf71..72be794cca 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.test.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/useWsInventories.test.js
@@ -34,7 +34,7 @@ describe('useWsInventories hook', () => {
       Jest mock timers don’t play well with jest-websocket-mock,
       so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../../util/useThrottle', () => ({
+    jest.mock('../../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));
diff --git a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.js b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.js
index 78bae60626..617efbee37 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.js
+++ b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.js
@@ -5,9 +5,9 @@ import { useParams, useLocation, Link } from 'react-router-dom';
 
 import { DropdownItem } from '@patternfly/react-core';
 import { GroupsAPI, InventoriesAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 
 import DataListToolbar from 'components/DataListToolbar';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.js b/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.js
index 609ff54b55..828deae889 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.js
@@ -10,7 +10,7 @@ import {
   useLocation,
 } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 import { InventoriesAPI, InventorySourcesAPI, OrganizationsAPI } from 'api';
 import { Schedules } from 'components/Schedule';
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.js b/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.js
index f676010da0..4b5c13b04a 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.js
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Card } from '@patternfly/react-core';
 import { InventorySourcesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CardBody } from 'components/Card';
 import InventorySourceForm from '../shared/InventorySourceForm';
 
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.js b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.js
index 4e231deb89..45540bb5bc 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.js
@@ -18,10 +18,10 @@ import DeleteButton from 'components/DeleteButton';
 import ExecutionEnvironmentDetail from 'components/ExecutionEnvironmentDetail';
 import { DetailList, Detail, UserDateDetail } from 'components/DetailList';
 import ErrorDetail from 'components/ErrorDetail';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventorySourcesAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import InventorySourceSyncButton from '../shared/InventorySourceSyncButton';
 
 function InventorySourceDetail({ inventorySource }) {
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceEdit/InventorySourceEdit.js b/awx/ui_next/src/screens/Inventory/InventorySourceEdit/InventorySourceEdit.js
index 3e204e3683..89328bf407 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceEdit/InventorySourceEdit.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceEdit/InventorySourceEdit.js
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Card } from '@patternfly/react-core';
 import { CardBody } from 'components/Card';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventorySourcesAPI } from 'api';
 import InventorySourceForm from '../shared/InventorySourceForm';
 
diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.js b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.js
index 9f12ee9754..481e73c89e 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.js
@@ -6,7 +6,7 @@ import { Button, Tooltip } from '@patternfly/react-core';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
+} from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { InventoriesAPI, InventorySourcesAPI } from 'api';
 import PaginatedTable, {
@@ -15,7 +15,7 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import DatalistToolbar from 'components/DataListToolbar';
 import AlertModal from 'components/AlertModal/AlertModal';
 import ErrorDetail from 'components/ErrorDetail/ErrorDetail';
diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.js b/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.js
index cf1df0247b..f260fa678c 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
+import useWebsocket from 'hooks/useWebsocket';
 
 export default function useWsInventorySources(initialSources) {
   const [sources, setSources] = useState(initialSources);
diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.test.js b/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.test.js
index dcca078a5e..695e8af65a 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.test.js
+++ b/awx/ui_next/src/screens/Inventory/InventorySources/useWsInventorySources.test.js
@@ -8,7 +8,7 @@ import useWsInventorySources from './useWsInventorySources';
   Jest mock timers don’t play well with jest-websocket-mock,
   so we'll stub out throttling to resolve immediately
 */
-jest.mock('../../../util/useThrottle', () => ({
+jest.mock('../../../hooks/useThrottle', () => ({
   __esModule: true,
   default: jest.fn(val => val),
 }));
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventory.js b/awx/ui_next/src/screens/Inventory/SmartInventory.js
index 1c96d3a6b1..dc25fd67f5 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventory.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventory.js
@@ -11,7 +11,7 @@ import {
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
 
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryAdd/SmartInventoryAdd.js b/awx/ui_next/src/screens/Inventory/SmartInventoryAdd/SmartInventoryAdd.js
index 38e25033f2..de94bae435 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryAdd/SmartInventoryAdd.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryAdd/SmartInventoryAdd.js
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CardBody } from 'components/Card';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
 import SmartInventoryForm from '../shared/SmartInventoryForm';
 
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.js b/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.js
index c48e1042f5..b2c965c03c 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.js
@@ -6,7 +6,7 @@ import { Button, Chip, Label } from '@patternfly/react-core';
 
 import { Inventory } from 'types';
 import { InventoriesAPI, UnifiedJobsAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 
 import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryEdit/SmartInventoryEdit.js b/awx/ui_next/src/screens/Inventory/SmartInventoryEdit/SmartInventoryEdit.js
index fe1b088a9d..6cf020ab0e 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryEdit/SmartInventoryEdit.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryEdit/SmartInventoryEdit.js
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Inventory } from 'types';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
 import { CardBody } from 'components/Card';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.js b/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.js
index 986f8fc381..f3b3861ddc 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.js
@@ -6,7 +6,7 @@ import { CaretLeftIcon } from '@patternfly/react-icons';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import RoutedTabs from 'components/RoutedTabs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
 import SmartInventoryHostDetail from '../SmartInventoryHostDetail';
 
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.js b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.js
index ea157ef7cb..c4e955ba98 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.js
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.js
@@ -7,8 +7,8 @@ import PaginatedTable, {
   HeaderRow,
   HeaderCell,
 } from 'components/PaginatedTable';
-import useRequest from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { InventoriesAPI } from 'api';
 import { Inventory } from 'types';
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.js b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.js
index f2ba439f7c..9ba42cd693 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.js
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.js
@@ -4,7 +4,7 @@ import { func, shape } from 'prop-types';
 import { t } from '@lingui/macro';
 import { Form, FormGroup, Title } from '@patternfly/react-core';
 import { InventorySourcesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import AnsibleSelect from 'components/AnsibleSelect';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.js b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.js
index e96cfadd74..9651cbd997 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.js
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.js
@@ -8,7 +8,7 @@ import {
   SelectOption,
 } from '@patternfly/react-core';
 import { ProjectsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import CredentialLookup from 'components/Lookup/CredentialLookup';
 import ProjectLookup from 'components/Lookup/ProjectLookup';
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.js b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.js
index 940a0f781a..41a6b7e28e 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.js
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.js
@@ -4,7 +4,7 @@ import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, Tooltip } from '@patternfly/react-core';
 import { SyncIcon } from '@patternfly/react-icons';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal/AlertModal';
 import ErrorDetail from 'components/ErrorDetail/ErrorDetail';
 import { InventorySourcesAPI } from 'api';
diff --git a/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.js b/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.js
index 0134282ee7..99404b3639 100644
--- a/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.js
+++ b/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.js
@@ -18,7 +18,7 @@ import {
 import HostFilterLookup from 'components/Lookup/HostFilterLookup';
 import InstanceGroupsLookup from 'components/Lookup/InstanceGroupsLookup';
 import OrganizationLookup from 'components/Lookup/OrganizationLookup';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import { InventoriesAPI } from 'api';
 
diff --git a/awx/ui_next/src/screens/Job/Job.js b/awx/ui_next/src/screens/Job/Job.js
index af4e021832..42c81015cc 100644
--- a/awx/ui_next/src/screens/Job/Job.js
+++ b/awx/ui_next/src/screens/Job/Job.js
@@ -15,7 +15,7 @@ import { Card, PageSection } from '@patternfly/react-core';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import RoutedTabs from 'components/RoutedTabs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getJobModel } from 'util/jobs';
 import JobDetail from './JobDetail';
 import JobOutput from './JobOutput';
diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
index 89709f8fdb..56975c6807 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
+++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
@@ -31,8 +31,8 @@ import Search from 'components/Search';
 import StatusIcon from 'components/StatusIcon';
 
 import { getJobModel, isJobRunning } from 'util/jobs';
-import useRequest, { useDismissableError } from 'util/useRequest';
-import useInterval from 'util/useInterval';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
+import useInterval from 'hooks/useInterval';
 import {
   parseQueryString,
   mergeParams,
@@ -40,7 +40,7 @@ import {
   getQSConfig,
   updateQueryString,
 } from 'util/qs';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import JobEvent from './JobEvent';
 import JobEventSkeleton from './JobEventSkeleton';
 import PageControls from './PageControls';
diff --git a/awx/ui_next/src/screens/Job/JobTypeRedirect.js b/awx/ui_next/src/screens/Job/JobTypeRedirect.js
index 6e9ac3e9d4..69c906dc4c 100644
--- a/awx/ui_next/src/screens/Job/JobTypeRedirect.js
+++ b/awx/ui_next/src/screens/Job/JobTypeRedirect.js
@@ -3,7 +3,7 @@ import { Redirect, Link } from 'react-router-dom';
 import { PageSection, Card } from '@patternfly/react-core';
 
 import { t } from '@lingui/macro';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { UnifiedJobsAPI } from 'api';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
diff --git a/awx/ui_next/src/screens/Job/WorkflowOutput/useWsWorkflowOutput.js b/awx/ui_next/src/screens/Job/WorkflowOutput/useWsWorkflowOutput.js
index 36f5a2cfa8..b1bac50b05 100644
--- a/awx/ui_next/src/screens/Job/WorkflowOutput/useWsWorkflowOutput.js
+++ b/awx/ui_next/src/screens/Job/WorkflowOutput/useWsWorkflowOutput.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
+import useWebsocket from 'hooks/useWebsocket';
 import { WorkflowJobsAPI } from 'api';
 
 const fetchWorkflowNodes = async (jobId, pageNo = 1, nodes = []) => {
diff --git a/awx/ui_next/src/screens/Job/useWsJob.js b/awx/ui_next/src/screens/Job/useWsJob.js
index 5fa922eeff..e78c121840 100644
--- a/awx/ui_next/src/screens/Job/useWsJob.js
+++ b/awx/ui_next/src/screens/Job/useWsJob.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
+import useWebsocket from 'hooks/useWebsocket';
 import { getJobModel } from 'util/jobs';
 
 export default function useWsJob(initialJob) {
diff --git a/awx/ui_next/src/screens/Login/Login.js b/awx/ui_next/src/screens/Login/Login.js
index 5e4d3cb52c..b16419c6d0 100644
--- a/awx/ui_next/src/screens/Login/Login.js
+++ b/awx/ui_next/src/screens/Login/Login.js
@@ -25,7 +25,7 @@ import {
   GithubIcon,
   UserCircleIcon,
 } from '@patternfly/react-icons';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { AuthAPI, RootAPI } from 'api';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJob.js b/awx/ui_next/src/screens/ManagementJob/ManagementJob.js
index e9ddb4ee9e..b656397928 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJob.js
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJob.js
@@ -20,7 +20,7 @@ import NotificationList from 'components/NotificationList';
 import RoutedTabs from 'components/RoutedTabs';
 import { Schedules } from 'components/Schedule';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 function ManagementJob({ setBreadcrumb }) {
   const basePath = '/management_jobs';
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.js b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.js
index d9236a65b8..a3c2f7af73 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.js
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.js
@@ -14,7 +14,7 @@ import PaginatedTable, {
 } from 'components/PaginatedTable';
 import { useConfig } from 'contexts/Config';
 import { parseQueryString, getQSConfig } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 import ManagementJobListItem from './ManagementJobListItem';
 
diff --git a/awx/ui_next/src/screens/Metrics/Metrics.js b/awx/ui_next/src/screens/Metrics/Metrics.js
index b72c7e8e0a..439fead8a7 100644
--- a/awx/ui_next/src/screens/Metrics/Metrics.js
+++ b/awx/ui_next/src/screens/Metrics/Metrics.js
@@ -15,7 +15,7 @@ import {
 } from '@patternfly/react-core';
 
 import { MetricsAPI, InstancesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentEmpty from 'components/ContentEmpty';
 import ScreenHeader from 'components/ScreenHeader/ScreenHeader';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.js b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.js
index 23394d9c1d..e88a298c5f 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.js
@@ -12,7 +12,7 @@ import {
   useRouteMatch,
   useLocation,
 } from 'react-router-dom';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
 import { NotificationTemplatesAPI } from 'api';
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.js b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.js
index 9c11914dbf..6200943b91 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CardBody } from 'components/Card';
 import { NotificationTemplatesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import NotificationTemplateForm from './shared/NotificationTemplateForm';
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.js b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.js
index 4f8ecf798a..849649b36b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.js
@@ -21,7 +21,7 @@ import CodeDetail from 'components/DetailList/CodeDetail';
 import DeleteButton from 'components/DeleteButton';
 import ErrorDetail from 'components/ErrorDetail';
 import { NotificationTemplatesAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import hasCustomMessages from '../shared/hasCustomMessages';
 import { NOTIFICATION_TYPES } from '../constants';
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.js b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.js
index 857adffaa1..07d283a42b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.js
@@ -19,8 +19,8 @@ import PaginatedTable, {
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
 import DataListToolbar from 'components/DataListToolbar';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import NotificationTemplateListItem from './NotificationTemplateListItem';
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.js b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.js
index 4ba5ec1ca5..b505fc48ff 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.js
@@ -13,7 +13,7 @@ import StatusLabel from 'components/StatusLabel';
 import CopyButton from 'components/CopyButton';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { NOTIFICATION_TYPES } from '../constants';
 
 const NUM_RETRIES = 25;
diff --git a/awx/ui_next/src/screens/Organization/Organization.js b/awx/ui_next/src/screens/Organization/Organization.js
index 1a74c4769e..376aa6617f 100644
--- a/awx/ui_next/src/screens/Organization/Organization.js
+++ b/awx/ui_next/src/screens/Organization/Organization.js
@@ -13,7 +13,7 @@ import {
 } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
 import NotificationList from 'components/NotificationList/NotificationList';
diff --git a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.js b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.js
index 76d5184df0..f305f77951 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.js
+++ b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.js
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { PageSection, Card } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CredentialsAPI, OrganizationsAPI } from 'api';
 import { CardBody } from 'components/Card';
 import ContentError from 'components/ContentError';
diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.js b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
index 82383e5a30..73b0bd7d1f 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
+++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
@@ -13,7 +13,7 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import DeleteButton from 'components/DeleteButton';
 import ErrorDetail from 'components/ErrorDetail';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import ExecutionEnvironmentDetail from 'components/ExecutionEnvironmentDetail';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.js b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.js
index aae6ed5dc0..9433e1a917 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.js
+++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.js
@@ -6,7 +6,7 @@ import { Card } from '@patternfly/react-core';
 
 import { OrganizationsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.js b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.js
index 04178b95c7..55bdfea1d5 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.js
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.js
@@ -4,7 +4,7 @@ import { t, Plural } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 
 import { OrganizationsAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import DataListToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
@@ -15,7 +15,7 @@ import PaginatedTable, {
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import OrganizationListItem from './OrganizationListItem';
 
diff --git a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.js b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.js
index 206884c36e..2bf59fda83 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.js
+++ b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.js
@@ -9,7 +9,7 @@ import PaginatedTable, {
   HeaderCell,
 } from 'components/PaginatedTable';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import OrganizationTeamListItem from './OrganizationTeamListItem';
 
 const QS_CONFIG = getQSConfig('team', {
diff --git a/awx/ui_next/src/screens/Project/Project.js b/awx/ui_next/src/screens/Project/Project.js
index fc73c02f71..b6e4458f5e 100644
--- a/awx/ui_next/src/screens/Project/Project.js
+++ b/awx/ui_next/src/screens/Project/Project.js
@@ -13,7 +13,7 @@ import {
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.js b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.js
index 7b149e7df5..c22f68694a 100644
--- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.js
+++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.js
@@ -23,7 +23,7 @@ import ExecutionEnvironmentDetail from 'components/ExecutionEnvironmentDetail';
 import CredentialChip from 'components/CredentialChip';
 import { ProjectsAPI } from 'api';
 import { toTitleCase } from 'util/strings';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import StatusLabel from 'components/StatusLabel';
 import { formatDateString } from 'util/dates';
diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/useWsProject.js b/awx/ui_next/src/screens/Project/ProjectDetail/useWsProject.js
index 488081efba..58ad4cf9d7 100644
--- a/awx/ui_next/src/screens/Project/ProjectDetail/useWsProject.js
+++ b/awx/ui_next/src/screens/Project/ProjectDetail/useWsProject.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
+import useWebsocket from 'hooks/useWebsocket';
 import { ProjectsAPI } from 'api';
 
 export default function useWsProjects(initialProject) {
diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.js b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.js
index d792692ca0..d3fc8f9425 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.js
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.js
@@ -14,8 +14,8 @@ import PaginatedTable, {
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useSelected from 'util/useSelected';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useSelected from 'hooks/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import ProjectTemplatesListItem from './ProjectJobTemplatesListItem';
 
 const QS_CONFIG = getQSConfig('template', {
diff --git a/awx/ui_next/src/screens/Project/ProjectList/ProjectList.js b/awx/ui_next/src/screens/Project/ProjectList/ProjectList.js
index 280744aab6..9a71767310 100644
--- a/awx/ui_next/src/screens/Project/ProjectList/ProjectList.js
+++ b/awx/ui_next/src/screens/Project/ProjectList/ProjectList.js
@@ -6,7 +6,7 @@ import { ProjectsAPI } from 'api';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
+} from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import DataListToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
@@ -16,8 +16,8 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
-import useExpanded from 'util/useExpanded';
+import useSelected from 'hooks/useSelected';
+import useExpanded from 'hooks/useExpanded';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import useWsProjects from './useWsProjects';
diff --git a/awx/ui_next/src/screens/Project/ProjectList/useWsProjects.js b/awx/ui_next/src/screens/Project/ProjectList/useWsProjects.js
index b491150832..6dd8c9c3a9 100644
--- a/awx/ui_next/src/screens/Project/ProjectList/useWsProjects.js
+++ b/awx/ui_next/src/screens/Project/ProjectList/useWsProjects.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
+import useWebsocket from 'hooks/useWebsocket';
 
 export default function useWsProjects(initialProjects) {
   const [projects, setProjects] = useState(initialProjects);
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.js b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.js
index 38c027d1cc..72a416a526 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.js
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.js
@@ -7,7 +7,7 @@ import { required } from 'util/validators';
 import AnsibleSelect from 'components/AnsibleSelect';
 import FormField from 'components/FormField';
 import Popover from 'components/Popover';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 
 const ManualSubForm = ({
   localPath,
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.js b/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.js
index fe4ec9c8a0..68306b97d6 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.js
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.js
@@ -6,7 +6,7 @@ import { SyncIcon } from '@patternfly/react-icons';
 import { number } from 'prop-types';
 
 import { t } from '@lingui/macro';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
diff --git a/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.js b/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.js
index 01e9e3ff30..bf97ed315b 100644
--- a/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.js
+++ b/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.js
@@ -11,7 +11,7 @@ import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { SettingDetail } from '../../shared';
 
diff --git a/awx/ui_next/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.js b/awx/ui_next/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.js
index c13c3c405e..8f98522158 100644
--- a/awx/ui_next/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.js
+++ b/awx/ui_next/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.js
index 51ba5ae8ec..6c369917cc 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.js
@@ -11,7 +11,7 @@ import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { SettingDetail } from '../../shared';
 
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubEdit/GitHubEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubEdit/GitHubEdit.js
index c6dc5fd396..27c4461ed5 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubEdit/GitHubEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubEdit/GitHubEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.js
index 8795b5d2ae..7a9b986488 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.js
index 5661893562..c7ee717d74 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.js
index 918cef168a..6c7f01cd3f 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.js
index 22a57c0d54..e7f015b603 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.js b/awx/ui_next/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.js
index f4c330cbb9..2b8303e7a2 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.js
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.js b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.js
index df209c4811..2a5f5efc35 100644
--- a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.js
+++ b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.js b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.js
index 5082e3dfd7..638cefe802 100644
--- a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.js
+++ b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.js b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.js
index 2a578665e8..b98f83182a 100644
--- a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.js
+++ b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.js
@@ -9,7 +9,7 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
 import { SettingsAPI } from 'api';
diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
index 6b65bcd4bd..f51c967f5e 100644
--- a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
+++ b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { formatJson } from '../../shared/settingUtils';
 import {
diff --git a/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.js b/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.js
index 16a4144f9d..9635c18d43 100644
--- a/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.js
+++ b/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.js
@@ -10,7 +10,7 @@ import ContentLoading from 'components/ContentLoading';
 import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
 import { SettingDetail } from '../../shared';
diff --git a/awx/ui_next/src/screens/Setting/LDAP/LDAPEdit/LDAPEdit.js b/awx/ui_next/src/screens/Setting/LDAP/LDAPEdit/LDAPEdit.js
index 087d3ee0ff..6e9a69c6b9 100644
--- a/awx/ui_next/src/screens/Setting/LDAP/LDAPEdit/LDAPEdit.js
+++ b/awx/ui_next/src/screens/Setting/LDAP/LDAPEdit/LDAPEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout, FormFullWidthLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.js b/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.js
index daf78859f7..63c3a4a775 100644
--- a/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.js
+++ b/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.js b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.js
index c0baf37bf2..36552e1870 100644
--- a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.js
+++ b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.js
@@ -10,8 +10,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { formatJson } from '../../shared/settingUtils';
 import {
diff --git a/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationDetail/MiscAuthenticationDetail.js b/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationDetail/MiscAuthenticationDetail.js
index 2bff8f0b8f..fc44f471b1 100644
--- a/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationDetail/MiscAuthenticationDetail.js
+++ b/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationDetail/MiscAuthenticationDetail.js
@@ -10,7 +10,7 @@ import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { SettingDetail } from '../../shared';
 
diff --git a/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.js b/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.js
index bebb6b7e0d..34f94d218c 100644
--- a/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.js
+++ b/awx/ui_next/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.js
@@ -9,8 +9,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import {
   BooleanField,
diff --git a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
index dd2b96ea62..a99b2f60b7 100644
--- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
+++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
@@ -10,7 +10,7 @@ import ContentLoading from 'components/ContentLoading';
 import { DetailList } from 'components/DetailList';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI, ExecutionEnvironmentsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
 import { SettingDetail } from '../../shared';
diff --git a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
index 48882b74d3..f4166e6c76 100644
--- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
+++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
@@ -10,8 +10,8 @@ import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { ExecutionEnvironmentLookup } from 'components/Lookup';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI, ExecutionEnvironmentsAPI } from 'api';
 import {
   BooleanField,
diff --git a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.js b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.js
index fd69f832ef..8ee81b790c 100644
--- a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.js
+++ b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSEdit/RADIUSEdit.js b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSEdit/RADIUSEdit.js
index 42d269e93f..f49b8c009d 100644
--- a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSEdit/RADIUSEdit.js
+++ b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSEdit/RADIUSEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { EncryptedField, InputField } from '../../shared/SharedFields';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
diff --git a/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.js b/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.js
index 7f179c94fd..2b1222717d 100644
--- a/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.js
+++ b/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.js b/awx/ui_next/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.js
index 9b5490929b..aec298fb34 100644
--- a/awx/ui_next/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.js
+++ b/awx/ui_next/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import { RevertAllAlert, RevertFormActionGroup } from '../../shared';
 import {
diff --git a/awx/ui_next/src/screens/Setting/SettingList.js b/awx/ui_next/src/screens/Setting/SettingList.js
index 5e1d76b7fb..750a093466 100644
--- a/awx/ui_next/src/screens/Setting/SettingList.js
+++ b/awx/ui_next/src/screens/Setting/SettingList.js
@@ -15,7 +15,7 @@ import {
 import styled from 'styled-components';
 import { useConfig } from 'contexts/Config';
 import ContentLoading from 'components/ContentLoading/ContentLoading';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 
 const SplitLayout = styled(PageSection)`
   column-count: 1;
diff --git a/awx/ui_next/src/screens/Setting/Settings.js b/awx/ui_next/src/screens/Setting/Settings.js
index fcef7c6f1d..fd56512ea7 100644
--- a/awx/ui_next/src/screens/Setting/Settings.js
+++ b/awx/ui_next/src/screens/Setting/Settings.js
@@ -8,7 +8,7 @@ import ScreenHeader from 'components/ScreenHeader';
 import { SettingsProvider } from 'contexts/Settings';
 import { useConfig } from 'contexts/Config';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import AzureAD from './AzureAD';
 import GitHub from './GitHub';
 import GoogleOAuth2 from './GoogleOAuth2';
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js
index e4fffa8470..baa456822f 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js
@@ -12,7 +12,7 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import { ConfigAPI, SettingsAPI, RootAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import { FormSubmitError } from 'components/FormField';
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.js b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.js
index 0dcd58d0c0..938d68b827 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.js
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.js
@@ -21,8 +21,8 @@ import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 
 import { ConfigAPI } from 'api';
 import { formatDateStringUTC } from 'util/dates';
-import useRequest from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import ErrorDetail from 'components/ErrorDetail';
 import ContentEmpty from 'components/ContentEmpty';
 import ContentLoading from 'components/ContentLoading';
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.js b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.js
index 5ab097d9c1..c1aee40f57 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.js
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.js
@@ -17,7 +17,7 @@ import {
 } from '@patternfly/react-core';
 import { useConfig } from 'contexts/Config';
 import getDocsBaseUrl from 'util/getDocsBaseUrl';
-import useModal from 'util/useModal';
+import useModal from 'hooks/useModal';
 import FormField, { PasswordField } from 'components/FormField';
 import Popover from 'components/Popover';
 import SubscriptionModal from './SubscriptionModal';
diff --git a/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.js b/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.js
index b42e385f09..b8632a9d78 100644
--- a/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.js
+++ b/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.js b/awx/ui_next/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.js
index 2ce93bb413..dcf90ffc33 100644
--- a/awx/ui_next/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.js
+++ b/awx/ui_next/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.js
@@ -8,8 +8,8 @@ import ContentLoading from 'components/ContentLoading';
 import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import {
   ChoiceField,
diff --git a/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.js b/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.js
index 932292c2b8..36b90a5820 100644
--- a/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.js
+++ b/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.js
@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
 import { SettingsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DetailList } from 'components/DetailList';
 import { useConfig } from 'contexts/Config';
 import { useSettings } from 'contexts/Settings';
diff --git a/awx/ui_next/src/screens/Setting/UI/UIEdit/UIEdit.js b/awx/ui_next/src/screens/Setting/UI/UIEdit/UIEdit.js
index 1c551ab650..912eaf52d8 100644
--- a/awx/ui_next/src/screens/Setting/UI/UIEdit/UIEdit.js
+++ b/awx/ui_next/src/screens/Setting/UI/UIEdit/UIEdit.js
@@ -9,8 +9,8 @@ import { FormSubmitError } from 'components/FormField';
 import { FormColumnLayout } from 'components/FormLayout';
 import { useSettings } from 'contexts/Settings';
 import { useConfig } from 'contexts/Config';
-import useModal from 'util/useModal';
-import useRequest from 'util/useRequest';
+import useModal from 'hooks/useModal';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 import {
   ChoiceField,
diff --git a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.js b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.js
index f85b30251d..6d6f1e4a32 100644
--- a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.js
+++ b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.js
@@ -11,7 +11,7 @@ import { DetailList, Detail } from 'components/DetailList';
 import ErrorDetail from 'components/ErrorDetail';
 import { formatDateString } from 'util/dates';
 import { TeamsAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 
 function TeamDetail({ team }) {
   const { name, description, created, modified, summary_fields } = team;
diff --git a/awx/ui_next/src/screens/Team/TeamList/TeamList.js b/awx/ui_next/src/screens/Team/TeamList/TeamList.js
index 1d8c16d076..3c08621d28 100644
--- a/awx/ui_next/src/screens/Team/TeamList/TeamList.js
+++ b/awx/ui_next/src/screens/Team/TeamList/TeamList.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 
 import { TeamsAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import DataListToolbar from 'components/DataListToolbar';
 import ErrorDetail from 'components/ErrorDetail';
@@ -15,7 +15,7 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 
 import TeamListItem from './TeamListItem';
diff --git a/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.js b/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.js
index fa0b571852..692149e108 100644
--- a/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.js
+++ b/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.js
@@ -10,7 +10,7 @@ import {
 } from '@patternfly/react-core';
 import { CubesIcon } from '@patternfly/react-icons';
 import { TeamsAPI, RolesAPI, UsersAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import DataListToolbar from 'components/DataListToolbar';
 import PaginatedTable, {
   HeaderCell,
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.js b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.js
index 9857e73065..caa0a14fb3 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.js
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.js
@@ -29,7 +29,7 @@ import ErrorDetail from 'components/ErrorDetail';
 import { LaunchButton } from 'components/LaunchButton';
 import { VariablesDetail } from 'components/CodeEditor';
 import { JobTemplatesAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import ExecutionEnvironmentDetail from 'components/ExecutionEnvironmentDetail';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.js b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.js
index 6109cda7eb..20a832593c 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.js
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.js
@@ -5,7 +5,7 @@ import { Redirect, useHistory } from 'react-router-dom';
 import { JobTemplate } from 'types';
 import { JobTemplatesAPI, ProjectsAPI } from 'api';
 import { getAddedAndRemoved } from 'util/lists';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentLoading from 'components/ContentLoading';
 import { CardBody } from 'components/Card';
 import JobTemplateForm from '../shared/JobTemplateForm';
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.js b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.js
index 52e7bbe07e..7c9d34f9b8 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.js
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.js
@@ -12,14 +12,14 @@ import {
   InstanceGroupsAPI,
   RootAPI,
 } from 'api';
-import useDebounce from 'util/useDebounce';
+import useDebounce from 'hooks/useDebounce';
 import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
 import JobTemplateEdit from './JobTemplateEdit';
 
-jest.mock('../../../util/useDebounce');
+jest.mock('../../../hooks/useDebounce');
 jest.mock('../../../api/models/Credentials');
 jest.mock('../../../api/models/CredentialTypes');
 jest.mock('../../../api/models/JobTemplates');
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyList.js b/awx/ui_next/src/screens/Template/Survey/SurveyList.js
index ec542fb259..ed925d92d1 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyList.js
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyList.js
@@ -16,7 +16,7 @@ import ContentLoading from 'components/ContentLoading';
 import AlertModal from 'components/AlertModal';
 import { ToolbarAddButton } from 'components/PaginatedTable';
 
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import SurveyListItem from './SurveyListItem';
 import SurveyToolbar from './SurveyToolbar';
 import SurveyPreviewModal from './SurveyPreviewModal';
diff --git a/awx/ui_next/src/screens/Template/Template.js b/awx/ui_next/src/screens/Template/Template.js
index d26fce9047..a905ff1ff9 100644
--- a/awx/ui_next/src/screens/Template/Template.js
+++ b/awx/ui_next/src/screens/Template/Template.js
@@ -14,7 +14,7 @@ import {
 } from 'react-router-dom';
 import RoutedTabs from 'components/RoutedTabs';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import JobList from 'components/JobList';
 import NotificationList from 'components/NotificationList';
diff --git a/awx/ui_next/src/screens/Template/TemplateSurvey.js b/awx/ui_next/src/screens/Template/TemplateSurvey.js
index 06871c7fcf..73632deb9e 100644
--- a/awx/ui_next/src/screens/Template/TemplateSurvey.js
+++ b/awx/ui_next/src/screens/Template/TemplateSurvey.js
@@ -6,7 +6,7 @@ import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from 'api';
 import ContentError from 'components/ContentError';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { SurveyList, SurveyQuestionAdd, SurveyQuestionEdit } from './Survey';
 
 function TemplateSurvey({ template, canEdit }) {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.js
index b1c2dd175f..44b80de0a6 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.js
@@ -14,7 +14,7 @@ import {
 } from 'react-router-dom';
 import RoutedTabs from 'components/RoutedTabs';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import AppendBody from 'components/AppendBody';
 import ContentError from 'components/ContentError';
 import FullPage from 'components/FullPage';
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
index e627aa0c5d..f51df0f9cf 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
@@ -6,7 +6,7 @@ import { CardBody } from 'components/Card';
 
 import { WorkflowJobTemplatesAPI, OrganizationsAPI, UsersAPI } from 'api';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import WorkflowJobTemplateForm from '../shared/WorkflowJobTemplateForm';
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.js
index 25e3d72fd0..cc33990a3b 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.js
@@ -24,7 +24,7 @@ import { LaunchButton } from 'components/LaunchButton';
 import Sparkline from 'components/Sparkline';
 import { toTitleCase } from 'util/strings';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 
 function WorkflowJobTemplateDetail({ template }) {
   const {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.js
index 21603d48ad..409f89a01c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.js
@@ -5,7 +5,7 @@ import { CardBody } from 'components/Card';
 import { getAddedAndRemoved } from 'util/lists';
 import { WorkflowJobTemplatesAPI, OrganizationsAPI, UsersAPI } from 'api';
 import { useConfig } from 'contexts/Config';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { WorkflowJobTemplateForm } from '../shared';
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.test.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.test.js
index 791d6101fe..45c8e9b478 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.test.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.test.js
@@ -9,14 +9,14 @@ import {
   UsersAPI,
   InventoriesAPI,
 } from 'api';
-import useDebounce from 'util/useDebounce';
+import useDebounce from 'hooks/useDebounce';
 import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
 import WorkflowJobTemplateEdit from './WorkflowJobTemplateEdit';
 
-jest.mock('../../../util/useDebounce');
+jest.mock('../../../hooks/useDebounce');
 jest.mock('../../../api/models/WorkflowJobTemplates');
 jest.mock('../../../api/models/Organizations');
 jest.mock('../../../api/models/Labels');
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.js
index d6e1df9ce8..1bcdaa0398 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.js
@@ -15,7 +15,7 @@ import {
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import mergeExtraVars from 'util/prompt/mergeExtraVars';
 import getSurveyValues from 'util/prompt/getSurveyValues';
 import { parseVariableField } from 'util/yaml';
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.js
index 3a70c4d3f9..7f7eec7552 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { InventorySourcesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DataListToolbar from 'components/DataListToolbar';
 import CheckboxListItem from 'components/CheckboxListItem';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.js
index c3ae4e0a88..7ffc349ac2 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { JobTemplatesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DataListToolbar from 'components/DataListToolbar';
 import CheckboxListItem from 'components/CheckboxListItem';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.js
index 7099bf6a4c..573a667023 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { ProjectsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DataListToolbar from 'components/DataListToolbar';
 import CheckboxListItem from 'components/CheckboxListItem';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.js
index 97b2ca7fef..714f4c491e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.js
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { WorkflowJobTemplatesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DataListToolbar from 'components/DataListToolbar';
 import CheckboxListItem from 'components/CheckboxListItem';
 import PaginatedTable, {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
index 384ffcf037..550319df41 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
@@ -10,7 +10,7 @@ import {
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import PromptDetail from 'components/PromptDetail';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { jsonToYaml } from 'util/yaml';
 import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from 'api';
 import getNodeType from '../../shared/WorkflowJobTemplateVisualizerUtils';
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
index a82fa4bfb7..d2756dafe4 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
@@ -15,7 +15,7 @@ import { layoutGraph } from 'components/Workflow/WorkflowUtils';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import workflowReducer from 'components/Workflow/workflowReducer';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import {
   WorkflowApprovalTemplatesAPI,
   WorkflowJobTemplateNodesAPI,
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.js b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.js
index 90e27e5904..86a30978ac 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.js
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.js
@@ -15,8 +15,8 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import AnsibleSelect from 'components/AnsibleSelect';
 import { TagMultiSelect } from 'components/MultiSelect';
-import useRequest from 'util/useRequest';
-import useBrandName from 'util/useBrandName';
+import useRequest from 'hooks/useRequest';
+import useBrandName from 'hooks/useBrandName';
 import FormActionGroup from 'components/FormActionGroup';
 import FormField, {
   CheckboxField,
@@ -41,7 +41,7 @@ import {
 } from 'components/Lookup';
 import Popover from 'components/Popover';
 import { JobTemplatesAPI } from 'api';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import LabelSelect from './LabelSelect';
 import PlaybookSelect from './PlaybookSelect';
 import WebhookSubForm from './WebhookSubForm';
diff --git a/awx/ui_next/src/screens/Template/shared/LabelSelect.js b/awx/ui_next/src/screens/Template/shared/LabelSelect.js
index d1142a3063..6d88e9aa96 100644
--- a/awx/ui_next/src/screens/Template/shared/LabelSelect.js
+++ b/awx/ui_next/src/screens/Template/shared/LabelSelect.js
@@ -4,7 +4,7 @@ import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { LabelsAPI } from 'api';
 import { useSyncedSelectValue } from 'components/MultiSelect';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 
 async function loadLabelOptions(setLabels, onError, isMounted) {
   if (!isMounted.current) {
diff --git a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.js b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.js
index e13623ca60..257c4fa8e2 100644
--- a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.js
+++ b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.js
@@ -4,7 +4,7 @@ import { number, string, oneOfType } from 'prop-types';
 import { t } from '@lingui/macro';
 import { SelectVariant, Select, SelectOption } from '@patternfly/react-core';
 import { ProjectsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 function PlaybookSelect({
   projectId,
diff --git a/awx/ui_next/src/screens/Template/shared/WebhookSubForm.js b/awx/ui_next/src/screens/Template/shared/WebhookSubForm.js
index 1d2277ab87..cd3edcef18 100644
--- a/awx/ui_next/src/screens/Template/shared/WebhookSubForm.js
+++ b/awx/ui_next/src/screens/Template/shared/WebhookSubForm.js
@@ -12,7 +12,7 @@ import {
 import { useField, useFormikContext } from 'formik';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { FormColumnLayout } from 'components/FormLayout';
 import { CredentialLookup } from 'components/Lookup';
 import AnsibleSelect from 'components/AnsibleSelect';
diff --git a/awx/ui_next/src/screens/User/User.js b/awx/ui_next/src/screens/User/User.js
index 709ed42c06..00f70b78c6 100644
--- a/awx/ui_next/src/screens/User/User.js
+++ b/awx/ui_next/src/screens/User/User.js
@@ -11,7 +11,7 @@ import {
 } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { UsersAPI } from 'api';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';
diff --git a/awx/ui_next/src/screens/User/UserDetail/UserDetail.js b/awx/ui_next/src/screens/User/UserDetail/UserDetail.js
index e71c6ed6db..8bf1132f55 100644
--- a/awx/ui_next/src/screens/User/UserDetail/UserDetail.js
+++ b/awx/ui_next/src/screens/User/UserDetail/UserDetail.js
@@ -11,7 +11,7 @@ import { DetailList, Detail } from 'components/DetailList';
 import ErrorDetail from 'components/ErrorDetail';
 import { formatDateString } from 'util/dates';
 import { UsersAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 
 function UserDetail({ user }) {
   const {
diff --git a/awx/ui_next/src/screens/User/UserList/UserList.js b/awx/ui_next/src/screens/User/UserList/UserList.js
index e09eabdae4..94c7793d7e 100644
--- a/awx/ui_next/src/screens/User/UserList/UserList.js
+++ b/awx/ui_next/src/screens/User/UserList/UserList.js
@@ -13,8 +13,8 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import UserListItem from './UserListItem';
 
diff --git a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.js b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.js
index 0efc947276..ca79f24026 100644
--- a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.js
+++ b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.js
@@ -6,7 +6,7 @@ import PaginatedTable, {
   HeaderRow,
   HeaderCell,
 } from 'components/PaginatedTable';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { UsersAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import UserOrganizationListItem from './UserOrganizationListItem';
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.js b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.js
index 42681f2360..c24fdec91d 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.js
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.js
@@ -11,7 +11,7 @@ import {
 import { CubesIcon } from '@patternfly/react-icons';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { UsersAPI, RolesAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
diff --git a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.js b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.js
index 57f4840461..66fc5426e7 100644
--- a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.js
+++ b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.js
@@ -15,8 +15,8 @@ import ErrorDetail from 'components/ErrorDetail';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { TeamsAPI, UsersAPI } from 'api';
 import { getQSConfig, mergeParams, parseQueryString } from 'util/qs';
 
diff --git a/awx/ui_next/src/screens/User/UserToken/UserToken.js b/awx/ui_next/src/screens/User/UserToken/UserToken.js
index 977a949173..ac689c7ae8 100644
--- a/awx/ui_next/src/screens/User/UserToken/UserToken.js
+++ b/awx/ui_next/src/screens/User/UserToken/UserToken.js
@@ -14,7 +14,7 @@ import { Card, PageSection } from '@patternfly/react-core';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
 import { TokensAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import UserTokenDetail from '../UserTokenDetail';
 
 function UserToken({ setBreadcrumb, user }) {
diff --git a/awx/ui_next/src/screens/User/UserTokenAdd/UserTokenAdd.js b/awx/ui_next/src/screens/User/UserTokenAdd/UserTokenAdd.js
index d49a564a02..93bc53b6d6 100644
--- a/awx/ui_next/src/screens/User/UserTokenAdd/UserTokenAdd.js
+++ b/awx/ui_next/src/screens/User/UserTokenAdd/UserTokenAdd.js
@@ -3,7 +3,7 @@ import { useHistory, useParams } from 'react-router-dom';
 
 import { CardBody } from 'components/Card';
 import { TokensAPI, UsersAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import UserTokenFrom from '../shared/UserTokenForm';
 
 function UserTokenAdd({ onSuccessfulAdd }) {
diff --git a/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.js b/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.js
index 07b347015f..c6e335eafc 100644
--- a/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.js
+++ b/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.js
@@ -10,7 +10,7 @@ import { DetailList, Detail, UserDateDetail } from 'components/DetailList';
 import ErrorDetail from 'components/ErrorDetail';
 import { TokensAPI } from 'api';
 import { formatDateString } from 'util/dates';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { toTitleCase } from 'util/strings';
 
 function UserTokenDetail({ token }) {
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.js b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.js
index 37a5556374..ffca5e9363 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.js
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.js
@@ -9,8 +9,8 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useSelected from 'hooks/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import { UsersAPI, TokensAPI } from 'api';
 import DataListToolbar from 'components/DataListToolbar';
 import AlertModal from 'components/AlertModal';
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.js b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.js
index cd5405d703..351e380fa2 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.js
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.js
@@ -12,7 +12,7 @@ import {
   useRouteMatch,
   useLocation,
 } from 'react-router-dom';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';
 import { WorkflowApprovalsAPI } from 'api';
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
index 76f34dbd7f..72fe964cee 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
@@ -10,7 +10,7 @@ import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
 import ErrorDetail from 'components/ErrorDetail';
 import { formatDateString, secondsToHHMMSS } from 'util/dates';
 import { WorkflowApprovalsAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { WorkflowApproval } from 'types';
 import WorkflowApprovalStatus from '../shared/WorkflowApprovalStatus';
 
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js
index 79d0885314..d498cd574f 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js
@@ -14,8 +14,8 @@ import DataListToolbar from 'components/DataListToolbar';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import WorkflowApprovalListItem from './WorkflowApprovalListItem';
 import useWsWorkflowApprovals from './useWsWorkflowApprovals';
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.js b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.js
index 6add5e7432..d43e5348ba 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.js
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 
 export default function useWsWorkflowApprovals(
   initialWorkflowApprovals,
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.test.js b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.test.js
index 02adc78928..1bd7af42d6 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.test.js
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/useWsWorkflowApprovals.test.js
@@ -25,7 +25,7 @@ describe('useWsWorkflowApprovals hook', () => {
     Jest mock timers don’t play well with jest-websocket-mock,
     so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../../util/useThrottle', () => ({
+    jest.mock('../../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));