diff --git a/extension/chrome/LICENSE b/v2/chrome/LICENSE similarity index 100% rename from extension/chrome/LICENSE rename to v2/chrome/LICENSE diff --git a/extension/chrome/ReadMe.txt b/v2/chrome/ReadMe.txt similarity index 100% rename from extension/chrome/ReadMe.txt rename to v2/chrome/ReadMe.txt diff --git a/extension/chrome/_locales b/v2/chrome/_locales similarity index 100% rename from extension/chrome/_locales rename to v2/chrome/_locales diff --git a/extension/chrome/common.js b/v2/chrome/common.js similarity index 100% rename from extension/chrome/common.js rename to v2/chrome/common.js diff --git a/extension/chrome/data b/v2/chrome/data similarity index 100% rename from extension/chrome/data rename to v2/chrome/data diff --git a/extension/chrome/manifest.json b/v2/chrome/manifest.json similarity index 100% rename from extension/chrome/manifest.json rename to v2/chrome/manifest.json diff --git a/extension/chrome/schema.json b/v2/chrome/schema.json similarity index 100% rename from extension/chrome/schema.json rename to v2/chrome/schema.json diff --git a/extension/chrome/ua-parser.min.js b/v2/chrome/ua-parser.min.js similarity index 100% rename from extension/chrome/ua-parser.min.js rename to v2/chrome/ua-parser.min.js diff --git a/extension/firefox/LICENSE b/v2/firefox/LICENSE similarity index 100% rename from extension/firefox/LICENSE rename to v2/firefox/LICENSE diff --git a/extension/firefox/ReadMe.txt b/v2/firefox/ReadMe.txt similarity index 100% rename from extension/firefox/ReadMe.txt rename to v2/firefox/ReadMe.txt diff --git a/extension/firefox/_locales/en/messages.json b/v2/firefox/_locales/en/messages.json similarity index 100% rename from extension/firefox/_locales/en/messages.json rename to v2/firefox/_locales/en/messages.json diff --git a/extension/firefox/_locales/ru/messages.json b/v2/firefox/_locales/ru/messages.json similarity index 100% rename from extension/firefox/_locales/ru/messages.json rename to v2/firefox/_locales/ru/messages.json diff --git a/extension/firefox/common.js b/v2/firefox/common.js similarity index 99% rename from extension/firefox/common.js rename to v2/firefox/common.js index bcf2ad1..499ec1d 100644 --- a/extension/firefox/common.js +++ b/v2/firefox/common.js @@ -262,6 +262,7 @@ const ua = { o.oscpu = '[delete]'; o.buildID = '[delete]'; o.productSub = '20030107'; + if (p.browser && p.browser.major) { o.userAgentData = { brands: [ @@ -269,7 +270,8 @@ const ua = { {brand: 'Chromium', version: p.browser.major}, {brand: 'Google Chrome', version: p.browser.major} ], - mobile: /Android|webOS|iPhone|iPad|Mac|Macintosh|iPod|BlackBerry|IEMobile|Opera Mini/i.test(s) + mobile: /Android|webOS|iPhone|iPad|Mac|Macintosh|iPod|BlackBerry|IEMobile|Opera Mini/i.test(s), + platform: o.platform }; } } diff --git a/extension/firefox/data/icons/128.png b/v2/firefox/data/icons/128.png similarity index 100% rename from extension/firefox/data/icons/128.png rename to v2/firefox/data/icons/128.png diff --git a/extension/firefox/data/icons/16.png b/v2/firefox/data/icons/16.png similarity index 100% rename from extension/firefox/data/icons/16.png rename to v2/firefox/data/icons/16.png diff --git a/extension/firefox/data/icons/18.png b/v2/firefox/data/icons/18.png similarity index 100% rename from extension/firefox/data/icons/18.png rename to v2/firefox/data/icons/18.png diff --git a/extension/firefox/data/icons/19.png b/v2/firefox/data/icons/19.png similarity index 100% rename from extension/firefox/data/icons/19.png rename to v2/firefox/data/icons/19.png diff --git a/extension/firefox/data/icons/256.png b/v2/firefox/data/icons/256.png similarity index 100% rename from extension/firefox/data/icons/256.png rename to v2/firefox/data/icons/256.png diff --git a/extension/firefox/data/icons/32.png b/v2/firefox/data/icons/32.png similarity index 100% rename from extension/firefox/data/icons/32.png rename to v2/firefox/data/icons/32.png diff --git a/extension/firefox/data/icons/36.png b/v2/firefox/data/icons/36.png similarity index 100% rename from extension/firefox/data/icons/36.png rename to v2/firefox/data/icons/36.png diff --git a/extension/firefox/data/icons/38.png b/v2/firefox/data/icons/38.png similarity index 100% rename from extension/firefox/data/icons/38.png rename to v2/firefox/data/icons/38.png diff --git a/extension/firefox/data/icons/48.png b/v2/firefox/data/icons/48.png similarity index 100% rename from extension/firefox/data/icons/48.png rename to v2/firefox/data/icons/48.png diff --git a/extension/firefox/data/icons/512.png b/v2/firefox/data/icons/512.png similarity index 100% rename from extension/firefox/data/icons/512.png rename to v2/firefox/data/icons/512.png diff --git a/extension/firefox/data/icons/64.png b/v2/firefox/data/icons/64.png similarity index 100% rename from extension/firefox/data/icons/64.png rename to v2/firefox/data/icons/64.png diff --git a/extension/firefox/data/icons/active/128.png b/v2/firefox/data/icons/active/128.png similarity index 100% rename from extension/firefox/data/icons/active/128.png rename to v2/firefox/data/icons/active/128.png diff --git a/extension/firefox/data/icons/active/16.png b/v2/firefox/data/icons/active/16.png similarity index 100% rename from extension/firefox/data/icons/active/16.png rename to v2/firefox/data/icons/active/16.png diff --git a/extension/firefox/data/icons/active/18.png b/v2/firefox/data/icons/active/18.png similarity index 100% rename from extension/firefox/data/icons/active/18.png rename to v2/firefox/data/icons/active/18.png diff --git a/extension/firefox/data/icons/active/19.png b/v2/firefox/data/icons/active/19.png similarity index 100% rename from extension/firefox/data/icons/active/19.png rename to v2/firefox/data/icons/active/19.png diff --git a/extension/firefox/data/icons/active/256.png b/v2/firefox/data/icons/active/256.png similarity index 100% rename from extension/firefox/data/icons/active/256.png rename to v2/firefox/data/icons/active/256.png diff --git a/extension/firefox/data/icons/active/32.png b/v2/firefox/data/icons/active/32.png similarity index 100% rename from extension/firefox/data/icons/active/32.png rename to v2/firefox/data/icons/active/32.png diff --git a/extension/firefox/data/icons/active/36.png b/v2/firefox/data/icons/active/36.png similarity index 100% rename from extension/firefox/data/icons/active/36.png rename to v2/firefox/data/icons/active/36.png diff --git a/extension/firefox/data/icons/active/38.png b/v2/firefox/data/icons/active/38.png similarity index 100% rename from extension/firefox/data/icons/active/38.png rename to v2/firefox/data/icons/active/38.png diff --git a/extension/firefox/data/icons/active/48.png b/v2/firefox/data/icons/active/48.png similarity index 100% rename from extension/firefox/data/icons/active/48.png rename to v2/firefox/data/icons/active/48.png diff --git a/extension/firefox/data/icons/active/512.png b/v2/firefox/data/icons/active/512.png similarity index 100% rename from extension/firefox/data/icons/active/512.png rename to v2/firefox/data/icons/active/512.png diff --git a/extension/firefox/data/icons/active/64.png b/v2/firefox/data/icons/active/64.png similarity index 100% rename from extension/firefox/data/icons/active/64.png rename to v2/firefox/data/icons/active/64.png diff --git a/extension/firefox/data/icons/ignored/128.png b/v2/firefox/data/icons/ignored/128.png similarity index 100% rename from extension/firefox/data/icons/ignored/128.png rename to v2/firefox/data/icons/ignored/128.png diff --git a/extension/firefox/data/icons/ignored/16.png b/v2/firefox/data/icons/ignored/16.png similarity index 100% rename from extension/firefox/data/icons/ignored/16.png rename to v2/firefox/data/icons/ignored/16.png diff --git a/extension/firefox/data/icons/ignored/18.png b/v2/firefox/data/icons/ignored/18.png similarity index 100% rename from extension/firefox/data/icons/ignored/18.png rename to v2/firefox/data/icons/ignored/18.png diff --git a/extension/firefox/data/icons/ignored/19.png b/v2/firefox/data/icons/ignored/19.png similarity index 100% rename from extension/firefox/data/icons/ignored/19.png rename to v2/firefox/data/icons/ignored/19.png diff --git a/extension/firefox/data/icons/ignored/256.png b/v2/firefox/data/icons/ignored/256.png similarity index 100% rename from extension/firefox/data/icons/ignored/256.png rename to v2/firefox/data/icons/ignored/256.png diff --git a/extension/firefox/data/icons/ignored/32.png b/v2/firefox/data/icons/ignored/32.png similarity index 100% rename from extension/firefox/data/icons/ignored/32.png rename to v2/firefox/data/icons/ignored/32.png diff --git a/extension/firefox/data/icons/ignored/36.png b/v2/firefox/data/icons/ignored/36.png similarity index 100% rename from extension/firefox/data/icons/ignored/36.png rename to v2/firefox/data/icons/ignored/36.png diff --git a/extension/firefox/data/icons/ignored/38.png b/v2/firefox/data/icons/ignored/38.png similarity index 100% rename from extension/firefox/data/icons/ignored/38.png rename to v2/firefox/data/icons/ignored/38.png diff --git a/extension/firefox/data/icons/ignored/48.png b/v2/firefox/data/icons/ignored/48.png similarity index 100% rename from extension/firefox/data/icons/ignored/48.png rename to v2/firefox/data/icons/ignored/48.png diff --git a/extension/firefox/data/icons/ignored/512.png b/v2/firefox/data/icons/ignored/512.png similarity index 100% rename from extension/firefox/data/icons/ignored/512.png rename to v2/firefox/data/icons/ignored/512.png diff --git a/extension/firefox/data/icons/ignored/64.png b/v2/firefox/data/icons/ignored/64.png similarity index 100% rename from extension/firefox/data/icons/ignored/64.png rename to v2/firefox/data/icons/ignored/64.png diff --git a/extension/firefox/data/inject.js b/v2/firefox/data/inject.js similarity index 100% rename from extension/firefox/data/inject.js rename to v2/firefox/data/inject.js diff --git a/extension/firefox/data/options/index.css b/v2/firefox/data/options/index.css similarity index 100% rename from extension/firefox/data/options/index.css rename to v2/firefox/data/options/index.css diff --git a/extension/firefox/data/options/index.html b/v2/firefox/data/options/index.html similarity index 100% rename from extension/firefox/data/options/index.html rename to v2/firefox/data/options/index.html diff --git a/extension/firefox/data/options/index.js b/v2/firefox/data/options/index.js similarity index 100% rename from extension/firefox/data/options/index.js rename to v2/firefox/data/options/index.js diff --git a/extension/firefox/data/popup/browsers/android browser-android.json b/v2/firefox/data/popup/browsers/android browser-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/android browser-android.json rename to v2/firefox/data/popup/browsers/android browser-android.json diff --git a/extension/firefox/data/popup/browsers/android browser-windows.json b/v2/firefox/data/popup/browsers/android browser-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/android browser-windows.json rename to v2/firefox/data/popup/browsers/android browser-windows.json diff --git a/extension/firefox/data/popup/browsers/arora-linux.json b/v2/firefox/data/popup/browsers/arora-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/arora-linux.json rename to v2/firefox/data/popup/browsers/arora-linux.json diff --git a/extension/firefox/data/popup/browsers/arora-windows.json b/v2/firefox/data/popup/browsers/arora-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/arora-windows.json rename to v2/firefox/data/popup/browsers/arora-windows.json diff --git a/extension/firefox/data/popup/browsers/avant -windows.json b/v2/firefox/data/popup/browsers/avant -windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/avant -windows.json rename to v2/firefox/data/popup/browsers/avant -windows.json diff --git a/extension/firefox/data/popup/browsers/avast secure browser-windows.json b/v2/firefox/data/popup/browsers/avast secure browser-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/avast secure browser-windows.json rename to v2/firefox/data/popup/browsers/avast secure browser-windows.json diff --git a/extension/firefox/data/popup/browsers/avg secure browser-windows.json b/v2/firefox/data/popup/browsers/avg secure browser-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/avg secure browser-windows.json rename to v2/firefox/data/popup/browsers/avg secure browser-windows.json diff --git a/extension/firefox/data/popup/browsers/baiduboxapp-android.json b/v2/firefox/data/popup/browsers/baiduboxapp-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/baiduboxapp-android.json rename to v2/firefox/data/popup/browsers/baiduboxapp-android.json diff --git a/extension/firefox/data/popup/browsers/basilisk-windows.json b/v2/firefox/data/popup/browsers/basilisk-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/basilisk-windows.json rename to v2/firefox/data/popup/browsers/basilisk-windows.json diff --git a/extension/firefox/data/popup/browsers/blazer-windows.json b/v2/firefox/data/popup/browsers/blazer-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/blazer-windows.json rename to v2/firefox/data/popup/browsers/blazer-windows.json diff --git a/extension/firefox/data/popup/browsers/bolt-windows.json b/v2/firefox/data/popup/browsers/bolt-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/bolt-windows.json rename to v2/firefox/data/popup/browsers/bolt-windows.json diff --git a/extension/firefox/data/popup/browsers/bot-misc.json b/v2/firefox/data/popup/browsers/bot-misc.json similarity index 100% rename from extension/firefox/data/popup/browsers/bot-misc.json rename to v2/firefox/data/popup/browsers/bot-misc.json diff --git a/extension/firefox/data/popup/browsers/brave-android.json b/v2/firefox/data/popup/browsers/brave-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-android.json rename to v2/firefox/data/popup/browsers/brave-android.json diff --git a/extension/firefox/data/popup/browsers/brave-gentoo.json b/v2/firefox/data/popup/browsers/brave-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-gentoo.json rename to v2/firefox/data/popup/browsers/brave-gentoo.json diff --git a/extension/firefox/data/popup/browsers/brave-ios.json b/v2/firefox/data/popup/browsers/brave-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-ios.json rename to v2/firefox/data/popup/browsers/brave-ios.json diff --git a/extension/firefox/data/popup/browsers/brave-linux.json b/v2/firefox/data/popup/browsers/brave-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-linux.json rename to v2/firefox/data/popup/browsers/brave-linux.json diff --git a/extension/firefox/data/popup/browsers/brave-mac os.json b/v2/firefox/data/popup/browsers/brave-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-mac os.json rename to v2/firefox/data/popup/browsers/brave-mac os.json diff --git a/extension/firefox/data/popup/browsers/brave-mint.json b/v2/firefox/data/popup/browsers/brave-mint.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-mint.json rename to v2/firefox/data/popup/browsers/brave-mint.json diff --git a/extension/firefox/data/popup/browsers/brave-openbsd.json b/v2/firefox/data/popup/browsers/brave-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-openbsd.json rename to v2/firefox/data/popup/browsers/brave-openbsd.json diff --git a/extension/firefox/data/popup/browsers/brave-windows.json b/v2/firefox/data/popup/browsers/brave-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/brave-windows.json rename to v2/firefox/data/popup/browsers/brave-windows.json diff --git a/extension/firefox/data/popup/browsers/camino-mac os.json b/v2/firefox/data/popup/browsers/camino-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/camino-mac os.json rename to v2/firefox/data/popup/browsers/camino-mac os.json diff --git a/extension/firefox/data/popup/browsers/chimera-mac os.json b/v2/firefox/data/popup/browsers/chimera-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/chimera-mac os.json rename to v2/firefox/data/popup/browsers/chimera-mac os.json diff --git a/extension/firefox/data/popup/browsers/chrome headless-linux.json b/v2/firefox/data/popup/browsers/chrome headless-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome headless-linux.json rename to v2/firefox/data/popup/browsers/chrome headless-linux.json diff --git a/extension/firefox/data/popup/browsers/chrome headless-xbox.json b/v2/firefox/data/popup/browsers/chrome headless-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome headless-xbox.json rename to v2/firefox/data/popup/browsers/chrome headless-xbox.json diff --git a/extension/firefox/data/popup/browsers/chrome webview-android.json b/v2/firefox/data/popup/browsers/chrome webview-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome webview-android.json rename to v2/firefox/data/popup/browsers/chrome webview-android.json diff --git a/extension/firefox/data/popup/browsers/chrome-android.json b/v2/firefox/data/popup/browsers/chrome-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-android.json rename to v2/firefox/data/popup/browsers/chrome-android.json diff --git a/extension/firefox/data/popup/browsers/chrome-chromium os.json b/v2/firefox/data/popup/browsers/chrome-chromium os.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-chromium os.json rename to v2/firefox/data/popup/browsers/chrome-chromium os.json diff --git a/extension/firefox/data/popup/browsers/chrome-debian.json b/v2/firefox/data/popup/browsers/chrome-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-debian.json rename to v2/firefox/data/popup/browsers/chrome-debian.json diff --git a/extension/firefox/data/popup/browsers/chrome-fedora.json b/v2/firefox/data/popup/browsers/chrome-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-fedora.json rename to v2/firefox/data/popup/browsers/chrome-fedora.json diff --git a/extension/firefox/data/popup/browsers/chrome-freebsd.json b/v2/firefox/data/popup/browsers/chrome-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-freebsd.json rename to v2/firefox/data/popup/browsers/chrome-freebsd.json diff --git a/extension/firefox/data/popup/browsers/chrome-ios.json b/v2/firefox/data/popup/browsers/chrome-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-ios.json rename to v2/firefox/data/popup/browsers/chrome-ios.json diff --git a/extension/firefox/data/popup/browsers/chrome-linux.json b/v2/firefox/data/popup/browsers/chrome-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-linux.json rename to v2/firefox/data/popup/browsers/chrome-linux.json diff --git a/extension/firefox/data/popup/browsers/chrome-mac os.json b/v2/firefox/data/popup/browsers/chrome-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-mac os.json rename to v2/firefox/data/popup/browsers/chrome-mac os.json diff --git a/extension/firefox/data/popup/browsers/chrome-mint.json b/v2/firefox/data/popup/browsers/chrome-mint.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-mint.json rename to v2/firefox/data/popup/browsers/chrome-mint.json diff --git a/extension/firefox/data/popup/browsers/chrome-netbsd.json b/v2/firefox/data/popup/browsers/chrome-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-netbsd.json rename to v2/firefox/data/popup/browsers/chrome-netbsd.json diff --git a/extension/firefox/data/popup/browsers/chrome-openbsd.json b/v2/firefox/data/popup/browsers/chrome-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-openbsd.json rename to v2/firefox/data/popup/browsers/chrome-openbsd.json diff --git a/extension/firefox/data/popup/browsers/chrome-slackware.json b/v2/firefox/data/popup/browsers/chrome-slackware.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-slackware.json rename to v2/firefox/data/popup/browsers/chrome-slackware.json diff --git a/extension/firefox/data/popup/browsers/chrome-suse.json b/v2/firefox/data/popup/browsers/chrome-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-suse.json rename to v2/firefox/data/popup/browsers/chrome-suse.json diff --git a/extension/firefox/data/popup/browsers/chrome-ubuntu.json b/v2/firefox/data/popup/browsers/chrome-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-ubuntu.json rename to v2/firefox/data/popup/browsers/chrome-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/chrome-unix.json b/v2/firefox/data/popup/browsers/chrome-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-unix.json rename to v2/firefox/data/popup/browsers/chrome-unix.json diff --git a/extension/firefox/data/popup/browsers/chrome-windows phone.json b/v2/firefox/data/popup/browsers/chrome-windows phone.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-windows phone.json rename to v2/firefox/data/popup/browsers/chrome-windows phone.json diff --git a/extension/firefox/data/popup/browsers/chrome-windows.json b/v2/firefox/data/popup/browsers/chrome-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-windows.json rename to v2/firefox/data/popup/browsers/chrome-windows.json diff --git a/extension/firefox/data/popup/browsers/chrome-xbox.json b/v2/firefox/data/popup/browsers/chrome-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/chrome-xbox.json rename to v2/firefox/data/popup/browsers/chrome-xbox.json diff --git a/extension/firefox/data/popup/browsers/chromium-linux.json b/v2/firefox/data/popup/browsers/chromium-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/chromium-linux.json rename to v2/firefox/data/popup/browsers/chromium-linux.json diff --git a/extension/firefox/data/popup/browsers/chromium-netbsd.json b/v2/firefox/data/popup/browsers/chromium-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/chromium-netbsd.json rename to v2/firefox/data/popup/browsers/chromium-netbsd.json diff --git a/extension/firefox/data/popup/browsers/chromium-raspbian.json b/v2/firefox/data/popup/browsers/chromium-raspbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/chromium-raspbian.json rename to v2/firefox/data/popup/browsers/chromium-raspbian.json diff --git a/extension/firefox/data/popup/browsers/chromium-ubuntu.json b/v2/firefox/data/popup/browsers/chromium-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/chromium-ubuntu.json rename to v2/firefox/data/popup/browsers/chromium-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/chromium-windows.json b/v2/firefox/data/popup/browsers/chromium-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/chromium-windows.json rename to v2/firefox/data/popup/browsers/chromium-windows.json diff --git a/extension/firefox/data/popup/browsers/coc coc-windows.json b/v2/firefox/data/popup/browsers/coc coc-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/coc coc-windows.json rename to v2/firefox/data/popup/browsers/coc coc-windows.json diff --git a/extension/firefox/data/popup/browsers/comodo dragon-linux.json b/v2/firefox/data/popup/browsers/comodo dragon-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/comodo dragon-linux.json rename to v2/firefox/data/popup/browsers/comodo dragon-linux.json diff --git a/extension/firefox/data/popup/browsers/comodo dragon-windows.json b/v2/firefox/data/popup/browsers/comodo dragon-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/comodo dragon-windows.json rename to v2/firefox/data/popup/browsers/comodo dragon-windows.json diff --git a/extension/firefox/data/popup/browsers/conkeror-debian.json b/v2/firefox/data/popup/browsers/conkeror-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/conkeror-debian.json rename to v2/firefox/data/popup/browsers/conkeror-debian.json diff --git a/extension/firefox/data/popup/browsers/conkeror-linux.json b/v2/firefox/data/popup/browsers/conkeror-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/conkeror-linux.json rename to v2/firefox/data/popup/browsers/conkeror-linux.json diff --git a/extension/firefox/data/popup/browsers/conkeror-windows.json b/v2/firefox/data/popup/browsers/conkeror-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/conkeror-windows.json rename to v2/firefox/data/popup/browsers/conkeror-windows.json diff --git a/extension/firefox/data/popup/browsers/edge-android.json b/v2/firefox/data/popup/browsers/edge-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-android.json rename to v2/firefox/data/popup/browsers/edge-android.json diff --git a/extension/firefox/data/popup/browsers/edge-ios.json b/v2/firefox/data/popup/browsers/edge-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-ios.json rename to v2/firefox/data/popup/browsers/edge-ios.json diff --git a/extension/firefox/data/popup/browsers/edge-linux.json b/v2/firefox/data/popup/browsers/edge-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-linux.json rename to v2/firefox/data/popup/browsers/edge-linux.json diff --git a/extension/firefox/data/popup/browsers/edge-mac os.json b/v2/firefox/data/popup/browsers/edge-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-mac os.json rename to v2/firefox/data/popup/browsers/edge-mac os.json diff --git a/extension/firefox/data/popup/browsers/edge-windows mobile.json b/v2/firefox/data/popup/browsers/edge-windows mobile.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-windows mobile.json rename to v2/firefox/data/popup/browsers/edge-windows mobile.json diff --git a/extension/firefox/data/popup/browsers/edge-windows phone.json b/v2/firefox/data/popup/browsers/edge-windows phone.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-windows phone.json rename to v2/firefox/data/popup/browsers/edge-windows phone.json diff --git a/extension/firefox/data/popup/browsers/edge-windows.json b/v2/firefox/data/popup/browsers/edge-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-windows.json rename to v2/firefox/data/popup/browsers/edge-windows.json diff --git a/extension/firefox/data/popup/browsers/edge-xbox.json b/v2/firefox/data/popup/browsers/edge-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/edge-xbox.json rename to v2/firefox/data/popup/browsers/edge-xbox.json diff --git a/extension/firefox/data/popup/browsers/epiphany-debian.json b/v2/firefox/data/popup/browsers/epiphany-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-debian.json rename to v2/firefox/data/popup/browsers/epiphany-debian.json diff --git a/extension/firefox/data/popup/browsers/epiphany-fedora.json b/v2/firefox/data/popup/browsers/epiphany-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-fedora.json rename to v2/firefox/data/popup/browsers/epiphany-fedora.json diff --git a/extension/firefox/data/popup/browsers/epiphany-freebsd.json b/v2/firefox/data/popup/browsers/epiphany-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-freebsd.json rename to v2/firefox/data/popup/browsers/epiphany-freebsd.json diff --git a/extension/firefox/data/popup/browsers/epiphany-gentoo.json b/v2/firefox/data/popup/browsers/epiphany-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-gentoo.json rename to v2/firefox/data/popup/browsers/epiphany-gentoo.json diff --git a/extension/firefox/data/popup/browsers/epiphany-linux.json b/v2/firefox/data/popup/browsers/epiphany-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-linux.json rename to v2/firefox/data/popup/browsers/epiphany-linux.json diff --git a/extension/firefox/data/popup/browsers/epiphany-openbsd.json b/v2/firefox/data/popup/browsers/epiphany-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-openbsd.json rename to v2/firefox/data/popup/browsers/epiphany-openbsd.json diff --git a/extension/firefox/data/popup/browsers/epiphany-solaris.json b/v2/firefox/data/popup/browsers/epiphany-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-solaris.json rename to v2/firefox/data/popup/browsers/epiphany-solaris.json diff --git a/extension/firefox/data/popup/browsers/epiphany-suse.json b/v2/firefox/data/popup/browsers/epiphany-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-suse.json rename to v2/firefox/data/popup/browsers/epiphany-suse.json diff --git a/extension/firefox/data/popup/browsers/epiphany-ubuntu.json b/v2/firefox/data/popup/browsers/epiphany-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/epiphany-ubuntu.json rename to v2/firefox/data/popup/browsers/epiphany-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/facebook-android.json b/v2/firefox/data/popup/browsers/facebook-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/facebook-android.json rename to v2/firefox/data/popup/browsers/facebook-android.json diff --git a/extension/firefox/data/popup/browsers/facebook-ios.json b/v2/firefox/data/popup/browsers/facebook-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/facebook-ios.json rename to v2/firefox/data/popup/browsers/facebook-ios.json diff --git a/extension/firefox/data/popup/browsers/fennec-android.json b/v2/firefox/data/popup/browsers/fennec-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/fennec-android.json rename to v2/firefox/data/popup/browsers/fennec-android.json diff --git a/extension/firefox/data/popup/browsers/fennec-linux.json b/v2/firefox/data/popup/browsers/fennec-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/fennec-linux.json rename to v2/firefox/data/popup/browsers/fennec-linux.json diff --git a/extension/firefox/data/popup/browsers/fennec-mac os.json b/v2/firefox/data/popup/browsers/fennec-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/fennec-mac os.json rename to v2/firefox/data/popup/browsers/fennec-mac os.json diff --git a/extension/firefox/data/popup/browsers/fennec-windows.json b/v2/firefox/data/popup/browsers/fennec-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/fennec-windows.json rename to v2/firefox/data/popup/browsers/fennec-windows.json diff --git a/extension/firefox/data/popup/browsers/firebird-linux.json b/v2/firefox/data/popup/browsers/firebird-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/firebird-linux.json rename to v2/firefox/data/popup/browsers/firebird-linux.json diff --git a/extension/firefox/data/popup/browsers/firebird-mac os.json b/v2/firefox/data/popup/browsers/firebird-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/firebird-mac os.json rename to v2/firefox/data/popup/browsers/firebird-mac os.json diff --git a/extension/firefox/data/popup/browsers/firebird-solaris.json b/v2/firefox/data/popup/browsers/firebird-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/firebird-solaris.json rename to v2/firefox/data/popup/browsers/firebird-solaris.json diff --git a/extension/firefox/data/popup/browsers/firebird-windows.json b/v2/firefox/data/popup/browsers/firebird-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/firebird-windows.json rename to v2/firefox/data/popup/browsers/firebird-windows.json diff --git a/extension/firefox/data/popup/browsers/firefox-android.json b/v2/firefox/data/popup/browsers/firefox-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-android.json rename to v2/firefox/data/popup/browsers/firefox-android.json diff --git a/extension/firefox/data/popup/browsers/firefox-arch.json b/v2/firefox/data/popup/browsers/firefox-arch.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-arch.json rename to v2/firefox/data/popup/browsers/firefox-arch.json diff --git a/extension/firefox/data/popup/browsers/firefox-beos.json b/v2/firefox/data/popup/browsers/firefox-beos.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-beos.json rename to v2/firefox/data/popup/browsers/firefox-beos.json diff --git a/extension/firefox/data/popup/browsers/firefox-centos.json b/v2/firefox/data/popup/browsers/firefox-centos.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-centos.json rename to v2/firefox/data/popup/browsers/firefox-centos.json diff --git a/extension/firefox/data/popup/browsers/firefox-debian.json b/v2/firefox/data/popup/browsers/firefox-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-debian.json rename to v2/firefox/data/popup/browsers/firefox-debian.json diff --git a/extension/firefox/data/popup/browsers/firefox-dragonfly.json b/v2/firefox/data/popup/browsers/firefox-dragonfly.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-dragonfly.json rename to v2/firefox/data/popup/browsers/firefox-dragonfly.json diff --git a/extension/firefox/data/popup/browsers/firefox-fedora.json b/v2/firefox/data/popup/browsers/firefox-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-fedora.json rename to v2/firefox/data/popup/browsers/firefox-fedora.json diff --git a/extension/firefox/data/popup/browsers/firefox-freebsd.json b/v2/firefox/data/popup/browsers/firefox-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-freebsd.json rename to v2/firefox/data/popup/browsers/firefox-freebsd.json diff --git a/extension/firefox/data/popup/browsers/firefox-gentoo.json b/v2/firefox/data/popup/browsers/firefox-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-gentoo.json rename to v2/firefox/data/popup/browsers/firefox-gentoo.json diff --git a/extension/firefox/data/popup/browsers/firefox-ios.json b/v2/firefox/data/popup/browsers/firefox-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-ios.json rename to v2/firefox/data/popup/browsers/firefox-ios.json diff --git a/extension/firefox/data/popup/browsers/firefox-kubuntu.json b/v2/firefox/data/popup/browsers/firefox-kubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-kubuntu.json rename to v2/firefox/data/popup/browsers/firefox-kubuntu.json diff --git a/extension/firefox/data/popup/browsers/firefox-linux.json b/v2/firefox/data/popup/browsers/firefox-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-linux.json rename to v2/firefox/data/popup/browsers/firefox-linux.json diff --git a/extension/firefox/data/popup/browsers/firefox-mac os.json b/v2/firefox/data/popup/browsers/firefox-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-mac os.json rename to v2/firefox/data/popup/browsers/firefox-mac os.json diff --git a/extension/firefox/data/popup/browsers/firefox-mageia.json b/v2/firefox/data/popup/browsers/firefox-mageia.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-mageia.json rename to v2/firefox/data/popup/browsers/firefox-mageia.json diff --git a/extension/firefox/data/popup/browsers/firefox-mandriva.json b/v2/firefox/data/popup/browsers/firefox-mandriva.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-mandriva.json rename to v2/firefox/data/popup/browsers/firefox-mandriva.json diff --git a/extension/firefox/data/popup/browsers/firefox-mint.json b/v2/firefox/data/popup/browsers/firefox-mint.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-mint.json rename to v2/firefox/data/popup/browsers/firefox-mint.json diff --git a/extension/firefox/data/popup/browsers/firefox-netbsd.json b/v2/firefox/data/popup/browsers/firefox-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-netbsd.json rename to v2/firefox/data/popup/browsers/firefox-netbsd.json diff --git a/extension/firefox/data/popup/browsers/firefox-openbsd.json b/v2/firefox/data/popup/browsers/firefox-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-openbsd.json rename to v2/firefox/data/popup/browsers/firefox-openbsd.json diff --git a/extension/firefox/data/popup/browsers/firefox-slackware.json b/v2/firefox/data/popup/browsers/firefox-slackware.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-slackware.json rename to v2/firefox/data/popup/browsers/firefox-slackware.json diff --git a/extension/firefox/data/popup/browsers/firefox-solaris.json b/v2/firefox/data/popup/browsers/firefox-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-solaris.json rename to v2/firefox/data/popup/browsers/firefox-solaris.json diff --git a/extension/firefox/data/popup/browsers/firefox-suse.json b/v2/firefox/data/popup/browsers/firefox-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-suse.json rename to v2/firefox/data/popup/browsers/firefox-suse.json diff --git a/extension/firefox/data/popup/browsers/firefox-ubuntu.json b/v2/firefox/data/popup/browsers/firefox-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-ubuntu.json rename to v2/firefox/data/popup/browsers/firefox-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/firefox-windows phone.json b/v2/firefox/data/popup/browsers/firefox-windows phone.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-windows phone.json rename to v2/firefox/data/popup/browsers/firefox-windows phone.json diff --git a/extension/firefox/data/popup/browsers/firefox-windows.json b/v2/firefox/data/popup/browsers/firefox-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/firefox-windows.json rename to v2/firefox/data/popup/browsers/firefox-windows.json diff --git a/extension/firefox/data/popup/browsers/flock-linux.json b/v2/firefox/data/popup/browsers/flock-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/flock-linux.json rename to v2/firefox/data/popup/browsers/flock-linux.json diff --git a/extension/firefox/data/popup/browsers/flock-mac os.json b/v2/firefox/data/popup/browsers/flock-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/flock-mac os.json rename to v2/firefox/data/popup/browsers/flock-mac os.json diff --git a/extension/firefox/data/popup/browsers/flock-windows.json b/v2/firefox/data/popup/browsers/flock-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/flock-windows.json rename to v2/firefox/data/popup/browsers/flock-windows.json diff --git a/extension/firefox/data/popup/browsers/gobrowser-android.json b/v2/firefox/data/popup/browsers/gobrowser-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/gobrowser-android.json rename to v2/firefox/data/popup/browsers/gobrowser-android.json diff --git a/extension/firefox/data/popup/browsers/gsa-ios.json b/v2/firefox/data/popup/browsers/gsa-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/gsa-ios.json rename to v2/firefox/data/popup/browsers/gsa-ios.json diff --git a/extension/firefox/data/popup/browsers/icab-mac os.json b/v2/firefox/data/popup/browsers/icab-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/icab-mac os.json rename to v2/firefox/data/popup/browsers/icab-mac os.json diff --git a/extension/firefox/data/popup/browsers/icab-windows.json b/v2/firefox/data/popup/browsers/icab-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/icab-windows.json rename to v2/firefox/data/popup/browsers/icab-windows.json diff --git a/extension/firefox/data/popup/browsers/iceape-linux.json b/v2/firefox/data/popup/browsers/iceape-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceape-linux.json rename to v2/firefox/data/popup/browsers/iceape-linux.json diff --git a/extension/firefox/data/popup/browsers/icecat-linux.json b/v2/firefox/data/popup/browsers/icecat-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/icecat-linux.json rename to v2/firefox/data/popup/browsers/icecat-linux.json diff --git a/extension/firefox/data/popup/browsers/icedragon-windows.json b/v2/firefox/data/popup/browsers/icedragon-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/icedragon-windows.json rename to v2/firefox/data/popup/browsers/icedragon-windows.json diff --git a/extension/firefox/data/popup/browsers/iceweasel-debian.json b/v2/firefox/data/popup/browsers/iceweasel-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceweasel-debian.json rename to v2/firefox/data/popup/browsers/iceweasel-debian.json diff --git a/extension/firefox/data/popup/browsers/iceweasel-gentoo.json b/v2/firefox/data/popup/browsers/iceweasel-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceweasel-gentoo.json rename to v2/firefox/data/popup/browsers/iceweasel-gentoo.json diff --git a/extension/firefox/data/popup/browsers/iceweasel-linux.json b/v2/firefox/data/popup/browsers/iceweasel-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceweasel-linux.json rename to v2/firefox/data/popup/browsers/iceweasel-linux.json diff --git a/extension/firefox/data/popup/browsers/iceweasel-ubuntu.json b/v2/firefox/data/popup/browsers/iceweasel-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceweasel-ubuntu.json rename to v2/firefox/data/popup/browsers/iceweasel-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/iceweasel-windows.json b/v2/firefox/data/popup/browsers/iceweasel-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/iceweasel-windows.json rename to v2/firefox/data/popup/browsers/iceweasel-windows.json diff --git a/extension/firefox/data/popup/browsers/ie-linux.json b/v2/firefox/data/popup/browsers/ie-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/ie-linux.json rename to v2/firefox/data/popup/browsers/ie-linux.json diff --git a/extension/firefox/data/popup/browsers/ie-mac os.json b/v2/firefox/data/popup/browsers/ie-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/ie-mac os.json rename to v2/firefox/data/popup/browsers/ie-mac os.json diff --git a/extension/firefox/data/popup/browsers/ie-unix.json b/v2/firefox/data/popup/browsers/ie-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/ie-unix.json rename to v2/firefox/data/popup/browsers/ie-unix.json diff --git a/extension/firefox/data/popup/browsers/ie-windows.json b/v2/firefox/data/popup/browsers/ie-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/ie-windows.json rename to v2/firefox/data/popup/browsers/ie-windows.json diff --git a/extension/firefox/data/popup/browsers/ie-xbox.json b/v2/firefox/data/popup/browsers/ie-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/ie-xbox.json rename to v2/firefox/data/popup/browsers/ie-xbox.json diff --git a/extension/firefox/data/popup/browsers/iemobile-windows phone os.json b/v2/firefox/data/popup/browsers/iemobile-windows phone os.json similarity index 100% rename from extension/firefox/data/popup/browsers/iemobile-windows phone os.json rename to v2/firefox/data/popup/browsers/iemobile-windows phone os.json diff --git a/extension/firefox/data/popup/browsers/iemobile-windows phone.json b/v2/firefox/data/popup/browsers/iemobile-windows phone.json similarity index 100% rename from extension/firefox/data/popup/browsers/iemobile-windows phone.json rename to v2/firefox/data/popup/browsers/iemobile-windows phone.json diff --git a/extension/firefox/data/popup/browsers/iemobile-windows.json b/v2/firefox/data/popup/browsers/iemobile-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/iemobile-windows.json rename to v2/firefox/data/popup/browsers/iemobile-windows.json diff --git a/extension/firefox/data/popup/browsers/instagram-android.json b/v2/firefox/data/popup/browsers/instagram-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/instagram-android.json rename to v2/firefox/data/popup/browsers/instagram-android.json diff --git a/extension/firefox/data/popup/browsers/iridium-windows.json b/v2/firefox/data/popup/browsers/iridium-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/iridium-windows.json rename to v2/firefox/data/popup/browsers/iridium-windows.json diff --git a/extension/firefox/data/popup/browsers/iron-linux.json b/v2/firefox/data/popup/browsers/iron-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/iron-linux.json rename to v2/firefox/data/popup/browsers/iron-linux.json diff --git a/extension/firefox/data/popup/browsers/iron-mac os.json b/v2/firefox/data/popup/browsers/iron-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/iron-mac os.json rename to v2/firefox/data/popup/browsers/iron-mac os.json diff --git a/extension/firefox/data/popup/browsers/iron-windows.json b/v2/firefox/data/popup/browsers/iron-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/iron-windows.json rename to v2/firefox/data/popup/browsers/iron-windows.json diff --git a/extension/firefox/data/popup/browsers/k-meleon-freebsd.json b/v2/firefox/data/popup/browsers/k-meleon-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/k-meleon-freebsd.json rename to v2/firefox/data/popup/browsers/k-meleon-freebsd.json diff --git a/extension/firefox/data/popup/browsers/k-meleon-linux.json b/v2/firefox/data/popup/browsers/k-meleon-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/k-meleon-linux.json rename to v2/firefox/data/popup/browsers/k-meleon-linux.json diff --git a/extension/firefox/data/popup/browsers/k-meleon-windows.json b/v2/firefox/data/popup/browsers/k-meleon-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/k-meleon-windows.json rename to v2/firefox/data/popup/browsers/k-meleon-windows.json diff --git a/extension/firefox/data/popup/browsers/khtml-windows.json b/v2/firefox/data/popup/browsers/khtml-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/khtml-windows.json rename to v2/firefox/data/popup/browsers/khtml-windows.json diff --git a/extension/firefox/data/popup/browsers/kindle-android.json b/v2/firefox/data/popup/browsers/kindle-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/kindle-android.json rename to v2/firefox/data/popup/browsers/kindle-android.json diff --git a/extension/firefox/data/popup/browsers/kindle-linux.json b/v2/firefox/data/popup/browsers/kindle-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/kindle-linux.json rename to v2/firefox/data/popup/browsers/kindle-linux.json diff --git a/extension/firefox/data/popup/browsers/konqueror-debian.json b/v2/firefox/data/popup/browsers/konqueror-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-debian.json rename to v2/firefox/data/popup/browsers/konqueror-debian.json diff --git a/extension/firefox/data/popup/browsers/konqueror-dragonfly.json b/v2/firefox/data/popup/browsers/konqueror-dragonfly.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-dragonfly.json rename to v2/firefox/data/popup/browsers/konqueror-dragonfly.json diff --git a/extension/firefox/data/popup/browsers/konqueror-fedora.json b/v2/firefox/data/popup/browsers/konqueror-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-fedora.json rename to v2/firefox/data/popup/browsers/konqueror-fedora.json diff --git a/extension/firefox/data/popup/browsers/konqueror-freebsd.json b/v2/firefox/data/popup/browsers/konqueror-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-freebsd.json rename to v2/firefox/data/popup/browsers/konqueror-freebsd.json diff --git a/extension/firefox/data/popup/browsers/konqueror-kubuntu.json b/v2/firefox/data/popup/browsers/konqueror-kubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-kubuntu.json rename to v2/firefox/data/popup/browsers/konqueror-kubuntu.json diff --git a/extension/firefox/data/popup/browsers/konqueror-linux.json b/v2/firefox/data/popup/browsers/konqueror-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-linux.json rename to v2/firefox/data/popup/browsers/konqueror-linux.json diff --git a/extension/firefox/data/popup/browsers/konqueror-netbsd.json b/v2/firefox/data/popup/browsers/konqueror-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-netbsd.json rename to v2/firefox/data/popup/browsers/konqueror-netbsd.json diff --git a/extension/firefox/data/popup/browsers/konqueror-openbsd.json b/v2/firefox/data/popup/browsers/konqueror-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-openbsd.json rename to v2/firefox/data/popup/browsers/konqueror-openbsd.json diff --git a/extension/firefox/data/popup/browsers/konqueror-slackware.json b/v2/firefox/data/popup/browsers/konqueror-slackware.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-slackware.json rename to v2/firefox/data/popup/browsers/konqueror-slackware.json diff --git a/extension/firefox/data/popup/browsers/konqueror-solaris.json b/v2/firefox/data/popup/browsers/konqueror-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-solaris.json rename to v2/firefox/data/popup/browsers/konqueror-solaris.json diff --git a/extension/firefox/data/popup/browsers/konqueror-suse.json b/v2/firefox/data/popup/browsers/konqueror-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-suse.json rename to v2/firefox/data/popup/browsers/konqueror-suse.json diff --git a/extension/firefox/data/popup/browsers/konqueror-windows.json b/v2/firefox/data/popup/browsers/konqueror-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/konqueror-windows.json rename to v2/firefox/data/popup/browsers/konqueror-windows.json diff --git a/extension/firefox/data/popup/browsers/links-debian.json b/v2/firefox/data/popup/browsers/links-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-debian.json rename to v2/firefox/data/popup/browsers/links-debian.json diff --git a/extension/firefox/data/popup/browsers/links-freebsd.json b/v2/firefox/data/popup/browsers/links-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-freebsd.json rename to v2/firefox/data/popup/browsers/links-freebsd.json diff --git a/extension/firefox/data/popup/browsers/links-gentoo.json b/v2/firefox/data/popup/browsers/links-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-gentoo.json rename to v2/firefox/data/popup/browsers/links-gentoo.json diff --git a/extension/firefox/data/popup/browsers/links-linux.json b/v2/firefox/data/popup/browsers/links-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-linux.json rename to v2/firefox/data/popup/browsers/links-linux.json diff --git a/extension/firefox/data/popup/browsers/links-mac os.json b/v2/firefox/data/popup/browsers/links-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-mac os.json rename to v2/firefox/data/popup/browsers/links-mac os.json diff --git a/extension/firefox/data/popup/browsers/links-netbsd.json b/v2/firefox/data/popup/browsers/links-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-netbsd.json rename to v2/firefox/data/popup/browsers/links-netbsd.json diff --git a/extension/firefox/data/popup/browsers/links-openbsd.json b/v2/firefox/data/popup/browsers/links-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-openbsd.json rename to v2/firefox/data/popup/browsers/links-openbsd.json diff --git a/extension/firefox/data/popup/browsers/links-solaris.json b/v2/firefox/data/popup/browsers/links-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-solaris.json rename to v2/firefox/data/popup/browsers/links-solaris.json diff --git a/extension/firefox/data/popup/browsers/links-unix.json b/v2/firefox/data/popup/browsers/links-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/links-unix.json rename to v2/firefox/data/popup/browsers/links-unix.json diff --git a/extension/firefox/data/popup/browsers/lunascape-windows.json b/v2/firefox/data/popup/browsers/lunascape-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/lunascape-windows.json rename to v2/firefox/data/popup/browsers/lunascape-windows.json diff --git a/extension/firefox/data/popup/browsers/lynx-gnu.json b/v2/firefox/data/popup/browsers/lynx-gnu.json similarity index 100% rename from extension/firefox/data/popup/browsers/lynx-gnu.json rename to v2/firefox/data/popup/browsers/lynx-gnu.json diff --git a/extension/firefox/data/popup/browsers/maemo browser-linux.json b/v2/firefox/data/popup/browsers/maemo browser-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/maemo browser-linux.json rename to v2/firefox/data/popup/browsers/maemo browser-linux.json diff --git a/extension/firefox/data/popup/browsers/maxthon-windows.json b/v2/firefox/data/popup/browsers/maxthon-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/maxthon-windows.json rename to v2/firefox/data/popup/browsers/maxthon-windows.json diff --git a/extension/firefox/data/popup/browsers/midori-arch.json b/v2/firefox/data/popup/browsers/midori-arch.json similarity index 100% rename from extension/firefox/data/popup/browsers/midori-arch.json rename to v2/firefox/data/popup/browsers/midori-arch.json diff --git a/extension/firefox/data/popup/browsers/midori-freebsd.json b/v2/firefox/data/popup/browsers/midori-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/midori-freebsd.json rename to v2/firefox/data/popup/browsers/midori-freebsd.json diff --git a/extension/firefox/data/popup/browsers/midori-linux.json b/v2/firefox/data/popup/browsers/midori-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/midori-linux.json rename to v2/firefox/data/popup/browsers/midori-linux.json diff --git a/extension/firefox/data/popup/browsers/midori-netbsd.json b/v2/firefox/data/popup/browsers/midori-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/midori-netbsd.json rename to v2/firefox/data/popup/browsers/midori-netbsd.json diff --git a/extension/firefox/data/popup/browsers/midori-windows.json b/v2/firefox/data/popup/browsers/midori-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/midori-windows.json rename to v2/firefox/data/popup/browsers/midori-windows.json diff --git a/extension/firefox/data/popup/browsers/minimo-linux.json b/v2/firefox/data/popup/browsers/minimo-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/minimo-linux.json rename to v2/firefox/data/popup/browsers/minimo-linux.json diff --git a/extension/firefox/data/popup/browsers/minimo-openbsd.json b/v2/firefox/data/popup/browsers/minimo-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/minimo-openbsd.json rename to v2/firefox/data/popup/browsers/minimo-openbsd.json diff --git a/extension/firefox/data/popup/browsers/minimo-windows.json b/v2/firefox/data/popup/browsers/minimo-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/minimo-windows.json rename to v2/firefox/data/popup/browsers/minimo-windows.json diff --git a/extension/firefox/data/popup/browsers/miui browser-android.json b/v2/firefox/data/popup/browsers/miui browser-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/miui browser-android.json rename to v2/firefox/data/popup/browsers/miui browser-android.json diff --git a/extension/firefox/data/popup/browsers/mobile safari-android.json b/v2/firefox/data/popup/browsers/mobile safari-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/mobile safari-android.json rename to v2/firefox/data/popup/browsers/mobile safari-android.json diff --git a/extension/firefox/data/popup/browsers/mobile safari-ios.json b/v2/firefox/data/popup/browsers/mobile safari-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/mobile safari-ios.json rename to v2/firefox/data/popup/browsers/mobile safari-ios.json diff --git a/extension/firefox/data/popup/browsers/mobile safari-mac os.json b/v2/firefox/data/popup/browsers/mobile safari-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/mobile safari-mac os.json rename to v2/firefox/data/popup/browsers/mobile safari-mac os.json diff --git a/extension/firefox/data/popup/browsers/mosaic-aix.json b/v2/firefox/data/popup/browsers/mosaic-aix.json similarity index 100% rename from extension/firefox/data/popup/browsers/mosaic-aix.json rename to v2/firefox/data/popup/browsers/mosaic-aix.json diff --git a/extension/firefox/data/popup/browsers/mosaic-solaris.json b/v2/firefox/data/popup/browsers/mosaic-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/mosaic-solaris.json rename to v2/firefox/data/popup/browsers/mosaic-solaris.json diff --git a/extension/firefox/data/popup/browsers/mosaic-windows.json b/v2/firefox/data/popup/browsers/mosaic-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/mosaic-windows.json rename to v2/firefox/data/popup/browsers/mosaic-windows.json diff --git a/extension/firefox/data/popup/browsers/mozilla-aix.json b/v2/firefox/data/popup/browsers/mozilla-aix.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-aix.json rename to v2/firefox/data/popup/browsers/mozilla-aix.json diff --git a/extension/firefox/data/popup/browsers/mozilla-android.json b/v2/firefox/data/popup/browsers/mozilla-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-android.json rename to v2/firefox/data/popup/browsers/mozilla-android.json diff --git a/extension/firefox/data/popup/browsers/mozilla-beos.json b/v2/firefox/data/popup/browsers/mozilla-beos.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-beos.json rename to v2/firefox/data/popup/browsers/mozilla-beos.json diff --git a/extension/firefox/data/popup/browsers/mozilla-centos.json b/v2/firefox/data/popup/browsers/mozilla-centos.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-centos.json rename to v2/firefox/data/popup/browsers/mozilla-centos.json diff --git a/extension/firefox/data/popup/browsers/mozilla-debian.json b/v2/firefox/data/popup/browsers/mozilla-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-debian.json rename to v2/firefox/data/popup/browsers/mozilla-debian.json diff --git a/extension/firefox/data/popup/browsers/mozilla-fedora.json b/v2/firefox/data/popup/browsers/mozilla-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-fedora.json rename to v2/firefox/data/popup/browsers/mozilla-fedora.json diff --git a/extension/firefox/data/popup/browsers/mozilla-freebsd.json b/v2/firefox/data/popup/browsers/mozilla-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-freebsd.json rename to v2/firefox/data/popup/browsers/mozilla-freebsd.json diff --git a/extension/firefox/data/popup/browsers/mozilla-gentoo.json b/v2/firefox/data/popup/browsers/mozilla-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-gentoo.json rename to v2/firefox/data/popup/browsers/mozilla-gentoo.json diff --git a/extension/firefox/data/popup/browsers/mozilla-haiku.json b/v2/firefox/data/popup/browsers/mozilla-haiku.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-haiku.json rename to v2/firefox/data/popup/browsers/mozilla-haiku.json diff --git a/extension/firefox/data/popup/browsers/mozilla-kubuntu.json b/v2/firefox/data/popup/browsers/mozilla-kubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-kubuntu.json rename to v2/firefox/data/popup/browsers/mozilla-kubuntu.json diff --git a/extension/firefox/data/popup/browsers/mozilla-linux.json b/v2/firefox/data/popup/browsers/mozilla-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-linux.json rename to v2/firefox/data/popup/browsers/mozilla-linux.json diff --git a/extension/firefox/data/popup/browsers/mozilla-mac os.json b/v2/firefox/data/popup/browsers/mozilla-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-mac os.json rename to v2/firefox/data/popup/browsers/mozilla-mac os.json diff --git a/extension/firefox/data/popup/browsers/mozilla-mandriva.json b/v2/firefox/data/popup/browsers/mozilla-mandriva.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-mandriva.json rename to v2/firefox/data/popup/browsers/mozilla-mandriva.json diff --git a/extension/firefox/data/popup/browsers/mozilla-mint.json b/v2/firefox/data/popup/browsers/mozilla-mint.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-mint.json rename to v2/firefox/data/popup/browsers/mozilla-mint.json diff --git a/extension/firefox/data/popup/browsers/mozilla-netbsd.json b/v2/firefox/data/popup/browsers/mozilla-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-netbsd.json rename to v2/firefox/data/popup/browsers/mozilla-netbsd.json diff --git a/extension/firefox/data/popup/browsers/mozilla-openbsd.json b/v2/firefox/data/popup/browsers/mozilla-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-openbsd.json rename to v2/firefox/data/popup/browsers/mozilla-openbsd.json diff --git a/extension/firefox/data/popup/browsers/mozilla-openvms.json b/v2/firefox/data/popup/browsers/mozilla-openvms.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-openvms.json rename to v2/firefox/data/popup/browsers/mozilla-openvms.json diff --git a/extension/firefox/data/popup/browsers/mozilla-os-2.json b/v2/firefox/data/popup/browsers/mozilla-os-2.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-os-2.json rename to v2/firefox/data/popup/browsers/mozilla-os-2.json diff --git a/extension/firefox/data/popup/browsers/mozilla-qnx.json b/v2/firefox/data/popup/browsers/mozilla-qnx.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-qnx.json rename to v2/firefox/data/popup/browsers/mozilla-qnx.json diff --git a/extension/firefox/data/popup/browsers/mozilla-slackware.json b/v2/firefox/data/popup/browsers/mozilla-slackware.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-slackware.json rename to v2/firefox/data/popup/browsers/mozilla-slackware.json diff --git a/extension/firefox/data/popup/browsers/mozilla-solaris.json b/v2/firefox/data/popup/browsers/mozilla-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-solaris.json rename to v2/firefox/data/popup/browsers/mozilla-solaris.json diff --git a/extension/firefox/data/popup/browsers/mozilla-suse.json b/v2/firefox/data/popup/browsers/mozilla-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-suse.json rename to v2/firefox/data/popup/browsers/mozilla-suse.json diff --git a/extension/firefox/data/popup/browsers/mozilla-ubuntu.json b/v2/firefox/data/popup/browsers/mozilla-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-ubuntu.json rename to v2/firefox/data/popup/browsers/mozilla-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/mozilla-unix.json b/v2/firefox/data/popup/browsers/mozilla-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-unix.json rename to v2/firefox/data/popup/browsers/mozilla-unix.json diff --git a/extension/firefox/data/popup/browsers/mozilla-windows.json b/v2/firefox/data/popup/browsers/mozilla-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-windows.json rename to v2/firefox/data/popup/browsers/mozilla-windows.json diff --git a/extension/firefox/data/popup/browsers/mozilla-zenwalk.json b/v2/firefox/data/popup/browsers/mozilla-zenwalk.json similarity index 100% rename from extension/firefox/data/popup/browsers/mozilla-zenwalk.json rename to v2/firefox/data/popup/browsers/mozilla-zenwalk.json diff --git a/extension/firefox/data/popup/browsers/netscape-aix.json b/v2/firefox/data/popup/browsers/netscape-aix.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-aix.json rename to v2/firefox/data/popup/browsers/netscape-aix.json diff --git a/extension/firefox/data/popup/browsers/netscape-linux.json b/v2/firefox/data/popup/browsers/netscape-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-linux.json rename to v2/firefox/data/popup/browsers/netscape-linux.json diff --git a/extension/firefox/data/popup/browsers/netscape-mac os.json b/v2/firefox/data/popup/browsers/netscape-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-mac os.json rename to v2/firefox/data/popup/browsers/netscape-mac os.json diff --git a/extension/firefox/data/popup/browsers/netscape-solaris.json b/v2/firefox/data/popup/browsers/netscape-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-solaris.json rename to v2/firefox/data/popup/browsers/netscape-solaris.json diff --git a/extension/firefox/data/popup/browsers/netscape-windows.json b/v2/firefox/data/popup/browsers/netscape-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-windows.json rename to v2/firefox/data/popup/browsers/netscape-windows.json diff --git a/extension/firefox/data/popup/browsers/netscape-xbox.json b/v2/firefox/data/popup/browsers/netscape-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/netscape-xbox.json rename to v2/firefox/data/popup/browsers/netscape-xbox.json diff --git a/extension/firefox/data/popup/browsers/netsurf-linux.json b/v2/firefox/data/popup/browsers/netsurf-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/netsurf-linux.json rename to v2/firefox/data/popup/browsers/netsurf-linux.json diff --git a/extension/firefox/data/popup/browsers/netsurf-netbsd.json b/v2/firefox/data/popup/browsers/netsurf-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/netsurf-netbsd.json rename to v2/firefox/data/popup/browsers/netsurf-netbsd.json diff --git a/extension/firefox/data/popup/browsers/netsurf-risc os.json b/v2/firefox/data/popup/browsers/netsurf-risc os.json similarity index 100% rename from extension/firefox/data/popup/browsers/netsurf-risc os.json rename to v2/firefox/data/popup/browsers/netsurf-risc os.json diff --git a/extension/firefox/data/popup/browsers/omniweb-mac os.json b/v2/firefox/data/popup/browsers/omniweb-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/omniweb-mac os.json rename to v2/firefox/data/popup/browsers/omniweb-mac os.json diff --git a/extension/firefox/data/popup/browsers/opera mini-android.json b/v2/firefox/data/popup/browsers/opera mini-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-android.json rename to v2/firefox/data/popup/browsers/opera mini-android.json diff --git a/extension/firefox/data/popup/browsers/opera mini-ios.json b/v2/firefox/data/popup/browsers/opera mini-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-ios.json rename to v2/firefox/data/popup/browsers/opera mini-ios.json diff --git a/extension/firefox/data/popup/browsers/opera mini-linux.json b/v2/firefox/data/popup/browsers/opera mini-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-linux.json rename to v2/firefox/data/popup/browsers/opera mini-linux.json diff --git a/extension/firefox/data/popup/browsers/opera mini-mac os.json b/v2/firefox/data/popup/browsers/opera mini-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-mac os.json rename to v2/firefox/data/popup/browsers/opera mini-mac os.json diff --git a/extension/firefox/data/popup/browsers/opera mini-symbian.json b/v2/firefox/data/popup/browsers/opera mini-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-symbian.json rename to v2/firefox/data/popup/browsers/opera mini-symbian.json diff --git a/extension/firefox/data/popup/browsers/opera mini-unix.json b/v2/firefox/data/popup/browsers/opera mini-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-unix.json rename to v2/firefox/data/popup/browsers/opera mini-unix.json diff --git a/extension/firefox/data/popup/browsers/opera mini-windows.json b/v2/firefox/data/popup/browsers/opera mini-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mini-windows.json rename to v2/firefox/data/popup/browsers/opera mini-windows.json diff --git a/extension/firefox/data/popup/browsers/opera mobi-android.json b/v2/firefox/data/popup/browsers/opera mobi-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mobi-android.json rename to v2/firefox/data/popup/browsers/opera mobi-android.json diff --git a/extension/firefox/data/popup/browsers/opera mobi-linux.json b/v2/firefox/data/popup/browsers/opera mobi-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mobi-linux.json rename to v2/firefox/data/popup/browsers/opera mobi-linux.json diff --git a/extension/firefox/data/popup/browsers/opera mobi-mac os.json b/v2/firefox/data/popup/browsers/opera mobi-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mobi-mac os.json rename to v2/firefox/data/popup/browsers/opera mobi-mac os.json diff --git a/extension/firefox/data/popup/browsers/opera mobi-symbian.json b/v2/firefox/data/popup/browsers/opera mobi-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mobi-symbian.json rename to v2/firefox/data/popup/browsers/opera mobi-symbian.json diff --git a/extension/firefox/data/popup/browsers/opera mobi-windows.json b/v2/firefox/data/popup/browsers/opera mobi-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera mobi-windows.json rename to v2/firefox/data/popup/browsers/opera mobi-windows.json diff --git a/extension/firefox/data/popup/browsers/opera tablet-symbian.json b/v2/firefox/data/popup/browsers/opera tablet-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera tablet-symbian.json rename to v2/firefox/data/popup/browsers/opera tablet-symbian.json diff --git a/extension/firefox/data/popup/browsers/opera tablet-windows.json b/v2/firefox/data/popup/browsers/opera tablet-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera tablet-windows.json rename to v2/firefox/data/popup/browsers/opera tablet-windows.json diff --git a/extension/firefox/data/popup/browsers/opera touch-android.json b/v2/firefox/data/popup/browsers/opera touch-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera touch-android.json rename to v2/firefox/data/popup/browsers/opera touch-android.json diff --git a/extension/firefox/data/popup/browsers/opera touch-ios.json b/v2/firefox/data/popup/browsers/opera touch-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera touch-ios.json rename to v2/firefox/data/popup/browsers/opera touch-ios.json diff --git a/extension/firefox/data/popup/browsers/opera-android.json b/v2/firefox/data/popup/browsers/opera-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-android.json rename to v2/firefox/data/popup/browsers/opera-android.json diff --git a/extension/firefox/data/popup/browsers/opera-debian.json b/v2/firefox/data/popup/browsers/opera-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-debian.json rename to v2/firefox/data/popup/browsers/opera-debian.json diff --git a/extension/firefox/data/popup/browsers/opera-freebsd.json b/v2/firefox/data/popup/browsers/opera-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-freebsd.json rename to v2/firefox/data/popup/browsers/opera-freebsd.json diff --git a/extension/firefox/data/popup/browsers/opera-kubuntu.json b/v2/firefox/data/popup/browsers/opera-kubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-kubuntu.json rename to v2/firefox/data/popup/browsers/opera-kubuntu.json diff --git a/extension/firefox/data/popup/browsers/opera-linux.json b/v2/firefox/data/popup/browsers/opera-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-linux.json rename to v2/firefox/data/popup/browsers/opera-linux.json diff --git a/extension/firefox/data/popup/browsers/opera-mac os.json b/v2/firefox/data/popup/browsers/opera-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-mac os.json rename to v2/firefox/data/popup/browsers/opera-mac os.json diff --git a/extension/firefox/data/popup/browsers/opera-mint.json b/v2/firefox/data/popup/browsers/opera-mint.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-mint.json rename to v2/firefox/data/popup/browsers/opera-mint.json diff --git a/extension/firefox/data/popup/browsers/opera-nintendo.json b/v2/firefox/data/popup/browsers/opera-nintendo.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-nintendo.json rename to v2/firefox/data/popup/browsers/opera-nintendo.json diff --git a/extension/firefox/data/popup/browsers/opera-openbsd.json b/v2/firefox/data/popup/browsers/opera-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-openbsd.json rename to v2/firefox/data/popup/browsers/opera-openbsd.json diff --git a/extension/firefox/data/popup/browsers/opera-opensolaris.json b/v2/firefox/data/popup/browsers/opera-opensolaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-opensolaris.json rename to v2/firefox/data/popup/browsers/opera-opensolaris.json diff --git a/extension/firefox/data/popup/browsers/opera-solaris.json b/v2/firefox/data/popup/browsers/opera-solaris.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-solaris.json rename to v2/firefox/data/popup/browsers/opera-solaris.json diff --git a/extension/firefox/data/popup/browsers/opera-symbian.json b/v2/firefox/data/popup/browsers/opera-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-symbian.json rename to v2/firefox/data/popup/browsers/opera-symbian.json diff --git a/extension/firefox/data/popup/browsers/opera-ubuntu.json b/v2/firefox/data/popup/browsers/opera-ubuntu.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-ubuntu.json rename to v2/firefox/data/popup/browsers/opera-ubuntu.json diff --git a/extension/firefox/data/popup/browsers/opera-unix.json b/v2/firefox/data/popup/browsers/opera-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-unix.json rename to v2/firefox/data/popup/browsers/opera-unix.json diff --git a/extension/firefox/data/popup/browsers/opera-windows.json b/v2/firefox/data/popup/browsers/opera-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/opera-windows.json rename to v2/firefox/data/popup/browsers/opera-windows.json diff --git a/extension/firefox/data/popup/browsers/palemoon-windows.json b/v2/firefox/data/popup/browsers/palemoon-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/palemoon-windows.json rename to v2/firefox/data/popup/browsers/palemoon-windows.json diff --git a/extension/firefox/data/popup/browsers/phoenix-linux.json b/v2/firefox/data/popup/browsers/phoenix-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/phoenix-linux.json rename to v2/firefox/data/popup/browsers/phoenix-linux.json diff --git a/extension/firefox/data/popup/browsers/phoenix-mac os.json b/v2/firefox/data/popup/browsers/phoenix-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/phoenix-mac os.json rename to v2/firefox/data/popup/browsers/phoenix-mac os.json diff --git a/extension/firefox/data/popup/browsers/phoenix-windows.json b/v2/firefox/data/popup/browsers/phoenix-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/phoenix-windows.json rename to v2/firefox/data/popup/browsers/phoenix-windows.json diff --git a/extension/firefox/data/popup/browsers/puffin-android.json b/v2/firefox/data/popup/browsers/puffin-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/puffin-android.json rename to v2/firefox/data/popup/browsers/puffin-android.json diff --git a/extension/firefox/data/popup/browsers/qqbrowser-windows.json b/v2/firefox/data/popup/browsers/qqbrowser-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/qqbrowser-windows.json rename to v2/firefox/data/popup/browsers/qqbrowser-windows.json diff --git a/extension/firefox/data/popup/browsers/rockmelt-mac os.json b/v2/firefox/data/popup/browsers/rockmelt-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/rockmelt-mac os.json rename to v2/firefox/data/popup/browsers/rockmelt-mac os.json diff --git a/extension/firefox/data/popup/browsers/rockmelt-windows.json b/v2/firefox/data/popup/browsers/rockmelt-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/rockmelt-windows.json rename to v2/firefox/data/popup/browsers/rockmelt-windows.json diff --git a/extension/firefox/data/popup/browsers/safari-android.json b/v2/firefox/data/popup/browsers/safari-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-android.json rename to v2/firefox/data/popup/browsers/safari-android.json diff --git a/extension/firefox/data/popup/browsers/safari-blackberry.json b/v2/firefox/data/popup/browsers/safari-blackberry.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-blackberry.json rename to v2/firefox/data/popup/browsers/safari-blackberry.json diff --git a/extension/firefox/data/popup/browsers/safari-bsd.json b/v2/firefox/data/popup/browsers/safari-bsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-bsd.json rename to v2/firefox/data/popup/browsers/safari-bsd.json diff --git a/extension/firefox/data/popup/browsers/safari-ios.json b/v2/firefox/data/popup/browsers/safari-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-ios.json rename to v2/firefox/data/popup/browsers/safari-ios.json diff --git a/extension/firefox/data/popup/browsers/safari-linux.json b/v2/firefox/data/popup/browsers/safari-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-linux.json rename to v2/firefox/data/popup/browsers/safari-linux.json diff --git a/extension/firefox/data/popup/browsers/safari-mac os.json b/v2/firefox/data/popup/browsers/safari-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-mac os.json rename to v2/firefox/data/popup/browsers/safari-mac os.json diff --git a/extension/firefox/data/popup/browsers/safari-netbsd.json b/v2/firefox/data/popup/browsers/safari-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-netbsd.json rename to v2/firefox/data/popup/browsers/safari-netbsd.json diff --git a/extension/firefox/data/popup/browsers/safari-playstation.json b/v2/firefox/data/popup/browsers/safari-playstation.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-playstation.json rename to v2/firefox/data/popup/browsers/safari-playstation.json diff --git a/extension/firefox/data/popup/browsers/safari-symbian.json b/v2/firefox/data/popup/browsers/safari-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-symbian.json rename to v2/firefox/data/popup/browsers/safari-symbian.json diff --git a/extension/firefox/data/popup/browsers/safari-windows.json b/v2/firefox/data/popup/browsers/safari-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/safari-windows.json rename to v2/firefox/data/popup/browsers/safari-windows.json diff --git a/extension/firefox/data/popup/browsers/samsung browser-android.json b/v2/firefox/data/popup/browsers/samsung browser-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/samsung browser-android.json rename to v2/firefox/data/popup/browsers/samsung browser-android.json diff --git a/extension/firefox/data/popup/browsers/samsung browser-linux.json b/v2/firefox/data/popup/browsers/samsung browser-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/samsung browser-linux.json rename to v2/firefox/data/popup/browsers/samsung browser-linux.json diff --git a/extension/firefox/data/popup/browsers/samsung browser-tizen.json b/v2/firefox/data/popup/browsers/samsung browser-tizen.json similarity index 100% rename from extension/firefox/data/popup/browsers/samsung browser-tizen.json rename to v2/firefox/data/popup/browsers/samsung browser-tizen.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-amigaos.json b/v2/firefox/data/popup/browsers/seamonkey-amigaos.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-amigaos.json rename to v2/firefox/data/popup/browsers/seamonkey-amigaos.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-beos.json b/v2/firefox/data/popup/browsers/seamonkey-beos.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-beos.json rename to v2/firefox/data/popup/browsers/seamonkey-beos.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-centos.json b/v2/firefox/data/popup/browsers/seamonkey-centos.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-centos.json rename to v2/firefox/data/popup/browsers/seamonkey-centos.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-fedora.json b/v2/firefox/data/popup/browsers/seamonkey-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-fedora.json rename to v2/firefox/data/popup/browsers/seamonkey-fedora.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-freebsd.json b/v2/firefox/data/popup/browsers/seamonkey-freebsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-freebsd.json rename to v2/firefox/data/popup/browsers/seamonkey-freebsd.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-gentoo.json b/v2/firefox/data/popup/browsers/seamonkey-gentoo.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-gentoo.json rename to v2/firefox/data/popup/browsers/seamonkey-gentoo.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-haiku.json b/v2/firefox/data/popup/browsers/seamonkey-haiku.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-haiku.json rename to v2/firefox/data/popup/browsers/seamonkey-haiku.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-linux.json b/v2/firefox/data/popup/browsers/seamonkey-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-linux.json rename to v2/firefox/data/popup/browsers/seamonkey-linux.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-mac os.json b/v2/firefox/data/popup/browsers/seamonkey-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-mac os.json rename to v2/firefox/data/popup/browsers/seamonkey-mac os.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-mandriva.json b/v2/firefox/data/popup/browsers/seamonkey-mandriva.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-mandriva.json rename to v2/firefox/data/popup/browsers/seamonkey-mandriva.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-netbsd.json b/v2/firefox/data/popup/browsers/seamonkey-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-netbsd.json rename to v2/firefox/data/popup/browsers/seamonkey-netbsd.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-openbsd.json b/v2/firefox/data/popup/browsers/seamonkey-openbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-openbsd.json rename to v2/firefox/data/popup/browsers/seamonkey-openbsd.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-os-2.json b/v2/firefox/data/popup/browsers/seamonkey-os-2.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-os-2.json rename to v2/firefox/data/popup/browsers/seamonkey-os-2.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-suse.json b/v2/firefox/data/popup/browsers/seamonkey-suse.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-suse.json rename to v2/firefox/data/popup/browsers/seamonkey-suse.json diff --git a/extension/firefox/data/popup/browsers/seamonkey-windows.json b/v2/firefox/data/popup/browsers/seamonkey-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/seamonkey-windows.json rename to v2/firefox/data/popup/browsers/seamonkey-windows.json diff --git a/extension/firefox/data/popup/browsers/silk-android.json b/v2/firefox/data/popup/browsers/silk-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/silk-android.json rename to v2/firefox/data/popup/browsers/silk-android.json diff --git a/extension/firefox/data/popup/browsers/silk-linux.json b/v2/firefox/data/popup/browsers/silk-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/silk-linux.json rename to v2/firefox/data/popup/browsers/silk-linux.json diff --git a/extension/firefox/data/popup/browsers/silk-mac os.json b/v2/firefox/data/popup/browsers/silk-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/silk-mac os.json rename to v2/firefox/data/popup/browsers/silk-mac os.json diff --git a/extension/firefox/data/popup/browsers/silk-playstation.json b/v2/firefox/data/popup/browsers/silk-playstation.json similarity index 100% rename from extension/firefox/data/popup/browsers/silk-playstation.json rename to v2/firefox/data/popup/browsers/silk-playstation.json diff --git a/extension/firefox/data/popup/browsers/skyfire-mac os.json b/v2/firefox/data/popup/browsers/skyfire-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/skyfire-mac os.json rename to v2/firefox/data/popup/browsers/skyfire-mac os.json diff --git a/extension/firefox/data/popup/browsers/slim-android.json b/v2/firefox/data/popup/browsers/slim-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/slim-android.json rename to v2/firefox/data/popup/browsers/slim-android.json diff --git a/extension/firefox/data/popup/browsers/slim-windows.json b/v2/firefox/data/popup/browsers/slim-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/slim-windows.json rename to v2/firefox/data/popup/browsers/slim-windows.json diff --git a/extension/firefox/data/popup/browsers/swiftfox-linux.json b/v2/firefox/data/popup/browsers/swiftfox-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/swiftfox-linux.json rename to v2/firefox/data/popup/browsers/swiftfox-linux.json diff --git a/extension/firefox/data/popup/browsers/tesla-linux.json b/v2/firefox/data/popup/browsers/tesla-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/tesla-linux.json rename to v2/firefox/data/popup/browsers/tesla-linux.json diff --git a/extension/firefox/data/popup/browsers/tesla-windows.json b/v2/firefox/data/popup/browsers/tesla-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/tesla-windows.json rename to v2/firefox/data/popup/browsers/tesla-windows.json diff --git a/extension/firefox/data/popup/browsers/tizenbrowser-tizen.json b/v2/firefox/data/popup/browsers/tizenbrowser-tizen.json similarity index 100% rename from extension/firefox/data/popup/browsers/tizenbrowser-tizen.json rename to v2/firefox/data/popup/browsers/tizenbrowser-tizen.json diff --git a/extension/firefox/data/popup/browsers/ucbrowser-android.json b/v2/firefox/data/popup/browsers/ucbrowser-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/ucbrowser-android.json rename to v2/firefox/data/popup/browsers/ucbrowser-android.json diff --git a/extension/firefox/data/popup/browsers/ucbrowser-windows.json b/v2/firefox/data/popup/browsers/ucbrowser-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/ucbrowser-windows.json rename to v2/firefox/data/popup/browsers/ucbrowser-windows.json diff --git a/extension/firefox/data/popup/browsers/vivaldi-linux.json b/v2/firefox/data/popup/browsers/vivaldi-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/vivaldi-linux.json rename to v2/firefox/data/popup/browsers/vivaldi-linux.json diff --git a/extension/firefox/data/popup/browsers/vivaldi-mac os.json b/v2/firefox/data/popup/browsers/vivaldi-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/vivaldi-mac os.json rename to v2/firefox/data/popup/browsers/vivaldi-mac os.json diff --git a/extension/firefox/data/popup/browsers/vivaldi-netbsd.json b/v2/firefox/data/popup/browsers/vivaldi-netbsd.json similarity index 100% rename from extension/firefox/data/popup/browsers/vivaldi-netbsd.json rename to v2/firefox/data/popup/browsers/vivaldi-netbsd.json diff --git a/extension/firefox/data/popup/browsers/vivaldi-windows.json b/v2/firefox/data/popup/browsers/vivaldi-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/vivaldi-windows.json rename to v2/firefox/data/popup/browsers/vivaldi-windows.json diff --git a/extension/firefox/data/popup/browsers/w3m-debian.json b/v2/firefox/data/popup/browsers/w3m-debian.json similarity index 100% rename from extension/firefox/data/popup/browsers/w3m-debian.json rename to v2/firefox/data/popup/browsers/w3m-debian.json diff --git a/extension/firefox/data/popup/browsers/waterfox-linux.json b/v2/firefox/data/popup/browsers/waterfox-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/waterfox-linux.json rename to v2/firefox/data/popup/browsers/waterfox-linux.json diff --git a/extension/firefox/data/popup/browsers/waterfox-mac os.json b/v2/firefox/data/popup/browsers/waterfox-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/waterfox-mac os.json rename to v2/firefox/data/popup/browsers/waterfox-mac os.json diff --git a/extension/firefox/data/popup/browsers/waterfox-windows.json b/v2/firefox/data/popup/browsers/waterfox-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/waterfox-windows.json rename to v2/firefox/data/popup/browsers/waterfox-windows.json diff --git a/extension/firefox/data/popup/browsers/webkit-android.json b/v2/firefox/data/popup/browsers/webkit-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-android.json rename to v2/firefox/data/popup/browsers/webkit-android.json diff --git a/extension/firefox/data/popup/browsers/webkit-arch.json b/v2/firefox/data/popup/browsers/webkit-arch.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-arch.json rename to v2/firefox/data/popup/browsers/webkit-arch.json diff --git a/extension/firefox/data/popup/browsers/webkit-ios.json b/v2/firefox/data/popup/browsers/webkit-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-ios.json rename to v2/firefox/data/popup/browsers/webkit-ios.json diff --git a/extension/firefox/data/popup/browsers/webkit-linux.json b/v2/firefox/data/popup/browsers/webkit-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-linux.json rename to v2/firefox/data/popup/browsers/webkit-linux.json diff --git a/extension/firefox/data/popup/browsers/webkit-mac os.json b/v2/firefox/data/popup/browsers/webkit-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-mac os.json rename to v2/firefox/data/popup/browsers/webkit-mac os.json diff --git a/extension/firefox/data/popup/browsers/webkit-playstation.json b/v2/firefox/data/popup/browsers/webkit-playstation.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-playstation.json rename to v2/firefox/data/popup/browsers/webkit-playstation.json diff --git a/extension/firefox/data/popup/browsers/webkit-symbian.json b/v2/firefox/data/popup/browsers/webkit-symbian.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-symbian.json rename to v2/firefox/data/popup/browsers/webkit-symbian.json diff --git a/extension/firefox/data/popup/browsers/webkit-unix.json b/v2/firefox/data/popup/browsers/webkit-unix.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-unix.json rename to v2/firefox/data/popup/browsers/webkit-unix.json diff --git a/extension/firefox/data/popup/browsers/webkit-windows phone.json b/v2/firefox/data/popup/browsers/webkit-windows phone.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-windows phone.json rename to v2/firefox/data/popup/browsers/webkit-windows phone.json diff --git a/extension/firefox/data/popup/browsers/webkit-windows.json b/v2/firefox/data/popup/browsers/webkit-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-windows.json rename to v2/firefox/data/popup/browsers/webkit-windows.json diff --git a/extension/firefox/data/popup/browsers/webkit-xbox.json b/v2/firefox/data/popup/browsers/webkit-xbox.json similarity index 100% rename from extension/firefox/data/popup/browsers/webkit-xbox.json rename to v2/firefox/data/popup/browsers/webkit-xbox.json diff --git a/extension/firefox/data/popup/browsers/whale-mac os.json b/v2/firefox/data/popup/browsers/whale-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/whale-mac os.json rename to v2/firefox/data/popup/browsers/whale-mac os.json diff --git a/extension/firefox/data/popup/browsers/whale-windows.json b/v2/firefox/data/popup/browsers/whale-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/whale-windows.json rename to v2/firefox/data/popup/browsers/whale-windows.json diff --git a/extension/firefox/data/popup/browsers/yandex-android.json b/v2/firefox/data/popup/browsers/yandex-android.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-android.json rename to v2/firefox/data/popup/browsers/yandex-android.json diff --git a/extension/firefox/data/popup/browsers/yandex-fedora.json b/v2/firefox/data/popup/browsers/yandex-fedora.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-fedora.json rename to v2/firefox/data/popup/browsers/yandex-fedora.json diff --git a/extension/firefox/data/popup/browsers/yandex-ios.json b/v2/firefox/data/popup/browsers/yandex-ios.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-ios.json rename to v2/firefox/data/popup/browsers/yandex-ios.json diff --git a/extension/firefox/data/popup/browsers/yandex-linux.json b/v2/firefox/data/popup/browsers/yandex-linux.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-linux.json rename to v2/firefox/data/popup/browsers/yandex-linux.json diff --git a/extension/firefox/data/popup/browsers/yandex-mac os.json b/v2/firefox/data/popup/browsers/yandex-mac os.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-mac os.json rename to v2/firefox/data/popup/browsers/yandex-mac os.json diff --git a/extension/firefox/data/popup/browsers/yandex-windows.json b/v2/firefox/data/popup/browsers/yandex-windows.json similarity index 100% rename from extension/firefox/data/popup/browsers/yandex-windows.json rename to v2/firefox/data/popup/browsers/yandex-windows.json diff --git a/extension/firefox/data/popup/index.css b/v2/firefox/data/popup/index.css similarity index 100% rename from extension/firefox/data/popup/index.css rename to v2/firefox/data/popup/index.css diff --git a/extension/firefox/data/popup/index.html b/v2/firefox/data/popup/index.html similarity index 100% rename from extension/firefox/data/popup/index.html rename to v2/firefox/data/popup/index.html diff --git a/extension/firefox/data/popup/index.js b/v2/firefox/data/popup/index.js similarity index 100% rename from extension/firefox/data/popup/index.js rename to v2/firefox/data/popup/index.js diff --git a/extension/firefox/data/popup/list-black.svg b/v2/firefox/data/popup/list-black.svg similarity index 100% rename from extension/firefox/data/popup/list-black.svg rename to v2/firefox/data/popup/list-black.svg diff --git a/extension/firefox/data/popup/list-white.svg b/v2/firefox/data/popup/list-white.svg similarity index 100% rename from extension/firefox/data/popup/list-white.svg rename to v2/firefox/data/popup/list-white.svg diff --git a/extension/firefox/data/popup/loading.gif b/v2/firefox/data/popup/loading.gif similarity index 100% rename from extension/firefox/data/popup/loading.gif rename to v2/firefox/data/popup/loading.gif diff --git a/extension/firefox/data/popup/map.json b/v2/firefox/data/popup/map.json similarity index 100% rename from extension/firefox/data/popup/map.json rename to v2/firefox/data/popup/map.json diff --git a/extension/firefox/data/popup/matched.js b/v2/firefox/data/popup/matched.js similarity index 100% rename from extension/firefox/data/popup/matched.js rename to v2/firefox/data/popup/matched.js diff --git a/extension/firefox/data/popup/matched.json b/v2/firefox/data/popup/matched.json similarity index 100% rename from extension/firefox/data/popup/matched.json rename to v2/firefox/data/popup/matched.json diff --git a/extension/firefox/manifest.json b/v2/firefox/manifest.json similarity index 100% rename from extension/firefox/manifest.json rename to v2/firefox/manifest.json diff --git a/extension/firefox/schema.json b/v2/firefox/schema.json similarity index 100% rename from extension/firefox/schema.json rename to v2/firefox/schema.json diff --git a/extension/firefox/ua-parser.min.js b/v2/firefox/ua-parser.min.js similarity index 100% rename from extension/firefox/ua-parser.min.js rename to v2/firefox/ua-parser.min.js