diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
index cb857c3d9..e351c511c 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
@@ -17,7 +17,7 @@ import {
   reportPlatformFailures,
   FlipperServerEvents,
 } from 'flipper-common';
-import CertificateProvider from '../utils/CertificateProvider';
+import CertificateProvider from './certificate-exchange/CertificateProvider';
 import {ClientConnection, ConnectionStatus} from './ClientConnection';
 import {EventEmitter} from 'events';
 import invariant from 'invariant';
@@ -44,7 +44,7 @@ import {
 import {
   extractAppNameFromCSR,
   loadSecureServerConfig,
-} from '../utils/certificateUtils';
+} from './certificate-exchange/certificate-utils';
 import DesktopCertificateProvider from '../devices/desktop/DesktopCertificateProvider';
 import WWWCertificateProvider from '../fb-stubs/WWWCertificateProvider';
 import {tracker} from '../utils/tracker';
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx
index 6d996cb48..b3eb340e0 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
 import ServerRSocket from './ServerRSocket';
 import SecureServerWebSocket from './SecureServerWebSocket';
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
index 62c3e222a..223f8eca1 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import ServerWebSocketBase, {
   SecureClientQuery,
   ServerEventsListener,
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx
index f7971a92c..ee3ff9ef6 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx
@@ -24,7 +24,7 @@ import {
   parseMessageToJson,
   verifyClientQueryComesFromCertExchangeSupportedOS,
 } from './Utilities';
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import {Server} from 'net';
 import {serializeError} from 'serialize-error';
 import {WSCloseCode} from '../utils/WSCloseCode';
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
index 2e87cc1c1..22b9fb430 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
@@ -13,7 +13,7 @@ import {
   ClientQuery,
   SignCertificateMessage,
 } from 'flipper-common';
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 
 /**
  * ClientCsrQuery defines a client query with CSR
diff --git a/desktop/flipper-server-core/src/utils/CertificateProvider.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/CertificateProvider.tsx
similarity index 99%
rename from desktop/flipper-server-core/src/utils/CertificateProvider.tsx
rename to desktop/flipper-server-core/src/app-connectivity/certificate-exchange/CertificateProvider.tsx
index e5f6fdff3..04609f234 100644
--- a/desktop/flipper-server-core/src/utils/CertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/CertificateProvider.tsx
@@ -15,7 +15,7 @@ import {
   extractAppNameFromCSR,
   generateClientCertificate,
   getCACertificate,
-} from './certificateUtils';
+} from './certificate-utils';
 
 export default abstract class CertificateProvider {
   abstract medium: CertificateExchangeMedium;
diff --git a/desktop/flipper-server-core/src/utils/certificateUtils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
similarity index 98%
rename from desktop/flipper-server-core/src/utils/certificateUtils.tsx
rename to desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
index 4e06b9329..c6a6432bc 100644
--- a/desktop/flipper-server-core/src/utils/certificateUtils.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
@@ -18,9 +18,9 @@ import path from 'path';
 import tmp, {FileOptions} from 'tmp';
 import {FlipperServerConfig, reportPlatformFailures} from 'flipper-common';
 import {isTest} from 'flipper-common';
-import {flipperDataFolder} from './paths';
+import {flipperDataFolder} from '../../utils/paths';
 import * as jwt from 'jsonwebtoken';
-import {getFlipperServerConfig} from '../FlipperServerConfig';
+import {getFlipperServerConfig} from '../../FlipperServerConfig';
 
 const tmpFile = promisify(tmp.file) as (
   options?: FileOptions,
diff --git a/desktop/flipper-server-core/src/utils/openssl-wrapper-with-promises.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/openssl-wrapper-with-promises.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/utils/openssl-wrapper-with-promises.tsx
rename to desktop/flipper-server-core/src/app-connectivity/certificate-exchange/openssl-wrapper-with-promises.tsx
diff --git a/desktop/flipper-server-core/src/devices/android/AndroidCertificateProvider.tsx b/desktop/flipper-server-core/src/devices/android/AndroidCertificateProvider.tsx
index 18fc654c2..c69578a8f 100644
--- a/desktop/flipper-server-core/src/devices/android/AndroidCertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/devices/android/AndroidCertificateProvider.tsx
@@ -7,10 +7,13 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import {Client} from 'adbkit';
 import * as androidUtil from './androidContainerUtility';
-import {csrFileName, extractAppNameFromCSR} from '../../utils/certificateUtils';
+import {
+  csrFileName,
+  extractAppNameFromCSR,
+} from '../../app-connectivity/certificate-exchange/certificate-utils';
 
 const logTag = 'AndroidCertificateProvider';
 
diff --git a/desktop/flipper-server-core/src/devices/desktop/DesktopCertificateProvider.tsx b/desktop/flipper-server-core/src/devices/desktop/DesktopCertificateProvider.tsx
index cbecfaa7d..0e44c42a9 100644
--- a/desktop/flipper-server-core/src/devices/desktop/DesktopCertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/devices/desktop/DesktopCertificateProvider.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import fs from 'fs-extra';
 
 export default class DesktopCertificateProvider extends CertificateProvider {
diff --git a/desktop/flipper-server-core/src/devices/ios/iOSCertificateProvider.tsx b/desktop/flipper-server-core/src/devices/ios/iOSCertificateProvider.tsx
index 90779024d..47a06ce4e 100644
--- a/desktop/flipper-server-core/src/devices/ios/iOSCertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/devices/ios/iOSCertificateProvider.tsx
@@ -7,12 +7,15 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import iosUtil, {IdbConfig} from './iOSContainerUtility';
 import fs from 'fs-extra';
 import {promisify} from 'util';
 import tmp, {DirOptions} from 'tmp';
-import {csrFileName, extractAppNameFromCSR} from '../../utils/certificateUtils';
+import {
+  csrFileName,
+  extractAppNameFromCSR,
+} from '../../app-connectivity/certificate-exchange/certificate-utils';
 import path from 'path';
 
 const tmpDir = promisify(tmp.dir) as (options?: DirOptions) => Promise<string>;
diff --git a/desktop/flipper-server-core/src/fb-stubs/WWWCertificateProvider.tsx b/desktop/flipper-server-core/src/fb-stubs/WWWCertificateProvider.tsx
index cf706ecab..ef3eb87d2 100644
--- a/desktop/flipper-server-core/src/fb-stubs/WWWCertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/fb-stubs/WWWCertificateProvider.tsx
@@ -8,7 +8,7 @@
  */
 
 import {KeytarManager} from '../utils/keytar';
-import CertificateProvider from '../utils/CertificateProvider';
+import CertificateProvider from '../app-connectivity/certificate-exchange/CertificateProvider';
 
 export default class WWWCertificateProvider extends CertificateProvider {
   name = 'WWWCertificateProvider';
diff --git a/desktop/flipper-server-core/src/index.tsx b/desktop/flipper-server-core/src/index.tsx
index c97511791..ddcbd44af 100644
--- a/desktop/flipper-server-core/src/index.tsx
+++ b/desktop/flipper-server-core/src/index.tsx
@@ -23,4 +23,7 @@ export {isFBBuild} from './fb-stubs/constants';
 
 export {WEBSOCKET_MAX_MESSAGE_SIZE} from './app-connectivity/ServerWebSocket';
 
-export {getAuthToken, hasAuthToken} from './utils/certificateUtils';
+export {
+  getAuthToken,
+  hasAuthToken,
+} from './app-connectivity/certificate-exchange/certificate-utils';
diff --git a/desktop/flipper-server-core/src/server/startServer.tsx b/desktop/flipper-server-core/src/server/startServer.tsx
index 9372d8a11..bfab9dc09 100644
--- a/desktop/flipper-server-core/src/server/startServer.tsx
+++ b/desktop/flipper-server-core/src/server/startServer.tsx
@@ -23,7 +23,7 @@ import exitHook from 'exit-hook';
 import {attachSocketServer} from './attachSocketServer';
 import {FlipperServerImpl} from '../FlipperServerImpl';
 import {FlipperServerCompanionEnv} from 'flipper-server-companion';
-import {validateAuthToken} from '../utils/certificateUtils';
+import {validateAuthToken} from '../app-connectivity/certificate-exchange/certificate-utils';
 import {tracker} from '../utils/tracker';
 
 type Config = {