diff --git a/src/App.tsx b/src/App.tsx
index 308591811..a19ef925c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -41,7 +41,7 @@ import {Logger} from './fb-interfaces/Logger';
 import BugReporter from './fb-stubs/BugReporter';
 import {State as Store} from './reducers/index';
 import {StaticView, FlipperError} from './reducers/connections';
-import PluginManager from './chrome/PluginManager';
+import PluginManager from './chrome/plugin-manager/PluginManager';
 import StatusBar from './chrome/StatusBar';
 import SettingsSheet from './chrome/SettingsSheet';
 import DoctorSheet from './chrome/DoctorSheet';
diff --git a/src/chrome/PluginDebugger.tsx b/src/chrome/plugin-manager/PluginDebugger.tsx
similarity index 96%
rename from src/chrome/PluginDebugger.tsx
rename to src/chrome/plugin-manager/PluginDebugger.tsx
index de177295e..c71d52a0b 100644
--- a/src/chrome/PluginDebugger.tsx
+++ b/src/chrome/plugin-manager/PluginDebugger.tsx
@@ -7,9 +7,9 @@
  * @format
  */
 
-import {PluginDefinition} from '../dispatcher/plugins';
-import Client from '../Client';
-import {TableBodyRow} from '../ui/components/table/types';
+import {PluginDefinition} from '../../dispatcher/plugins';
+import Client from '../../Client';
+import {TableBodyRow} from '../../ui/components/table/types';
 import React, {Component, Fragment} from 'react';
 import {connect} from 'react-redux';
 import {
@@ -22,8 +22,8 @@ import {
   FlipperDevicePlugin,
   Bordered,
 } from 'flipper';
-import StatusIndicator from '../ui/components/StatusIndicator';
-import {State as Store} from '../reducers';
+import StatusIndicator from '../../ui/components/StatusIndicator';
+import {State as Store} from '../../reducers';
 
 const InfoText = styled(Text)({
   lineHeight: '130%',
diff --git a/src/chrome/PluginInstaller.tsx b/src/chrome/plugin-manager/PluginInstaller.tsx
similarity index 97%
rename from src/chrome/PluginInstaller.tsx
rename to src/chrome/plugin-manager/PluginInstaller.tsx
index 0cf2cd656..cb78fbdef 100644
--- a/src/chrome/PluginInstaller.tsx
+++ b/src/chrome/plugin-manager/PluginInstaller.tsx
@@ -31,13 +31,13 @@ import {SearchIndex} from 'algoliasearch';
 import {SearchResponse} from '@algolia/client-search';
 import path from 'path';
 import fs from 'fs-extra';
-import {reportPlatformFailures, reportUsage} from '../utils/metrics';
-import restartFlipper from '../utils/restartFlipper';
+import {reportPlatformFailures, reportUsage} from '../../utils/metrics';
+import restartFlipper from '../../utils/restartFlipper';
 import {
   PluginMap,
   PluginDefinition,
   registerInstalledPlugins,
-} from '../reducers/pluginManager';
+} from '../../reducers/pluginManager';
 import {
   PLUGIN_DIR,
   readInstalledPlugins,
@@ -45,8 +45,8 @@ import {
   provideSearchIndex,
   findPluginUpdates as _findPluginUpdates,
   UpdateResult,
-} from '../utils/pluginManager';
-import {State as AppState} from '../reducers';
+} from '../../utils/pluginManager';
+import {State as AppState} from '../../reducers';
 import {connect} from 'react-redux';
 import {Dispatch, Action} from 'redux';
 
diff --git a/src/chrome/PluginManager.tsx b/src/chrome/plugin-manager/PluginManager.tsx
similarity index 100%
rename from src/chrome/PluginManager.tsx
rename to src/chrome/plugin-manager/PluginManager.tsx
diff --git a/src/chrome/__tests__/PluginInstaller.node.tsx b/src/chrome/plugin-manager/__tests__/PluginInstaller.node.tsx
similarity index 95%
rename from src/chrome/__tests__/PluginInstaller.node.tsx
rename to src/chrome/plugin-manager/__tests__/PluginInstaller.node.tsx
index ee9f0751c..2d4977c14 100644
--- a/src/chrome/__tests__/PluginInstaller.node.tsx
+++ b/src/chrome/plugin-manager/__tests__/PluginInstaller.node.tsx
@@ -8,7 +8,7 @@
  */
 
 import {annotatePluginsWithUpdates} from '../PluginInstaller';
-import {UpdateResult} from '../../utils/pluginManager';
+import {UpdateResult} from '../../../utils/pluginManager';
 
 test('annotatePluginsWithUpdates', async () => {
   const installedPlugins = new Map([
diff --git a/src/dispatcher/__tests__/plugins.node.js b/src/dispatcher/__tests__/plugins.node.js
index 14b3a813d..579fd9ddd 100644
--- a/src/dispatcher/__tests__/plugins.node.js
+++ b/src/dispatcher/__tests__/plugins.node.js
@@ -34,7 +34,6 @@ test('dispatcher dispatches REGISTER_PLUGINS', () => {
 test('getDynamicPlugins returns empty array on errors', () => {
   ipcRenderer.sendSync = jest.fn();
   ipcRenderer.sendSync.mockImplementation(() => {
-    console.log('aaa');
     throw new Error('ooops');
   });
   const res = getDynamicPlugins();