diff --git a/desktop/app/src/Client.tsx b/desktop/app/src/Client.tsx
index e14a955ec..24fb45f90 100644
--- a/desktop/app/src/Client.tsx
+++ b/desktop/app/src/Client.tsx
@@ -14,7 +14,7 @@ import {
   FlipperDevicePlugin,
 } from './plugin';
 import BaseDevice, {OS} from './devices/BaseDevice';
-import {App} from './App';
+import {LegacyApp} from './chrome/LegacyApp';
 import {Logger} from './fb-interfaces/Logger';
 import {Store} from './reducers/index';
 import {setPluginState} from './reducers/pluginStates';
@@ -124,7 +124,7 @@ export interface FlipperClientConnection<D, M> {
 }
 
 export default class Client extends EventEmitter {
-  app: App | undefined;
+  app: LegacyApp | undefined;
   connected: boolean;
   id: string;
   query: ClientQuery;
diff --git a/desktop/app/src/fb-stubs/App.tsx b/desktop/app/src/chrome/AppWrapper.tsx
similarity index 88%
rename from desktop/app/src/fb-stubs/App.tsx
rename to desktop/app/src/chrome/AppWrapper.tsx
index e9dc5856f..75b592cc6 100644
--- a/desktop/app/src/fb-stubs/App.tsx
+++ b/desktop/app/src/chrome/AppWrapper.tsx
@@ -9,8 +9,8 @@
 
 import React from 'react';
 import {useState, useEffect} from 'react';
-import FlipperApp from '../App';
-import WarningEmployee from '../chrome/WarningEmployee';
+import LegacyApp from './LegacyApp';
+import WarningEmployee from './WarningEmployee';
 import fbConfig from '../fb-stubs/config';
 import {isFBEmployee} from '../utils/fbEmployee';
 import {Logger} from '../fb-interfaces/Logger';
@@ -37,6 +37,6 @@ export default function App(props: Props) {
   ) : isSandyEnabled() ? (
     <SandyApp />
   ) : (
-    <FlipperApp logger={props.logger} />
+    <LegacyApp logger={props.logger} />
   );
 }
diff --git a/desktop/app/src/App.tsx b/desktop/app/src/chrome/LegacyApp.tsx
similarity index 81%
rename from desktop/app/src/App.tsx
rename to desktop/app/src/chrome/LegacyApp.tsx
index 6ab5eeb11..f7552aa31 100644
--- a/desktop/app/src/App.tsx
+++ b/desktop/app/src/chrome/LegacyApp.tsx
@@ -8,24 +8,24 @@
  */
 
 import React from 'react';
-import {FlexRow, styled, Layout} from './ui';
+import {FlexRow, styled, Layout} from '../ui';
 import {connect} from 'react-redux';
-import TitleBar from './chrome/TitleBar';
-import MainSidebar2 from './chrome/mainsidebar/MainSidebar2';
-import DoctorBar from './chrome/DoctorBar';
-import PluginContainer from './PluginContainer';
+import TitleBar from './TitleBar';
+import MainSidebar2 from './mainsidebar/MainSidebar2';
+import DoctorBar from './DoctorBar';
+import PluginContainer from '../PluginContainer';
 import {ipcRenderer, remote} from 'electron';
 import {
   ACTIVE_SHEET_CHANGELOG_RECENT_ONLY,
   setActiveSheet,
-} from './reducers/application';
-import {Logger} from './fb-interfaces/Logger';
-import {State as Store} from './reducers/index';
-import {StaticView} from './reducers/connections';
-import StatusBar from './chrome/StatusBar';
-import {hasNewChangesToShow} from './chrome/ChangelogSheet';
-import QPL, {QuickLogActionType, FLIPPER_QPL_EVENTS} from './fb-stubs/QPL';
-import {SheetRenderer} from './chrome/SheetRenderer';
+} from '../reducers/application';
+import {Logger} from '../fb-interfaces/Logger';
+import {State as Store} from '../reducers/index';
+import {StaticView} from '../reducers/connections';
+import StatusBar from './StatusBar';
+import {hasNewChangesToShow} from './ChangelogSheet';
+import QPL, {QuickLogActionType, FLIPPER_QPL_EVENTS} from '../fb-stubs/QPL';
+import {SheetRenderer} from './SheetRenderer';
 
 const version = remote.app.getVersion();
 
@@ -74,7 +74,7 @@ export function registerStartupTime(logger: Logger) {
   ipcRenderer.send('componentDidMount');
 }
 
-export class App extends React.Component<Props> {
+export class LegacyApp extends React.Component<Props> {
   componentDidMount() {
     registerStartupTime(this.props.logger);
     if (hasNewChangesToShow(window.localStorage)) {
@@ -135,4 +135,4 @@ export default connect<StateFromProps, DispatchProps, OwnProps, Store>(
   {
     setActiveSheet,
   },
-)(App);
+)(LegacyApp);
diff --git a/desktop/app/src/init.tsx b/desktop/app/src/init.tsx
index ce480b759..6e26c5e47 100644
--- a/desktop/app/src/init.tsx
+++ b/desktop/app/src/init.tsx
@@ -13,7 +13,7 @@ import ReactDOM from 'react-dom';
 import ContextMenuProvider from './ui/components/ContextMenuProvider';
 import GK from './fb-stubs/GK';
 import {init as initLogger} from './fb-stubs/Logger';
-import App from './fb-stubs/App';
+import App from './chrome/AppWrapper';
 import setupPrefetcher from './fb-stubs/Prefetcher';
 import {persistStore} from 'redux-persist';
 import {Store} from './reducers/index';
diff --git a/desktop/app/src/sandy-chrome/SandyApp.tsx b/desktop/app/src/sandy-chrome/SandyApp.tsx
index 7962b6f6d..a8b4877dd 100644
--- a/desktop/app/src/sandy-chrome/SandyApp.tsx
+++ b/desktop/app/src/sandy-chrome/SandyApp.tsx
@@ -14,7 +14,7 @@ import {Layout, Sidebar} from '../ui';
 import {theme} from 'flipper-plugin';
 
 import {LeftRail} from './LeftRail';
-import {registerStartupTime} from '../App';
+import {registerStartupTime} from '../chrome/LegacyApp';
 import {useStore, useDispatch} from '../utils/useStore';
 import {SandyContext} from './SandyContext';
 import {ConsoleLogs} from '../chrome/ConsoleLogs';