diff --git a/experimental/puppeteer-firefox/index.js b/experimental/puppeteer-firefox/index.js
index 6bbce931adc09..3c6c81d0a05bb 100644
--- a/experimental/puppeteer-firefox/index.js
+++ b/experimental/puppeteer-firefox/index.js
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const FirefoxLauncher = require('./lib/firefox/Launcher.js').Launcher;
-const BrowserFetcher = require('./lib/firefox/BrowserFetcher.js');
+const FirefoxLauncher = require('./lib/Launcher.js').Launcher;
+const BrowserFetcher = require('./lib/BrowserFetcher.js');
 
 class Puppeteer {
   constructor() {
diff --git a/experimental/puppeteer-firefox/lib/firefox/Browser.js b/experimental/puppeteer-firefox/lib/Browser.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/Browser.js
rename to experimental/puppeteer-firefox/lib/Browser.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/BrowserFetcher.js b/experimental/puppeteer-firefox/lib/BrowserFetcher.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/BrowserFetcher.js
rename to experimental/puppeteer-firefox/lib/BrowserFetcher.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/Connection.js b/experimental/puppeteer-firefox/lib/Connection.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/Connection.js
rename to experimental/puppeteer-firefox/lib/Connection.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/Dialog.js b/experimental/puppeteer-firefox/lib/Dialog.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/Dialog.js
rename to experimental/puppeteer-firefox/lib/Dialog.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/FirefoxTransport.js b/experimental/puppeteer-firefox/lib/FirefoxTransport.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/FirefoxTransport.js
rename to experimental/puppeteer-firefox/lib/FirefoxTransport.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/Input.js b/experimental/puppeteer-firefox/lib/Input.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/Input.js
rename to experimental/puppeteer-firefox/lib/Input.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/Launcher.js b/experimental/puppeteer-firefox/lib/Launcher.js
similarity index 99%
rename from experimental/puppeteer-firefox/lib/firefox/Launcher.js
rename to experimental/puppeteer-firefox/lib/Launcher.js
index bff4c3ca22d9b..6734f2317e283 100644
--- a/experimental/puppeteer-firefox/lib/firefox/Launcher.js
+++ b/experimental/puppeteer-firefox/lib/Launcher.js
@@ -23,7 +23,7 @@ const readline = require('readline');
 const fs = require('fs');
 const util = require('util');
 const {helper} = require('./helper');
-const {TimeoutError} = require('../Errors')
+const {TimeoutError} = require('./Errors')
 const FirefoxTransport = require('./FirefoxTransport');
 
 const mkdtempAsync = util.promisify(fs.mkdtemp);
diff --git a/experimental/puppeteer-firefox/lib/firefox/Page.js b/experimental/puppeteer-firefox/lib/Page.js
similarity index 99%
rename from experimental/puppeteer-firefox/lib/firefox/Page.js
rename to experimental/puppeteer-firefox/lib/Page.js
index 312988af190a5..b0ce8828b1792 100644
--- a/experimental/puppeteer-firefox/lib/firefox/Page.js
+++ b/experimental/puppeteer-firefox/lib/Page.js
@@ -1,8 +1,8 @@
 const {helper, assert, debugError} = require('./helper');
 const {Keyboard, Mouse} = require('./Input');
-const {constants} = require('../common');
+const {constants} = require('./common');
 const {Dialog} = require('./Dialog');
-const {TimeoutError} = require('../Errors');
+const {TimeoutError} = require('./Errors');
 const fs = require('fs');
 const mime = require('mime');
 const util = require('util');
diff --git a/experimental/puppeteer-firefox/lib/firefox/USKeyboardLayout.js b/experimental/puppeteer-firefox/lib/USKeyboardLayout.js
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/USKeyboardLayout.js
rename to experimental/puppeteer-firefox/lib/USKeyboardLayout.js
diff --git a/experimental/puppeteer-firefox/lib/firefox/externs.d.ts b/experimental/puppeteer-firefox/lib/externs.d.ts
similarity index 100%
rename from experimental/puppeteer-firefox/lib/firefox/externs.d.ts
rename to experimental/puppeteer-firefox/lib/externs.d.ts
diff --git a/experimental/puppeteer-firefox/lib/firefox/helper.js b/experimental/puppeteer-firefox/lib/helper.js
similarity index 98%
rename from experimental/puppeteer-firefox/lib/firefox/helper.js
rename to experimental/puppeteer-firefox/lib/helper.js
index f3515ebbcd2eb..1e4ba423e4a03 100644
--- a/experimental/puppeteer-firefox/lib/firefox/helper.js
+++ b/experimental/puppeteer-firefox/lib/helper.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const {TimeoutError} = require('../Errors');
+const {TimeoutError} = require('./Errors');
 
 /**
  * @internal
diff --git a/experimental/puppeteer-firefox/misc/install-preferences.js b/experimental/puppeteer-firefox/misc/install-preferences.js
index f664bfe10bad0..c536baa7eab6f 100644
--- a/experimental/puppeteer-firefox/misc/install-preferences.js
+++ b/experimental/puppeteer-firefox/misc/install-preferences.js
@@ -7,7 +7,7 @@ const path = require('path');
 // Based on:   https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Enterprise_deployment_before_60#Configuration
 async function installFirefoxPreferences(executablePath) {
   const firefoxFolder = path.dirname(executablePath);
-  const {helper} = require('../lib/firefox/helper');
+  const {helper} = require('../lib/helper');
   const mkdirAsync = helper.promisify(fs.mkdir.bind(fs));
 
   let prefPath = '';