diff --git a/packages/pl-hooks/lib/hooks/accounts/use-directory.ts b/packages/pl-hooks/lib/hooks/accounts/use-directory.ts
index d9363c251..e6b5e2321 100644
--- a/packages/pl-hooks/lib/hooks/accounts/use-directory.ts
+++ b/packages/pl-hooks/lib/hooks/accounts/use-directory.ts
@@ -1,6 +1,8 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 
-import { importEntities, usePlHooksApiClient, usePlHooksQueryClient } from 'pl-hooks/main';
+import { usePlHooksApiClient } from 'pl-hooks/contexts/api-client';
+import { usePlHooksQueryClient } from 'pl-hooks/contexts/query-client';
+import { importEntities } from 'pl-hooks/importer';
 
 const useDirectory = (order: 'active' | 'new', local: boolean = false) => {
   const { client } = usePlHooksApiClient();
diff --git a/packages/pl-hooks/lib/hooks/search/use-search.ts b/packages/pl-hooks/lib/hooks/search/use-search.ts
index 1e2d19458..6a438a81f 100644
--- a/packages/pl-hooks/lib/hooks/search/use-search.ts
+++ b/packages/pl-hooks/lib/hooks/search/use-search.ts
@@ -1,6 +1,8 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 
-import { importEntities, usePlHooksApiClient, usePlHooksQueryClient } from 'pl-hooks/main';
+import { usePlHooksApiClient } from 'pl-hooks/contexts/api-client';
+import { usePlHooksQueryClient } from 'pl-hooks/contexts/query-client';
+import { importEntities } from 'pl-hooks/importer';
 
 import type { SearchParams, Tag } from 'pl-api';
 import type { PaginationParams } from 'pl-api/dist/params/common';
diff --git a/packages/pl-hooks/lib/hooks/statuses/use-status.ts b/packages/pl-hooks/lib/hooks/statuses/use-status.ts
index f123e2821..85d9ecc2c 100644
--- a/packages/pl-hooks/lib/hooks/statuses/use-status.ts
+++ b/packages/pl-hooks/lib/hooks/statuses/use-status.ts
@@ -2,8 +2,8 @@ import { useQueries, useQuery, UseQueryOptions, type UseQueryResult } from '@tan
 
 import { usePlHooksApiClient } from 'pl-hooks/contexts/api-client';
 import { queryClient, usePlHooksQueryClient } from 'pl-hooks/contexts/query-client';
+import { usePoll } from 'pl-hooks/hooks/polls/use-poll';
 import { importEntities } from 'pl-hooks/importer';
-import { usePoll } from 'pl-hooks/main';
 import { type NormalizedAccount } from 'pl-hooks/normalizers/account';
 import { type NormalizedStatus, normalizeStatus } from 'pl-hooks/normalizers/status';