diff --git a/.eslintignore b/.eslintignore
index d2764af1a2..82c905afa2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,7 +7,7 @@ lib/
 *.js
 src/generated/*
 src/server/chromium/protocol.ts
-src/firefox/protocol.ts
+src/server/firefox/protocol.ts
 src/server/webkit/protocol.ts
 /types/*
 /index.d.ts
diff --git a/src/firefox/ffAccessibility.ts b/src/server/firefox/ffAccessibility.ts
similarity index 98%
rename from src/firefox/ffAccessibility.ts
rename to src/server/firefox/ffAccessibility.ts
index ce057dba0f..6b3b02e97d 100644
--- a/src/firefox/ffAccessibility.ts
+++ b/src/server/firefox/ffAccessibility.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import * as accessibility from '../accessibility';
+import * as accessibility from '../../accessibility';
 import { FFSession } from './ffConnection';
 import { Protocol } from './protocol';
-import * as dom from '../dom';
-import * as types from '../types';
+import * as dom from '../../dom';
+import * as types from '../../types';
 
 export async function getAccessibilityTree(session: FFSession, needle?: dom.ElementHandle): Promise<{tree: accessibility.AXNode, needle: accessibility.AXNode | null}> {
   const objectId = needle ? needle._objectId : undefined;
diff --git a/src/firefox/ffBrowser.ts b/src/server/firefox/ffBrowser.ts
similarity index 97%
rename from src/firefox/ffBrowser.ts
rename to src/server/firefox/ffBrowser.ts
index bb88fe0125..fefa81605f 100644
--- a/src/firefox/ffBrowser.ts
+++ b/src/server/firefox/ffBrowser.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { Browser, BrowserOptions } from '../browser';
-import { assertBrowserContextIsNotOwned, BrowserContext, validateBrowserContextOptions, verifyGeolocation } from '../browserContext';
-import { helper, RegisteredListener } from '../helper';
-import { assert } from '../utils/utils';
-import * as network from '../network';
-import { Page, PageBinding } from '../page';
-import { ConnectionTransport } from '../transport';
-import * as types from '../types';
+import { Browser, BrowserOptions } from '../../browser';
+import { assertBrowserContextIsNotOwned, BrowserContext, validateBrowserContextOptions, verifyGeolocation } from '../../browserContext';
+import { helper, RegisteredListener } from '../../helper';
+import { assert } from '../../utils/utils';
+import * as network from '../../network';
+import { Page, PageBinding } from '../../page';
+import { ConnectionTransport } from '../../transport';
+import * as types from '../../types';
 import { ConnectionEvents, FFConnection } from './ffConnection';
 import { FFPage } from './ffPage';
 import { Protocol } from './protocol';
diff --git a/src/firefox/ffConnection.ts b/src/server/firefox/ffConnection.ts
similarity index 98%
rename from src/firefox/ffConnection.ts
rename to src/server/firefox/ffConnection.ts
index 7c9c272e09..f19433b195 100644
--- a/src/firefox/ffConnection.ts
+++ b/src/server/firefox/ffConnection.ts
@@ -16,11 +16,11 @@
  */
 
 import { EventEmitter } from 'events';
-import { assert } from '../utils/utils';
-import { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
+import { assert } from '../../utils/utils';
+import { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../../transport';
 import { Protocol } from './protocol';
-import { rewriteErrorMessage } from '../utils/stackTrace';
-import { debugLogger } from '../utils/debugLogger';
+import { rewriteErrorMessage } from '../../utils/stackTrace';
+import { debugLogger } from '../../utils/debugLogger';
 
 export const ConnectionEvents = {
   Disconnected: Symbol('Disconnected'),
diff --git a/src/firefox/ffExecutionContext.ts b/src/server/firefox/ffExecutionContext.ts
similarity index 95%
rename from src/firefox/ffExecutionContext.ts
rename to src/server/firefox/ffExecutionContext.ts
index f23fc4ce59..5194d3d5fe 100644
--- a/src/firefox/ffExecutionContext.ts
+++ b/src/server/firefox/ffExecutionContext.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import * as js from '../javascript';
+import * as js from '../../javascript';
 import { FFSession } from './ffConnection';
 import { Protocol } from './protocol';
-import * as sourceMap from '../utils/sourceMap';
-import { rewriteErrorMessage } from '../utils/stackTrace';
-import { parseEvaluationResultValue } from '../common/utilityScriptSerializers';
+import * as sourceMap from '../../utils/sourceMap';
+import { rewriteErrorMessage } from '../../utils/stackTrace';
+import { parseEvaluationResultValue } from '../../common/utilityScriptSerializers';
 
 export class FFExecutionContext implements js.ExecutionContextDelegate {
   _session: FFSession;
diff --git a/src/firefox/ffInput.ts b/src/server/firefox/ffInput.ts
similarity index 98%
rename from src/firefox/ffInput.ts
rename to src/server/firefox/ffInput.ts
index 968a44a4f9..337b05dbec 100644
--- a/src/firefox/ffInput.ts
+++ b/src/server/firefox/ffInput.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import * as input from '../input';
-import * as types from '../types';
+import * as input from '../../input';
+import * as types from '../../types';
 import { FFSession } from './ffConnection';
 
 function toModifiersMask(modifiers: Set<types.KeyboardModifier>): number {
diff --git a/src/firefox/ffNetworkManager.ts b/src/server/firefox/ffNetworkManager.ts
similarity index 96%
rename from src/firefox/ffNetworkManager.ts
rename to src/server/firefox/ffNetworkManager.ts
index 0dd62d910b..35d0a7bf52 100644
--- a/src/firefox/ffNetworkManager.ts
+++ b/src/server/firefox/ffNetworkManager.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import { helper, RegisteredListener } from '../helper';
+import { helper, RegisteredListener } from '../../helper';
 import { FFSession } from './ffConnection';
-import { Page } from '../page';
-import * as network from '../network';
-import * as frames from '../frames';
-import * as types from '../types';
+import { Page } from '../../page';
+import * as network from '../../network';
+import * as frames from '../../frames';
+import * as types from '../../types';
 import { Protocol } from './protocol';
 
 export class FFNetworkManager {
diff --git a/src/firefox/ffPage.ts b/src/server/firefox/ffPage.ts
similarity index 97%
rename from src/firefox/ffPage.ts
rename to src/server/firefox/ffPage.ts
index 89c37ff701..5eac61b04e 100644
--- a/src/firefox/ffPage.ts
+++ b/src/server/firefox/ffPage.ts
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import * as dialog from '../dialog';
-import * as dom from '../dom';
-import * as frames from '../frames';
-import { helper, RegisteredListener } from '../helper';
-import { assert } from '../utils/utils';
-import { Page, PageBinding, PageDelegate, Worker } from '../page';
-import { kScreenshotDuringNavigationError } from '../screenshotter';
-import * as types from '../types';
+import * as dialog from '../../dialog';
+import * as dom from '../../dom';
+import * as frames from '../../frames';
+import { helper, RegisteredListener } from '../../helper';
+import { assert } from '../../utils/utils';
+import { Page, PageBinding, PageDelegate, Worker } from '../../page';
+import { kScreenshotDuringNavigationError } from '../../screenshotter';
+import * as types from '../../types';
 import { getAccessibilityTree } from './ffAccessibility';
 import { FFBrowserContext } from './ffBrowser';
 import { FFSession, FFSessionEvents } from './ffConnection';
@@ -30,9 +30,9 @@ import { FFExecutionContext } from './ffExecutionContext';
 import { RawKeyboardImpl, RawMouseImpl } from './ffInput';
 import { FFNetworkManager } from './ffNetworkManager';
 import { Protocol } from './protocol';
-import { selectors } from '../selectors';
-import { rewriteErrorMessage } from '../utils/stackTrace';
-import { Screencast, BrowserContext } from '../browserContext';
+import { selectors } from '../../selectors';
+import { rewriteErrorMessage } from '../../utils/stackTrace';
+import { Screencast, BrowserContext } from '../../browserContext';
 
 const UTILITY_WORLD_NAME = '__playwright_utility_world__';
 
diff --git a/src/server/firefox.ts b/src/server/firefox/firefox.ts
similarity index 89%
rename from src/server/firefox.ts
rename to src/server/firefox/firefox.ts
index 4e4cb96d14..999b34b2bf 100644
--- a/src/server/firefox.ts
+++ b/src/server/firefox/firefox.ts
@@ -18,14 +18,14 @@
 import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
-import { FFBrowser } from '../firefox/ffBrowser';
-import { kBrowserCloseMessageId } from '../firefox/ffConnection';
-import { BrowserTypeBase } from './browserType';
-import { Env } from './processLauncher';
-import { ConnectionTransport } from '../transport';
-import { BrowserOptions } from '../browser';
-import { BrowserDescriptor } from '../utils/browserPaths';
-import * as types from '../types';
+import { FFBrowser } from './ffBrowser';
+import { kBrowserCloseMessageId } from './ffConnection';
+import { BrowserTypeBase } from '../browserType';
+import { Env } from '../processLauncher';
+import { ConnectionTransport } from '../../transport';
+import { BrowserOptions } from '../../browser';
+import { BrowserDescriptor } from '../../utils/browserPaths';
+import * as types from '../../types';
 
 export class Firefox extends BrowserTypeBase {
   constructor(packagePath: string, browser: BrowserDescriptor) {
diff --git a/src/firefox/protocol.ts b/src/server/firefox/protocol.ts
similarity index 100%
rename from src/firefox/protocol.ts
rename to src/server/firefox/protocol.ts
diff --git a/src/server/playwright.ts b/src/server/playwright.ts
index a472603030..86245327bc 100644
--- a/src/server/playwright.ts
+++ b/src/server/playwright.ts
@@ -16,7 +16,7 @@
 
 import { Chromium } from './chromium/chromium';
 import { WebKit } from './webkit/webkit';
-import { Firefox } from './firefox';
+import { Firefox } from './firefox/firefox';
 import { selectors } from '../selectors';
 import * as browserPaths from '../utils/browserPaths';
 
diff --git a/utils/check_deps.js b/utils/check_deps.js
index db0f6b360b..06a8bcb909 100644
--- a/utils/check_deps.js
+++ b/utils/check_deps.js
@@ -76,6 +76,7 @@ const DEPS = new Map([
   ['src/install/', ['src/install/', 'src/utils/']],
   ['src/server/chromium/', ['src/server/chromium/', 'src/utils/', 'src/', 'src/common/', 'src/server/']],
   ['src/server/electron/', ['src/server/electron/', 'src/server/chromium/', 'src/utils/', 'src/', 'src/server/']],
+  ['src/server/firefox/', ['src/server/firefox/', 'src/utils/', 'src/', 'src/common/', 'src/server/']],
   ['src/server/webkit/', ['src/server/webkit/', 'src/utils/', 'src/', 'src/common/', 'src/server/']],
   ['src/client/', ['src/client/', 'src/utils/', 'src/protocol/', 'src/server/chromium/protocol.ts']],
 ]);