diff --git a/testing/wavpack/build b/extra/wavpack/build
similarity index 100%
rename from testing/wavpack/build
rename to extra/wavpack/build
diff --git a/testing/wavpack/checksums b/extra/wavpack/checksums
similarity index 100%
rename from testing/wavpack/checksums
rename to extra/wavpack/checksums
diff --git a/testing/wavpack/patches/CVE-2018-10536.patch b/extra/wavpack/patches/CVE-2018-10536.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-10536.patch
rename to extra/wavpack/patches/CVE-2018-10536.patch
diff --git a/testing/wavpack/patches/CVE-2018-10538.patch b/extra/wavpack/patches/CVE-2018-10538.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-10538.patch
rename to extra/wavpack/patches/CVE-2018-10538.patch
diff --git a/testing/wavpack/patches/CVE-2018-19840.patch b/extra/wavpack/patches/CVE-2018-19840.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-19840.patch
rename to extra/wavpack/patches/CVE-2018-19840.patch
diff --git a/testing/wavpack/patches/CVE-2018-19841.patch b/extra/wavpack/patches/CVE-2018-19841.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-19841.patch
rename to extra/wavpack/patches/CVE-2018-19841.patch
diff --git a/testing/wavpack/patches/CVE-2018-6767.patch b/extra/wavpack/patches/CVE-2018-6767.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-6767.patch
rename to extra/wavpack/patches/CVE-2018-6767.patch
diff --git a/testing/wavpack/patches/CVE-2018-7253.patch b/extra/wavpack/patches/CVE-2018-7253.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-7253.patch
rename to extra/wavpack/patches/CVE-2018-7253.patch
diff --git a/testing/wavpack/patches/CVE-2018-7254.patch b/extra/wavpack/patches/CVE-2018-7254.patch
similarity index 100%
rename from testing/wavpack/patches/CVE-2018-7254.patch
rename to extra/wavpack/patches/CVE-2018-7254.patch
diff --git a/testing/wavpack/sources b/extra/wavpack/sources
similarity index 100%
rename from testing/wavpack/sources
rename to extra/wavpack/sources
diff --git a/testing/wavpack/version b/extra/wavpack/version
similarity index 100%
rename from testing/wavpack/version
rename to extra/wavpack/version
diff --git a/testing/x264/build b/extra/x264/build
similarity index 100%
rename from testing/x264/build
rename to extra/x264/build
diff --git a/testing/x264/checksums b/extra/x264/checksums
similarity index 100%
rename from testing/x264/checksums
rename to extra/x264/checksums
diff --git a/testing/x264/depends b/extra/x264/depends
similarity index 100%
rename from testing/x264/depends
rename to extra/x264/depends
diff --git a/testing/x264/sources b/extra/x264/sources
similarity index 100%
rename from testing/x264/sources
rename to extra/x264/sources
diff --git a/testing/x264/version b/extra/x264/version
similarity index 100%
rename from testing/x264/version
rename to extra/x264/version
diff --git a/testing/x265/build b/extra/x265/build
similarity index 100%
rename from testing/x265/build
rename to extra/x265/build
diff --git a/testing/x265/checksums b/extra/x265/checksums
similarity index 100%
rename from testing/x265/checksums
rename to extra/x265/checksums
diff --git a/testing/x265/depends b/extra/x265/depends
similarity index 100%
rename from testing/x265/depends
rename to extra/x265/depends
diff --git a/testing/x265/sources b/extra/x265/sources
similarity index 100%
rename from testing/x265/sources
rename to extra/x265/sources
diff --git a/testing/x265/version b/extra/x265/version
similarity index 100%
rename from testing/x265/version
rename to extra/x265/version
diff --git a/testing/xvidcore/build b/extra/xvidcore/build
similarity index 100%
rename from testing/xvidcore/build
rename to extra/xvidcore/build
diff --git a/testing/xvidcore/checksums b/extra/xvidcore/checksums
similarity index 100%
rename from testing/xvidcore/checksums
rename to extra/xvidcore/checksums
diff --git a/testing/xvidcore/depends b/extra/xvidcore/depends
similarity index 100%
rename from testing/xvidcore/depends
rename to extra/xvidcore/depends
diff --git a/testing/xvidcore/sources b/extra/xvidcore/sources
similarity index 100%
rename from testing/xvidcore/sources
rename to extra/xvidcore/sources
diff --git a/testing/xvidcore/version b/extra/xvidcore/version
similarity index 100%
rename from testing/xvidcore/version
rename to extra/xvidcore/version