diff --git a/browser/components/moz.build b/browser/components/moz.build
index 3c0dea3fb5..0393b6e926 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -10,7 +10,6 @@ DIRS += [
     'customizableui',
     'dirprovider',
     'downloads',
-    'extensions',
     'feeds',
     'migration',
     'newtab',
@@ -26,6 +25,9 @@ DIRS += [
     'translation',
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+    DIRS += ['webextensions']
+
 DIRS += ['build']
 
 XPIDL_SOURCES += [
diff --git a/browser/components/extensions/.eslintrc.js b/browser/components/webextensions/.eslintrc.js
similarity index 100%
rename from browser/components/extensions/.eslintrc.js
rename to browser/components/webextensions/.eslintrc.js
diff --git a/browser/components/extensions/ext-bookmarks.js b/browser/components/webextensions/ext-bookmarks.js
similarity index 100%
rename from browser/components/extensions/ext-bookmarks.js
rename to browser/components/webextensions/ext-bookmarks.js
diff --git a/browser/components/extensions/ext-browserAction.js b/browser/components/webextensions/ext-browserAction.js
similarity index 100%
rename from browser/components/extensions/ext-browserAction.js
rename to browser/components/webextensions/ext-browserAction.js
diff --git a/browser/components/extensions/ext-c-contextMenus.js b/browser/components/webextensions/ext-c-contextMenus.js
similarity index 100%
rename from browser/components/extensions/ext-c-contextMenus.js
rename to browser/components/webextensions/ext-c-contextMenus.js
diff --git a/browser/components/extensions/ext-c-omnibox.js b/browser/components/webextensions/ext-c-omnibox.js
similarity index 100%
rename from browser/components/extensions/ext-c-omnibox.js
rename to browser/components/webextensions/ext-c-omnibox.js
diff --git a/browser/components/extensions/ext-c-tabs.js b/browser/components/webextensions/ext-c-tabs.js
similarity index 100%
rename from browser/components/extensions/ext-c-tabs.js
rename to browser/components/webextensions/ext-c-tabs.js
diff --git a/browser/components/extensions/ext-commands.js b/browser/components/webextensions/ext-commands.js
similarity index 100%
rename from browser/components/extensions/ext-commands.js
rename to browser/components/webextensions/ext-commands.js
diff --git a/browser/components/extensions/ext-contextMenus.js b/browser/components/webextensions/ext-contextMenus.js
similarity index 100%
rename from browser/components/extensions/ext-contextMenus.js
rename to browser/components/webextensions/ext-contextMenus.js
diff --git a/browser/components/extensions/ext-desktop-runtime.js b/browser/components/webextensions/ext-desktop-runtime.js
similarity index 100%
rename from browser/components/extensions/ext-desktop-runtime.js
rename to browser/components/webextensions/ext-desktop-runtime.js
diff --git a/browser/components/extensions/ext-history.js b/browser/components/webextensions/ext-history.js
similarity index 100%
rename from browser/components/extensions/ext-history.js
rename to browser/components/webextensions/ext-history.js
diff --git a/browser/components/extensions/ext-omnibox.js b/browser/components/webextensions/ext-omnibox.js
similarity index 100%
rename from browser/components/extensions/ext-omnibox.js
rename to browser/components/webextensions/ext-omnibox.js
diff --git a/browser/components/extensions/ext-pageAction.js b/browser/components/webextensions/ext-pageAction.js
similarity index 100%
rename from browser/components/extensions/ext-pageAction.js
rename to browser/components/webextensions/ext-pageAction.js
diff --git a/browser/components/extensions/ext-sessions.js b/browser/components/webextensions/ext-sessions.js
similarity index 100%
rename from browser/components/extensions/ext-sessions.js
rename to browser/components/webextensions/ext-sessions.js
diff --git a/browser/components/extensions/ext-tabs.js b/browser/components/webextensions/ext-tabs.js
similarity index 100%
rename from browser/components/extensions/ext-tabs.js
rename to browser/components/webextensions/ext-tabs.js
diff --git a/browser/components/extensions/ext-utils.js b/browser/components/webextensions/ext-utils.js
similarity index 100%
rename from browser/components/extensions/ext-utils.js
rename to browser/components/webextensions/ext-utils.js
diff --git a/browser/components/extensions/ext-windows.js b/browser/components/webextensions/ext-windows.js
similarity index 100%
rename from browser/components/extensions/ext-windows.js
rename to browser/components/webextensions/ext-windows.js
diff --git a/browser/components/extensions/extension-mac-panel.css b/browser/components/webextensions/extension-mac-panel.css
similarity index 100%
rename from browser/components/extensions/extension-mac-panel.css
rename to browser/components/webextensions/extension-mac-panel.css
diff --git a/browser/components/extensions/extension-mac.css b/browser/components/webextensions/extension-mac.css
similarity index 100%
rename from browser/components/extensions/extension-mac.css
rename to browser/components/webextensions/extension-mac.css
diff --git a/browser/components/extensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css
similarity index 100%
rename from browser/components/extensions/extension-win-panel.css
rename to browser/components/webextensions/extension-win-panel.css
diff --git a/browser/components/extensions/extension.css b/browser/components/webextensions/extension.css
similarity index 100%
rename from browser/components/extensions/extension.css
rename to browser/components/webextensions/extension.css
diff --git a/browser/components/extensions/extension.svg b/browser/components/webextensions/extension.svg
similarity index 100%
rename from browser/components/extensions/extension.svg
rename to browser/components/webextensions/extension.svg
diff --git a/browser/components/extensions/extensions-browser.manifest b/browser/components/webextensions/extensions-browser.manifest
similarity index 100%
rename from browser/components/extensions/extensions-browser.manifest
rename to browser/components/webextensions/extensions-browser.manifest
diff --git a/browser/components/extensions/jar.mn b/browser/components/webextensions/jar.mn
similarity index 100%
rename from browser/components/extensions/jar.mn
rename to browser/components/webextensions/jar.mn
diff --git a/browser/components/extensions/moz.build b/browser/components/webextensions/moz.build
similarity index 100%
rename from browser/components/extensions/moz.build
rename to browser/components/webextensions/moz.build
diff --git a/browser/components/extensions/schemas/LICENSE b/browser/components/webextensions/schemas/LICENSE
similarity index 100%
rename from browser/components/extensions/schemas/LICENSE
rename to browser/components/webextensions/schemas/LICENSE
diff --git a/browser/components/extensions/schemas/bookmarks.json b/browser/components/webextensions/schemas/bookmarks.json
similarity index 100%
rename from browser/components/extensions/schemas/bookmarks.json
rename to browser/components/webextensions/schemas/bookmarks.json
diff --git a/browser/components/extensions/schemas/browser_action.json b/browser/components/webextensions/schemas/browser_action.json
similarity index 100%
rename from browser/components/extensions/schemas/browser_action.json
rename to browser/components/webextensions/schemas/browser_action.json
diff --git a/browser/components/extensions/schemas/commands.json b/browser/components/webextensions/schemas/commands.json
similarity index 100%
rename from browser/components/extensions/schemas/commands.json
rename to browser/components/webextensions/schemas/commands.json
diff --git a/browser/components/extensions/schemas/context_menus.json b/browser/components/webextensions/schemas/context_menus.json
similarity index 100%
rename from browser/components/extensions/schemas/context_menus.json
rename to browser/components/webextensions/schemas/context_menus.json
diff --git a/browser/components/extensions/schemas/context_menus_internal.json b/browser/components/webextensions/schemas/context_menus_internal.json
similarity index 100%
rename from browser/components/extensions/schemas/context_menus_internal.json
rename to browser/components/webextensions/schemas/context_menus_internal.json
diff --git a/browser/components/extensions/schemas/history.json b/browser/components/webextensions/schemas/history.json
similarity index 100%
rename from browser/components/extensions/schemas/history.json
rename to browser/components/webextensions/schemas/history.json
diff --git a/browser/components/extensions/schemas/jar.mn b/browser/components/webextensions/schemas/jar.mn
similarity index 100%
rename from browser/components/extensions/schemas/jar.mn
rename to browser/components/webextensions/schemas/jar.mn
diff --git a/browser/components/extensions/schemas/moz.build b/browser/components/webextensions/schemas/moz.build
similarity index 100%
rename from browser/components/extensions/schemas/moz.build
rename to browser/components/webextensions/schemas/moz.build
diff --git a/browser/components/extensions/schemas/omnibox.json b/browser/components/webextensions/schemas/omnibox.json
similarity index 100%
rename from browser/components/extensions/schemas/omnibox.json
rename to browser/components/webextensions/schemas/omnibox.json
diff --git a/browser/components/extensions/schemas/page_action.json b/browser/components/webextensions/schemas/page_action.json
similarity index 100%
rename from browser/components/extensions/schemas/page_action.json
rename to browser/components/webextensions/schemas/page_action.json
diff --git a/browser/components/extensions/schemas/sessions.json b/browser/components/webextensions/schemas/sessions.json
similarity index 100%
rename from browser/components/extensions/schemas/sessions.json
rename to browser/components/webextensions/schemas/sessions.json
diff --git a/browser/components/extensions/schemas/tabs.json b/browser/components/webextensions/schemas/tabs.json
similarity index 100%
rename from browser/components/extensions/schemas/tabs.json
rename to browser/components/webextensions/schemas/tabs.json
diff --git a/browser/components/extensions/schemas/windows.json b/browser/components/webextensions/schemas/windows.json
similarity index 100%
rename from browser/components/extensions/schemas/windows.json
rename to browser/components/webextensions/schemas/windows.json
diff --git a/browser/configure.in b/browser/configure.in
index fe3e5acf1c..7a1d72ae60 100644
--- a/browser/configure.in
+++ b/browser/configure.in
@@ -13,3 +13,16 @@ AC_SUBST(MC_BASILISK)
 
 dnl Optional parts of the build.
 
+dnl ========================================================
+dnl = Disable WebExtensions
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(browser-statusbar,
+[  --disable-webextensions            Disable WebExtensions],
+    MOZ_WEBEXTENSIONS=,
+    MOZ_WEBEXTENSIONS=1)
+
+if test -n "$MOZ_WEBEXTENSIONS"; then
+    AC_DEFINE(MOZ_WEBEXTENSIONS)
+fi
+
+AC_SUBST(MOZ_WEBEXTENSIONS)
\ No newline at end of file
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 25692b1889..d4c2c008dd 100644
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -47,12 +47,15 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 ACCEPTED_MAR_CHANNEL_IDS=basilisk-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=basilisk-release
+
+# Features
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
+MOZ_WEBEXTENSIONS=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0