diff --git a/lib/components/keyserver-connection-handler.js b/lib/keyserver-conn/keyserver-connection-handler.js
rename from lib/components/keyserver-connection-handler.js
rename to lib/keyserver-conn/keyserver-connection-handler.js
--- a/lib/components/keyserver-connection-handler.js
+++ b/lib/keyserver-conn/keyserver-connection-handler.js
@@ -3,19 +3,19 @@
 import invariant from 'invariant';
 import * as React from 'react';
 
+import { useCallKeyserverEndpointContext } from './call-keyserver-endpoint-provider.react.js';
+import { extractKeyserverIDFromID } from './keyserver-call-utils.js';
+import {
+  CANCELLED_ERROR,
+  type CallKeyserverEndpoint,
+} from './keyserver-conn-types.js';
+import { useKeyserverRecoveryLogIn } from './recovery-utils.js';
 import {
   keyserverAuthActionTypes,
   logOutActionTypes,
   keyserverAuthRawAction,
   useLogOut,
 } from '../actions/user-actions.js';
-import { useCallKeyserverEndpointContext } from '../keyserver-conn/call-keyserver-endpoint-provider.react.js';
-import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
-import {
-  CANCELLED_ERROR,
-  type CallKeyserverEndpoint,
-} from '../keyserver-conn/keyserver-conn-types.js';
-import { useKeyserverRecoveryLogIn } from '../keyserver-conn/recovery-utils.js';
 import { filterThreadIDsInFilterList } from '../reducers/calendar-filters-reducer.js';
 import {
   connectionSelector,
diff --git a/lib/components/keyserver-connections-handler.js b/lib/keyserver-conn/keyserver-connections-handler.js
rename from lib/components/keyserver-connections-handler.js
rename to lib/keyserver-conn/keyserver-connections-handler.js
diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -28,7 +28,6 @@
 import { ENSCacheProvider } from 'lib/components/ens-cache-provider.react.js';
 import { FarcasterDataHandler } from 'lib/components/farcaster-data-handler.react.js';
 import IntegrityHandler from 'lib/components/integrity-handler.react.js';
-import KeyserverConnectionsHandler from 'lib/components/keyserver-connections-handler.js';
 import { MediaCacheProvider } from 'lib/components/media-cache-provider.react.js';
 import { NeynarClientProvider } from 'lib/components/neynar-client-provider.react.js';
 import PrekeysHandler from 'lib/components/prekeys-handler.react.js';
@@ -36,6 +35,7 @@
 import { DBOpsHandler } from 'lib/handlers/db-ops-handler.react.js';
 import { IdentitySearchProvider } from 'lib/identity-search/identity-search-context.js';
 import { CallKeyserverEndpointProvider } from 'lib/keyserver-conn/call-keyserver-endpoint-provider.react.js';
+import KeyserverConnectionsHandler from 'lib/keyserver-conn/keyserver-connections-handler.js';
 import { TunnelbrokerProvider } from 'lib/tunnelbroker/tunnelbroker-context.js';
 import { actionLogger } from 'lib/utils/action-logger.js';
 
diff --git a/web/root.js b/web/root.js
--- a/web/root.js
+++ b/web/root.js
@@ -12,10 +12,10 @@
 import { WagmiProvider } from 'wagmi';
 
 import IntegrityHandler from 'lib/components/integrity-handler.react.js';
-import KeyserverConnectionsHandler from 'lib/components/keyserver-connections-handler.js';
 import PrekeysHandler from 'lib/components/prekeys-handler.react.js';
 import ReportHandler from 'lib/components/report-handler.react.js';
 import { CallKeyserverEndpointProvider } from 'lib/keyserver-conn/call-keyserver-endpoint-provider.react.js';
+import KeyserverConnectionsHandler from 'lib/keyserver-conn/keyserver-connections-handler.js';
 import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js';
 import { getWagmiConfig } from 'lib/utils/wagmi-utils.js';