diff --git a/.gitignore b/subprojects/gst-libav/.gitignore
similarity index 100%
rename from .gitignore
rename to subprojects/gst-libav/.gitignore
diff --git a/.gitlab-ci.yml b/subprojects/gst-libav/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to subprojects/gst-libav/.gitlab-ci.yml
diff --git a/AUTHORS b/subprojects/gst-libav/AUTHORS
similarity index 100%
rename from AUTHORS
rename to subprojects/gst-libav/AUTHORS
diff --git a/COPYING b/subprojects/gst-libav/COPYING
similarity index 100%
rename from COPYING
rename to subprojects/gst-libav/COPYING
diff --git a/ChangeLog b/subprojects/gst-libav/ChangeLog
similarity index 100%
rename from ChangeLog
rename to subprojects/gst-libav/ChangeLog
diff --git a/NEWS b/subprojects/gst-libav/NEWS
similarity index 100%
rename from NEWS
rename to subprojects/gst-libav/NEWS
diff --git a/README.md b/subprojects/gst-libav/README.md
similarity index 100%
rename from README.md
rename to subprojects/gst-libav/README.md
diff --git a/RELEASE b/subprojects/gst-libav/RELEASE
similarity index 100%
rename from RELEASE
rename to subprojects/gst-libav/RELEASE
diff --git a/docs/gst_plugins_cache.json b/subprojects/gst-libav/docs/gst_plugins_cache.json
similarity index 100%
rename from docs/gst_plugins_cache.json
rename to subprojects/gst-libav/docs/gst_plugins_cache.json
diff --git a/docs/index.md b/subprojects/gst-libav/docs/index.md
similarity index 100%
rename from docs/index.md
rename to subprojects/gst-libav/docs/index.md
diff --git a/docs/meson.build b/subprojects/gst-libav/docs/meson.build
similarity index 100%
rename from docs/meson.build
rename to subprojects/gst-libav/docs/meson.build
diff --git a/docs/sitemap.txt b/subprojects/gst-libav/docs/sitemap.txt
similarity index 100%
rename from docs/sitemap.txt
rename to subprojects/gst-libav/docs/sitemap.txt
diff --git a/ext/libav/gstav.c b/subprojects/gst-libav/ext/libav/gstav.c
similarity index 100%
rename from ext/libav/gstav.c
rename to subprojects/gst-libav/ext/libav/gstav.c
diff --git a/ext/libav/gstav.h b/subprojects/gst-libav/ext/libav/gstav.h
similarity index 100%
rename from ext/libav/gstav.h
rename to subprojects/gst-libav/ext/libav/gstav.h
diff --git a/ext/libav/gstavauddec.c b/subprojects/gst-libav/ext/libav/gstavauddec.c
similarity index 100%
rename from ext/libav/gstavauddec.c
rename to subprojects/gst-libav/ext/libav/gstavauddec.c
diff --git a/ext/libav/gstavauddec.h b/subprojects/gst-libav/ext/libav/gstavauddec.h
similarity index 100%
rename from ext/libav/gstavauddec.h
rename to subprojects/gst-libav/ext/libav/gstavauddec.h
diff --git a/ext/libav/gstavaudenc.c b/subprojects/gst-libav/ext/libav/gstavaudenc.c
similarity index 100%
rename from ext/libav/gstavaudenc.c
rename to subprojects/gst-libav/ext/libav/gstavaudenc.c
diff --git a/ext/libav/gstavaudenc.h b/subprojects/gst-libav/ext/libav/gstavaudenc.h
similarity index 100%
rename from ext/libav/gstavaudenc.h
rename to subprojects/gst-libav/ext/libav/gstavaudenc.h
diff --git a/ext/libav/gstavcfg.c b/subprojects/gst-libav/ext/libav/gstavcfg.c
similarity index 100%
rename from ext/libav/gstavcfg.c
rename to subprojects/gst-libav/ext/libav/gstavcfg.c
diff --git a/ext/libav/gstavcfg.h b/subprojects/gst-libav/ext/libav/gstavcfg.h
similarity index 100%
rename from ext/libav/gstavcfg.h
rename to subprojects/gst-libav/ext/libav/gstavcfg.h
diff --git a/ext/libav/gstavcodecmap.c b/subprojects/gst-libav/ext/libav/gstavcodecmap.c
similarity index 100%
rename from ext/libav/gstavcodecmap.c
rename to subprojects/gst-libav/ext/libav/gstavcodecmap.c
diff --git a/ext/libav/gstavcodecmap.h b/subprojects/gst-libav/ext/libav/gstavcodecmap.h
similarity index 100%
rename from ext/libav/gstavcodecmap.h
rename to subprojects/gst-libav/ext/libav/gstavcodecmap.h
diff --git a/ext/libav/gstavdeinterlace.c b/subprojects/gst-libav/ext/libav/gstavdeinterlace.c
similarity index 100%
rename from ext/libav/gstavdeinterlace.c
rename to subprojects/gst-libav/ext/libav/gstavdeinterlace.c
diff --git a/ext/libav/gstavdemux.c b/subprojects/gst-libav/ext/libav/gstavdemux.c
similarity index 100%
rename from ext/libav/gstavdemux.c
rename to subprojects/gst-libav/ext/libav/gstavdemux.c
diff --git a/ext/libav/gstavmux.c b/subprojects/gst-libav/ext/libav/gstavmux.c
similarity index 100%
rename from ext/libav/gstavmux.c
rename to subprojects/gst-libav/ext/libav/gstavmux.c
diff --git a/ext/libav/gstavprotocol.c b/subprojects/gst-libav/ext/libav/gstavprotocol.c
similarity index 100%
rename from ext/libav/gstavprotocol.c
rename to subprojects/gst-libav/ext/libav/gstavprotocol.c
diff --git a/ext/libav/gstavprotocol.h b/subprojects/gst-libav/ext/libav/gstavprotocol.h
similarity index 100%
rename from ext/libav/gstavprotocol.h
rename to subprojects/gst-libav/ext/libav/gstavprotocol.h
diff --git a/ext/libav/gstavutils.c b/subprojects/gst-libav/ext/libav/gstavutils.c
similarity index 100%
rename from ext/libav/gstavutils.c
rename to subprojects/gst-libav/ext/libav/gstavutils.c
diff --git a/ext/libav/gstavutils.h b/subprojects/gst-libav/ext/libav/gstavutils.h
similarity index 100%
rename from ext/libav/gstavutils.h
rename to subprojects/gst-libav/ext/libav/gstavutils.h
diff --git a/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c
similarity index 100%
rename from ext/libav/gstavviddec.c
rename to subprojects/gst-libav/ext/libav/gstavviddec.c
diff --git a/ext/libav/gstavviddec.h b/subprojects/gst-libav/ext/libav/gstavviddec.h
similarity index 100%
rename from ext/libav/gstavviddec.h
rename to subprojects/gst-libav/ext/libav/gstavviddec.h
diff --git a/ext/libav/gstavvidenc.c b/subprojects/gst-libav/ext/libav/gstavvidenc.c
similarity index 100%
rename from ext/libav/gstavvidenc.c
rename to subprojects/gst-libav/ext/libav/gstavvidenc.c
diff --git a/ext/libav/gstavvidenc.h b/subprojects/gst-libav/ext/libav/gstavvidenc.h
similarity index 100%
rename from ext/libav/gstavvidenc.h
rename to subprojects/gst-libav/ext/libav/gstavvidenc.h
diff --git a/ext/libav/meson.build b/subprojects/gst-libav/ext/libav/meson.build
similarity index 100%
rename from ext/libav/meson.build
rename to subprojects/gst-libav/ext/libav/meson.build
diff --git a/gst-libav.doap b/subprojects/gst-libav/gst-libav.doap
similarity index 100%
rename from gst-libav.doap
rename to subprojects/gst-libav/gst-libav.doap
diff --git a/hooks/pre-commit.hook b/subprojects/gst-libav/hooks/pre-commit.hook
similarity index 100%
rename from hooks/pre-commit.hook
rename to subprojects/gst-libav/hooks/pre-commit.hook
diff --git a/meson.build b/subprojects/gst-libav/meson.build
similarity index 100%
rename from meson.build
rename to subprojects/gst-libav/meson.build
diff --git a/meson_options.txt b/subprojects/gst-libav/meson_options.txt
similarity index 100%
rename from meson_options.txt
rename to subprojects/gst-libav/meson_options.txt
diff --git a/scripts/extract-release-date-from-doap-file.py b/subprojects/gst-libav/scripts/extract-release-date-from-doap-file.py
similarity index 100%
rename from scripts/extract-release-date-from-doap-file.py
rename to subprojects/gst-libav/scripts/extract-release-date-from-doap-file.py
diff --git a/tests/check/elements/avaudenc.c b/subprojects/gst-libav/tests/check/elements/avaudenc.c
similarity index 100%
rename from tests/check/elements/avaudenc.c
rename to subprojects/gst-libav/tests/check/elements/avaudenc.c
diff --git a/tests/check/elements/avdec_adpcm.c b/subprojects/gst-libav/tests/check/elements/avdec_adpcm.c
similarity index 100%
rename from tests/check/elements/avdec_adpcm.c
rename to subprojects/gst-libav/tests/check/elements/avdec_adpcm.c
diff --git a/tests/check/elements/avdemux_ape.c b/subprojects/gst-libav/tests/check/elements/avdemux_ape.c
similarity index 100%
rename from tests/check/elements/avdemux_ape.c
rename to subprojects/gst-libav/tests/check/elements/avdemux_ape.c
diff --git a/tests/check/elements/avvidenc.c b/subprojects/gst-libav/tests/check/elements/avvidenc.c
similarity index 100%
rename from tests/check/elements/avvidenc.c
rename to subprojects/gst-libav/tests/check/elements/avvidenc.c
diff --git a/tests/check/generic/libavcodec-locking.c b/subprojects/gst-libav/tests/check/generic/libavcodec-locking.c
similarity index 100%
rename from tests/check/generic/libavcodec-locking.c
rename to subprojects/gst-libav/tests/check/generic/libavcodec-locking.c
diff --git a/tests/check/generic/plugin-test.c b/subprojects/gst-libav/tests/check/generic/plugin-test.c
similarity index 100%
rename from tests/check/generic/plugin-test.c
rename to subprojects/gst-libav/tests/check/generic/plugin-test.c
diff --git a/tests/check/gst-libav.supp b/subprojects/gst-libav/tests/check/gst-libav.supp
similarity index 100%
rename from tests/check/gst-libav.supp
rename to subprojects/gst-libav/tests/check/gst-libav.supp
diff --git a/tests/check/meson.build b/subprojects/gst-libav/tests/check/meson.build
similarity index 100%
rename from tests/check/meson.build
rename to subprojects/gst-libav/tests/check/meson.build
diff --git a/tests/files/586957.ape b/subprojects/gst-libav/tests/files/586957.ape
similarity index 100%
rename from tests/files/586957.ape
rename to subprojects/gst-libav/tests/files/586957.ape
diff --git a/tests/files/591809.wav b/subprojects/gst-libav/tests/files/591809.wav
similarity index 100%
rename from tests/files/591809.wav
rename to subprojects/gst-libav/tests/files/591809.wav
diff --git a/tests/meson.build b/subprojects/gst-libav/tests/meson.build
similarity index 100%
rename from tests/meson.build
rename to subprojects/gst-libav/tests/meson.build