diff --git a/extra/firefox-bin/build b/extra/firefox-bin/build
index 7afe6816..c7ca2829 100755
--- a/extra/firefox-bin/build
+++ b/extra/firefox-bin/build
@@ -13,8 +13,8 @@ printf 'Installing firefox-bin\n'
 # The tarball is hosted on GitHub which doesn't allow
 # for the file naming scheme the package manager uses
 # for its built tarballs (pkg#ver-rel.tar.gz).
-mv -f "firefox-bin.68.4.1esr-1.tar.gz?no-extract" \
-      "firefox#68.4.1esr-1.tar.gz"
+mv -f "firefox-bin.68.4.1esr-2.tar.gz.no-extract" \
+      "firefox#68.4.1esr-2.tar.gz"
 
 # Install the package as you would any other you have
 # built yourself. In reality, I could have just given
@@ -23,7 +23,7 @@ mv -f "firefox-bin.68.4.1esr-1.tar.gz?no-extract" \
 #
 # I'm nice though and want this to fit into the system
 # like any other package.
-KISS_FORCE=1 kiss i "$PWD/firefox#68.4.1esr-1.tar.gz"
+KISS_FORCE=1 kiss i "$PWD/firefox#68.4.1esr-2.tar.gz"
 
 cat <<EOF
 
diff --git a/extra/firefox-bin/sources b/extra/firefox-bin/sources
index 1786af4c..aa02ab41 100644
--- a/extra/firefox-bin/sources
+++ b/extra/firefox-bin/sources
@@ -1 +1 @@
-https://github.com/kisslinux/repo/releases/download/1.3.2/firefox-bin.68.4.1esr-1.tar.gz?no-extract
+https://github.com/kisslinux/repo/releases/download/1.3.2/firefox-bin.68.4.1esr-2.tar.gz.no-extract
diff --git a/testing/qt5-declarative/build b/extra/qt5-declarative/build
similarity index 100%
rename from testing/qt5-declarative/build
rename to extra/qt5-declarative/build
diff --git a/testing/qt5-declarative/checksums b/extra/qt5-declarative/checksums
similarity index 100%
rename from testing/qt5-declarative/checksums
rename to extra/qt5-declarative/checksums
diff --git a/testing/qt5-declarative/depends b/extra/qt5-declarative/depends
similarity index 100%
rename from testing/qt5-declarative/depends
rename to extra/qt5-declarative/depends
diff --git a/testing/qt5-declarative/sources b/extra/qt5-declarative/sources
similarity index 100%
rename from testing/qt5-declarative/sources
rename to extra/qt5-declarative/sources
diff --git a/testing/qt5-declarative/version b/extra/qt5-declarative/version
similarity index 100%
rename from testing/qt5-declarative/version
rename to extra/qt5-declarative/version
diff --git a/testing/qt5-svg/build b/extra/qt5-svg/build
similarity index 100%
rename from testing/qt5-svg/build
rename to extra/qt5-svg/build
diff --git a/testing/qt5-svg/checksums b/extra/qt5-svg/checksums
similarity index 100%
rename from testing/qt5-svg/checksums
rename to extra/qt5-svg/checksums
diff --git a/testing/qt5-svg/depends b/extra/qt5-svg/depends
similarity index 100%
rename from testing/qt5-svg/depends
rename to extra/qt5-svg/depends
diff --git a/testing/qt5-svg/sources b/extra/qt5-svg/sources
similarity index 100%
rename from testing/qt5-svg/sources
rename to extra/qt5-svg/sources
diff --git a/testing/qt5-svg/version b/extra/qt5-svg/version
similarity index 100%
rename from testing/qt5-svg/version
rename to extra/qt5-svg/version
diff --git a/testing/qt5-webchannel/build b/extra/qt5-webchannel/build
similarity index 100%
rename from testing/qt5-webchannel/build
rename to extra/qt5-webchannel/build
diff --git a/testing/qt5-webchannel/checksums b/extra/qt5-webchannel/checksums
similarity index 100%
rename from testing/qt5-webchannel/checksums
rename to extra/qt5-webchannel/checksums
diff --git a/testing/qt5-webchannel/depends b/extra/qt5-webchannel/depends
similarity index 100%
rename from testing/qt5-webchannel/depends
rename to extra/qt5-webchannel/depends
diff --git a/testing/qt5-webchannel/sources b/extra/qt5-webchannel/sources
similarity index 100%
rename from testing/qt5-webchannel/sources
rename to extra/qt5-webchannel/sources
diff --git a/testing/qt5-webchannel/version b/extra/qt5-webchannel/version
similarity index 100%
rename from testing/qt5-webchannel/version
rename to extra/qt5-webchannel/version
diff --git a/testing/qt5-webengine/build b/extra/qt5-webengine/build
similarity index 100%
rename from testing/qt5-webengine/build
rename to extra/qt5-webengine/build
diff --git a/testing/qt5-webengine/checksums b/extra/qt5-webengine/checksums
similarity index 100%
rename from testing/qt5-webengine/checksums
rename to extra/qt5-webengine/checksums
diff --git a/testing/qt5-webengine/depends b/extra/qt5-webengine/depends
similarity index 100%
rename from testing/qt5-webengine/depends
rename to extra/qt5-webengine/depends
diff --git a/testing/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/extra/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
rename to extra/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
diff --git a/testing/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/extra/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch
rename to extra/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch
diff --git a/testing/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/extra/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
rename to extra/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
diff --git a/testing/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/extra/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
rename to extra/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
diff --git a/testing/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch b/extra/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
rename to extra/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
diff --git a/testing/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/extra/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
rename to extra/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
diff --git a/testing/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/extra/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch
rename to extra/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch
diff --git a/testing/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/extra/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
rename to extra/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
diff --git a/testing/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/extra/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
rename to extra/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
diff --git a/testing/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/extra/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
rename to extra/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
diff --git a/testing/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/extra/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
rename to extra/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
diff --git a/testing/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/extra/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
rename to extra/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
diff --git a/testing/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/extra/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
rename to extra/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff --git a/testing/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/extra/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
rename to extra/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
diff --git a/testing/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch b/extra/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch
rename to extra/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch
diff --git a/testing/qt5-webengine/patches/0030-chromium-musl-execinfo.patch b/extra/qt5-webengine/patches/0030-chromium-musl-execinfo.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0030-chromium-musl-execinfo.patch
rename to extra/qt5-webengine/patches/0030-chromium-musl-execinfo.patch
diff --git a/testing/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch b/extra/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch
rename to extra/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch
diff --git a/testing/qt5-webengine/patches/0032-chromium-musl-sandbox.patch b/extra/qt5-webengine/patches/0032-chromium-musl-sandbox.patch
similarity index 100%
rename from testing/qt5-webengine/patches/0032-chromium-musl-sandbox.patch
rename to extra/qt5-webengine/patches/0032-chromium-musl-sandbox.patch
diff --git a/testing/qt5-webengine/sources b/extra/qt5-webengine/sources
similarity index 100%
rename from testing/qt5-webengine/sources
rename to extra/qt5-webengine/sources
diff --git a/testing/qt5-webengine/version b/extra/qt5-webengine/version
similarity index 100%
rename from testing/qt5-webengine/version
rename to extra/qt5-webengine/version
diff --git a/testing/qt5-x11extras/build b/extra/qt5-x11extras/build
similarity index 100%
rename from testing/qt5-x11extras/build
rename to extra/qt5-x11extras/build
diff --git a/testing/qt5-x11extras/checksums b/extra/qt5-x11extras/checksums
similarity index 100%
rename from testing/qt5-x11extras/checksums
rename to extra/qt5-x11extras/checksums
diff --git a/testing/qt5-x11extras/depends b/extra/qt5-x11extras/depends
similarity index 100%
rename from testing/qt5-x11extras/depends
rename to extra/qt5-x11extras/depends
diff --git a/testing/qt5-x11extras/sources b/extra/qt5-x11extras/sources
similarity index 100%
rename from testing/qt5-x11extras/sources
rename to extra/qt5-x11extras/sources
diff --git a/testing/qt5-x11extras/version b/extra/qt5-x11extras/version
similarity index 100%
rename from testing/qt5-x11extras/version
rename to extra/qt5-x11extras/version