diff --git a/app/soapbox/api/hooks/streaming/useDirectStream.ts b/app/soapbox/api/hooks/streaming/useDirectStream.ts
index 9d3b47853..972a5f769 100644
--- a/app/soapbox/api/hooks/streaming/useDirectStream.ts
+++ b/app/soapbox/api/hooks/streaming/useDirectStream.ts
@@ -1,4 +1,4 @@
-import { useLoggedIn } from 'soapbox/hooks';
+import { useLoggedIn } from 'soapbox/hooks/useLoggedIn';
 
 import { useTimelineStream } from './useTimelineStream';
 
diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx
index a57fc9a1a..d17089475 100644
--- a/app/soapbox/components/ui/card/card.tsx
+++ b/app/soapbox/components/ui/card/card.tsx
@@ -3,9 +3,11 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
-import { HStack, Text } from 'soapbox/components/ui';
 import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
 
+import HStack from '../hstack/hstack';
+import Text from '../text/text';
+
 const sizes = {
   md: 'p-4 sm:rounded-xl',
   lg: 'p-4 sm:p-6 sm:rounded-xl',
diff --git a/app/soapbox/entity-store/hooks/useBatchedEntities.ts b/app/soapbox/entity-store/hooks/useBatchedEntities.ts
index 9ea6b3f8c..928c32b83 100644
--- a/app/soapbox/entity-store/hooks/useBatchedEntities.ts
+++ b/app/soapbox/entity-store/hooks/useBatchedEntities.ts
@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
 import { z } from 'zod';
 
-import { useAppDispatch, useAppSelector, useGetState } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useGetState } from 'soapbox/hooks/useGetState';
 import { filteredArray } from 'soapbox/schemas/utils';
 
 import { entitiesFetchFail, entitiesFetchRequest, entitiesFetchSuccess } from '../actions';
diff --git a/app/soapbox/entity-store/hooks/useChangeEntity.ts b/app/soapbox/entity-store/hooks/useChangeEntity.ts
index 5276d4361..670c3a486 100644
--- a/app/soapbox/entity-store/hooks/useChangeEntity.ts
+++ b/app/soapbox/entity-store/hooks/useChangeEntity.ts
@@ -1,7 +1,8 @@
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { type Entity } from 'soapbox/entity-store/types';
-import { useAppDispatch, useGetState } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useGetState } from 'soapbox/hooks/useGetState';
 
 type ChangeEntityFn<TEntity extends Entity> = (entity: TEntity) => TEntity
 
diff --git a/app/soapbox/entity-store/hooks/useCreateEntity.ts b/app/soapbox/entity-store/hooks/useCreateEntity.ts
index 24ce3af7d..3e1498210 100644
--- a/app/soapbox/entity-store/hooks/useCreateEntity.ts
+++ b/app/soapbox/entity-store/hooks/useCreateEntity.ts
@@ -1,7 +1,8 @@
 import { AxiosError } from 'axios';
 import { z } from 'zod';
 
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 
diff --git a/app/soapbox/entity-store/hooks/useDeleteEntity.ts b/app/soapbox/entity-store/hooks/useDeleteEntity.ts
index dac1d9a26..b406c0534 100644
--- a/app/soapbox/entity-store/hooks/useDeleteEntity.ts
+++ b/app/soapbox/entity-store/hooks/useDeleteEntity.ts
@@ -1,4 +1,6 @@
-import { useAppDispatch, useGetState, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useGetState } from 'soapbox/hooks/useGetState';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { deleteEntities, importEntities } from '../actions';
 
diff --git a/app/soapbox/entity-store/hooks/useDismissEntity.ts b/app/soapbox/entity-store/hooks/useDismissEntity.ts
index b09e35951..a9bd531a3 100644
--- a/app/soapbox/entity-store/hooks/useDismissEntity.ts
+++ b/app/soapbox/entity-store/hooks/useDismissEntity.ts
@@ -1,4 +1,5 @@
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { dismissEntities } from '../actions';
 
diff --git a/app/soapbox/entity-store/hooks/useEntities.ts b/app/soapbox/entity-store/hooks/useEntities.ts
index 1ec868c03..4cf58d1f1 100644
--- a/app/soapbox/entity-store/hooks/useEntities.ts
+++ b/app/soapbox/entity-store/hooks/useEntities.ts
@@ -2,7 +2,10 @@ import { useEffect } from 'react';
 import z from 'zod';
 
 import { getNextLink, getPrevLink } from 'soapbox/api';
-import { useApi, useAppDispatch, useAppSelector, useGetState } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useGetState } from 'soapbox/hooks/useGetState';
 import { filteredArray } from 'soapbox/schemas/utils';
 import { realNumberSchema } from 'soapbox/utils/numbers';
 
diff --git a/app/soapbox/entity-store/hooks/useEntity.ts b/app/soapbox/entity-store/hooks/useEntity.ts
index af4aa06bc..116eaff96 100644
--- a/app/soapbox/entity-store/hooks/useEntity.ts
+++ b/app/soapbox/entity-store/hooks/useEntity.ts
@@ -2,7 +2,9 @@ import { AxiosError } from 'axios';
 import { useEffect, useState } from 'react';
 import z from 'zod';
 
-import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 import { selectEntity } from '../selectors';
diff --git a/app/soapbox/entity-store/hooks/useEntityActions.ts b/app/soapbox/entity-store/hooks/useEntityActions.ts
index 449817e32..a3bb71597 100644
--- a/app/soapbox/entity-store/hooks/useEntityActions.ts
+++ b/app/soapbox/entity-store/hooks/useEntityActions.ts
@@ -1,4 +1,4 @@
-import { useApi } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 
 import { useCreateEntity } from './useCreateEntity';
 import { useDeleteEntity } from './useDeleteEntity';
diff --git a/app/soapbox/entity-store/hooks/useEntityLookup.ts b/app/soapbox/entity-store/hooks/useEntityLookup.ts
index 1a8a11eda..a54882d6f 100644
--- a/app/soapbox/entity-store/hooks/useEntityLookup.ts
+++ b/app/soapbox/entity-store/hooks/useEntityLookup.ts
@@ -2,7 +2,9 @@ import { AxiosError } from 'axios';
 import { useEffect, useState } from 'react';
 import { z } from 'zod';
 
-import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 import { findEntity } from '../selectors';
diff --git a/app/soapbox/entity-store/hooks/useIncrementEntity.ts b/app/soapbox/entity-store/hooks/useIncrementEntity.ts
index 2b09cc445..06f8b2352 100644
--- a/app/soapbox/entity-store/hooks/useIncrementEntity.ts
+++ b/app/soapbox/entity-store/hooks/useIncrementEntity.ts
@@ -1,4 +1,5 @@
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { incrementEntities } from '../actions';
 
diff --git a/app/soapbox/entity-store/hooks/useTransaction.ts b/app/soapbox/entity-store/hooks/useTransaction.ts
index eaedd1843..691d895c0 100644
--- a/app/soapbox/entity-store/hooks/useTransaction.ts
+++ b/app/soapbox/entity-store/hooks/useTransaction.ts
@@ -1,5 +1,5 @@
 import { entitiesTransaction } from 'soapbox/entity-store/actions';
-import { useAppDispatch } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
 
 import type { EntityTypes } from 'soapbox/entity-store/entities';
 import type { EntitiesTransaction, Entity } from 'soapbox/entity-store/types';
diff --git a/app/soapbox/hooks/useCompose.ts b/app/soapbox/hooks/useCompose.ts
index 4b3c9959e..0d0ef1688 100644
--- a/app/soapbox/hooks/useCompose.ts
+++ b/app/soapbox/hooks/useCompose.ts
@@ -1,4 +1,4 @@
-import { useAppSelector } from 'soapbox/hooks';
+import { useAppSelector } from './useAppSelector';
 
 import type { ReducerCompose } from 'soapbox/reducers/compose';
 
diff --git a/app/soapbox/hooks/useGroupsPath.ts b/app/soapbox/hooks/useGroupsPath.ts
index 7a101e463..71aa3c8da 100644
--- a/app/soapbox/hooks/useGroupsPath.ts
+++ b/app/soapbox/hooks/useGroupsPath.ts
@@ -1,4 +1,4 @@
-import { useGroups } from 'soapbox/api/hooks';
+import { useGroups } from 'soapbox/api/hooks/groups/useGroups';
 
 import { useFeatures } from './useFeatures';
 
diff --git a/app/soapbox/hooks/useInstance.ts b/app/soapbox/hooks/useInstance.ts
index 1a6c18362..dab7d2bbe 100644
--- a/app/soapbox/hooks/useInstance.ts
+++ b/app/soapbox/hooks/useInstance.ts
@@ -1,4 +1,4 @@
-import { useAppSelector } from 'soapbox/hooks';
+import { useAppSelector } from './useAppSelector';
 
 /** Get the Instance for the current backend. */
 export const useInstance = () => {
diff --git a/app/soapbox/hooks/useOwnAccount.ts b/app/soapbox/hooks/useOwnAccount.ts
index 800f9bb63..6792ca603 100644
--- a/app/soapbox/hooks/useOwnAccount.ts
+++ b/app/soapbox/hooks/useOwnAccount.ts
@@ -1,8 +1,9 @@
 import { useCallback } from 'react';
 
-import { useAppSelector } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
 
+import { useAppSelector } from './useAppSelector';
+
 /** Get the logged-in account from the store, if any. */
 export const useOwnAccount = () => {
   const getAccount = useCallback(makeGetAccount(), []);
diff --git a/app/soapbox/hooks/useSettings.ts b/app/soapbox/hooks/useSettings.ts
index 8ad86af71..85b7a902a 100644
--- a/app/soapbox/hooks/useSettings.ts
+++ b/app/soapbox/hooks/useSettings.ts
@@ -1,5 +1,6 @@
 import { getSettings } from 'soapbox/actions/settings';
-import { useAppSelector } from 'soapbox/hooks';
+
+import { useAppSelector } from './useAppSelector';
 
 import type { Map as ImmutableMap } from 'immutable';
 
diff --git a/app/soapbox/hooks/useSoapboxConfig.ts b/app/soapbox/hooks/useSoapboxConfig.ts
index 92a1ddc21..3f4c33e82 100644
--- a/app/soapbox/hooks/useSoapboxConfig.ts
+++ b/app/soapbox/hooks/useSoapboxConfig.ts
@@ -1,5 +1,6 @@
 import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import { useAppSelector } from 'soapbox/hooks';
+
+import { useAppSelector } from './useAppSelector';
 
 import type { SoapboxConfig } from 'soapbox/types/soapbox';