diff --git a/desktop/flipper-server-core/src/FlipperServerImpl.tsx b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
index 8cfe798c1..bf657b6e0 100644
--- a/desktop/flipper-server-core/src/FlipperServerImpl.tsx
+++ b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
@@ -10,7 +10,7 @@
 import './utils/macCa';
 import './utils/fetch-polyfill';
 import EventEmitter from 'events';
-import {ServerController} from './comms/ServerController';
+import {ServerController} from './app-connectivity/ServerController';
 import {AndroidDeviceManager} from './devices/android/androidDeviceManager';
 import {IOSDeviceManager} from './devices/ios/iOSDeviceManager';
 import metroDevice from './devices/metro/metroDeviceManager';
@@ -52,7 +52,7 @@ import {promises} from 'fs';
 import rm from 'rimraf';
 import assert from 'assert';
 import {initializeAdbClient} from './devices/android/adbClient';
-import {assertNotNull} from './comms/Utilities';
+import {assertNotNull} from './app-connectivity/Utilities';
 import {mkdirp} from 'fs-extra';
 import {flipperDataFolder, flipperSettingsFolder} from './utils/paths';
 import {DebuggableDevice} from './devices/DebuggableDevice';
diff --git a/desktop/flipper-server-core/src/comms/BrowserClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/BrowserClientConnection.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/BrowserClientConnection.tsx
rename to desktop/flipper-server-core/src/app-connectivity/BrowserClientConnection.tsx
diff --git a/desktop/flipper-server-core/src/comms/BrowserServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/BrowserServerWebSocket.tsx
rename to desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
diff --git a/desktop/flipper-server-core/src/comms/ClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/ClientConnection.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ClientConnection.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ClientConnection.tsx
diff --git a/desktop/flipper-server-core/src/comms/SecureServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/SecureServerWebSocket.tsx
rename to desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
diff --git a/desktop/flipper-server-core/src/comms/ServerController.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ServerController.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
diff --git a/desktop/flipper-server-core/src/comms/ServerFactory.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ServerFactory.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx
diff --git a/desktop/flipper-server-core/src/comms/ServerRSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ServerRSocket.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
diff --git a/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ServerWebSocket.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx
diff --git a/desktop/flipper-server-core/src/comms/ServerWebSocketBase.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/ServerWebSocketBase.tsx
rename to desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
diff --git a/desktop/flipper-server-core/src/comms/Utilities.tsx b/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/Utilities.tsx
rename to desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
diff --git a/desktop/flipper-server-core/src/comms/WebSocketClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/WebSocketClientConnection.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/WebSocketClientConnection.tsx
rename to desktop/flipper-server-core/src/app-connectivity/WebSocketClientConnection.tsx
diff --git a/desktop/flipper-server-core/src/comms/__tests__/BrowserServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/__tests__/BrowserServerWebSocket.node.tsx
rename to desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
diff --git a/desktop/flipper-server-core/src/comms/__tests__/SecureServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/__tests__/SecureServerWebSocket.node.tsx
rename to desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
diff --git a/desktop/flipper-server-core/src/comms/__tests__/ServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/ServerWebSocket.node.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/__tests__/ServerWebSocket.node.tsx
rename to desktop/flipper-server-core/src/app-connectivity/__tests__/ServerWebSocket.node.tsx
diff --git a/desktop/flipper-server-core/src/comms/__tests__/utils.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/utils.tsx
similarity index 100%
rename from desktop/flipper-server-core/src/comms/__tests__/utils.tsx
rename to desktop/flipper-server-core/src/app-connectivity/__tests__/utils.tsx
diff --git a/desktop/flipper-server-core/src/index.tsx b/desktop/flipper-server-core/src/index.tsx
index a9dc5ce78..c97511791 100644
--- a/desktop/flipper-server-core/src/index.tsx
+++ b/desktop/flipper-server-core/src/index.tsx
@@ -21,6 +21,6 @@ export * from './server/startServer';
 export * from './server/utilities';
 export {isFBBuild} from './fb-stubs/constants';
 
-export {WEBSOCKET_MAX_MESSAGE_SIZE} from './comms/ServerWebSocket';
+export {WEBSOCKET_MAX_MESSAGE_SIZE} from './app-connectivity/ServerWebSocket';
 
 export {getAuthToken, hasAuthToken} from './utils/certificateUtils';
diff --git a/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx b/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx
index 507ff855c..55f1f9101 100644
--- a/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx
+++ b/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx
@@ -13,7 +13,7 @@ import {
   FlipperServerForServerAddOn,
   ServerAddOnStartDetails,
 } from 'flipper-common';
-import {assertNotNull} from '../comms/Utilities';
+import {assertNotNull} from '../app-connectivity/Utilities';
 import {StateMachine} from '../utils/StateMachine';
 import {ServerAddOn} from './ServerAddOn';
 
diff --git a/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx b/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx
index bb03c8f30..285eb0bf7 100644
--- a/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx
+++ b/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx
@@ -8,7 +8,7 @@
  */
 
 import assert from 'assert';
-import {assertNotNull} from '../comms/Utilities';
+import {assertNotNull} from '../app-connectivity/Utilities';
 import {
   FlipperServerForServerAddOn,
   ServerAddOnCleanup,
diff --git a/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx b/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx
index 8d031eff2..c3ea11c6e 100644
--- a/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx
+++ b/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx
@@ -11,7 +11,7 @@ import {
   ServerAddOn as ServerAddOnFn,
   ServerAddOnStartDetails,
 } from 'flipper-common';
-import {assertNotNull} from '../comms/Utilities';
+import {assertNotNull} from '../app-connectivity/Utilities';
 import * as FlipperPluginSDK from 'flipper-plugin-core';
 
 declare global {
diff --git a/desktop/flipper-server-core/src/server/startServer.tsx b/desktop/flipper-server-core/src/server/startServer.tsx
index 18aa6be2e..9372d8a11 100644
--- a/desktop/flipper-server-core/src/server/startServer.tsx
+++ b/desktop/flipper-server-core/src/server/startServer.tsx
@@ -14,7 +14,7 @@ import http, {ServerResponse} from 'http';
 import path from 'path';
 import fs from 'fs-extra';
 import {ServerOptions, VerifyClientCallbackSync, WebSocketServer} from 'ws';
-import {WEBSOCKET_MAX_MESSAGE_SIZE} from '../comms/ServerWebSocket';
+import {WEBSOCKET_MAX_MESSAGE_SIZE} from '../app-connectivity/ServerWebSocket';
 import {parse} from 'url';
 import {makeSocketPath, checkSocketInUse} from './utilities';
 
diff --git a/desktop/flipper-server-core/src/utils/DeviceListener.tsx b/desktop/flipper-server-core/src/utils/DeviceListener.tsx
index 8a31628fc..cf2807eb5 100644
--- a/desktop/flipper-server-core/src/utils/DeviceListener.tsx
+++ b/desktop/flipper-server-core/src/utils/DeviceListener.tsx
@@ -8,7 +8,7 @@
  */
 
 import {sleep} from 'flipper-common';
-import {assertNotNull} from '../comms/Utilities';
+import {assertNotNull} from '../app-connectivity/Utilities';
 import {StateMachine} from './StateMachine';
 
 export const RESTART_CNT = 3;