diff --git a/.gitignore b/subprojects/gst-omx/.gitignore
similarity index 100%
rename from .gitignore
rename to subprojects/gst-omx/.gitignore
diff --git a/.gitlab-ci.yml b/subprojects/gst-omx/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to subprojects/gst-omx/.gitlab-ci.yml
diff --git a/AUTHORS b/subprojects/gst-omx/AUTHORS
similarity index 100%
rename from AUTHORS
rename to subprojects/gst-omx/AUTHORS
diff --git a/COPYING b/subprojects/gst-omx/COPYING
similarity index 100%
rename from COPYING
rename to subprojects/gst-omx/COPYING
diff --git a/ChangeLog b/subprojects/gst-omx/ChangeLog
similarity index 100%
rename from ChangeLog
rename to subprojects/gst-omx/ChangeLog
diff --git a/NEWS b/subprojects/gst-omx/NEWS
similarity index 100%
rename from NEWS
rename to subprojects/gst-omx/NEWS
diff --git a/README b/subprojects/gst-omx/README
similarity index 100%
rename from README
rename to subprojects/gst-omx/README
diff --git a/RELEASE b/subprojects/gst-omx/RELEASE
similarity index 100%
rename from RELEASE
rename to subprojects/gst-omx/RELEASE
diff --git a/config/bellagio/gstomx.conf b/subprojects/gst-omx/config/bellagio/gstomx.conf
similarity index 100%
rename from config/bellagio/gstomx.conf
rename to subprojects/gst-omx/config/bellagio/gstomx.conf
diff --git a/config/bellagio/meson.build b/subprojects/gst-omx/config/bellagio/meson.build
similarity index 100%
rename from config/bellagio/meson.build
rename to subprojects/gst-omx/config/bellagio/meson.build
diff --git a/config/meson.build b/subprojects/gst-omx/config/meson.build
similarity index 100%
rename from config/meson.build
rename to subprojects/gst-omx/config/meson.build
diff --git a/config/rpi/gstomx.conf b/subprojects/gst-omx/config/rpi/gstomx.conf
similarity index 100%
rename from config/rpi/gstomx.conf
rename to subprojects/gst-omx/config/rpi/gstomx.conf
diff --git a/config/rpi/meson.build b/subprojects/gst-omx/config/rpi/meson.build
similarity index 100%
rename from config/rpi/meson.build
rename to subprojects/gst-omx/config/rpi/meson.build
diff --git a/config/tizonia/gstomx.conf.in b/subprojects/gst-omx/config/tizonia/gstomx.conf.in
similarity index 100%
rename from config/tizonia/gstomx.conf.in
rename to subprojects/gst-omx/config/tizonia/gstomx.conf.in
diff --git a/config/tizonia/meson.build b/subprojects/gst-omx/config/tizonia/meson.build
similarity index 100%
rename from config/tizonia/meson.build
rename to subprojects/gst-omx/config/tizonia/meson.build
diff --git a/config/zynqultrascaleplus/gstomx.conf b/subprojects/gst-omx/config/zynqultrascaleplus/gstomx.conf
similarity index 100%
rename from config/zynqultrascaleplus/gstomx.conf
rename to subprojects/gst-omx/config/zynqultrascaleplus/gstomx.conf
diff --git a/config/zynqultrascaleplus/meson.build b/subprojects/gst-omx/config/zynqultrascaleplus/meson.build
similarity index 100%
rename from config/zynqultrascaleplus/meson.build
rename to subprojects/gst-omx/config/zynqultrascaleplus/meson.build
diff --git a/docs/gst_plugins_cache.json b/subprojects/gst-omx/docs/gst_plugins_cache.json
similarity index 100%
rename from docs/gst_plugins_cache.json
rename to subprojects/gst-omx/docs/gst_plugins_cache.json
diff --git a/docs/index.md b/subprojects/gst-omx/docs/index.md
similarity index 100%
rename from docs/index.md
rename to subprojects/gst-omx/docs/index.md
diff --git a/docs/meson.build b/subprojects/gst-omx/docs/meson.build
similarity index 100%
rename from docs/meson.build
rename to subprojects/gst-omx/docs/meson.build
diff --git a/docs/sitemap.txt b/subprojects/gst-omx/docs/sitemap.txt
similarity index 100%
rename from docs/sitemap.txt
rename to subprojects/gst-omx/docs/sitemap.txt
diff --git a/examples/egl/cube_texture_and_coords.h b/subprojects/gst-omx/examples/egl/cube_texture_and_coords.h
similarity index 100%
rename from examples/egl/cube_texture_and_coords.h
rename to subprojects/gst-omx/examples/egl/cube_texture_and_coords.h
diff --git a/examples/egl/meson.build b/subprojects/gst-omx/examples/egl/meson.build
similarity index 100%
rename from examples/egl/meson.build
rename to subprojects/gst-omx/examples/egl/meson.build
diff --git a/examples/egl/testegl.c b/subprojects/gst-omx/examples/egl/testegl.c
similarity index 100%
rename from examples/egl/testegl.c
rename to subprojects/gst-omx/examples/egl/testegl.c
diff --git a/examples/meson.build b/subprojects/gst-omx/examples/meson.build
similarity index 100%
rename from examples/meson.build
rename to subprojects/gst-omx/examples/meson.build
diff --git a/gst-omx.doap b/subprojects/gst-omx/gst-omx.doap
similarity index 100%
rename from gst-omx.doap
rename to subprojects/gst-omx/gst-omx.doap
diff --git a/hooks/pre-commit.hook b/subprojects/gst-omx/hooks/pre-commit.hook
similarity index 100%
rename from hooks/pre-commit.hook
rename to subprojects/gst-omx/hooks/pre-commit.hook
diff --git a/meson.build b/subprojects/gst-omx/meson.build
similarity index 100%
rename from meson.build
rename to subprojects/gst-omx/meson.build
diff --git a/meson_options.txt b/subprojects/gst-omx/meson_options.txt
similarity index 100%
rename from meson_options.txt
rename to subprojects/gst-omx/meson_options.txt
diff --git a/omx/gstomx.c b/subprojects/gst-omx/omx/gstomx.c
similarity index 100%
rename from omx/gstomx.c
rename to subprojects/gst-omx/omx/gstomx.c
diff --git a/omx/gstomx.h b/subprojects/gst-omx/omx/gstomx.h
similarity index 100%
rename from omx/gstomx.h
rename to subprojects/gst-omx/omx/gstomx.h
diff --git a/omx/gstomxaacdec.c b/subprojects/gst-omx/omx/gstomxaacdec.c
similarity index 100%
rename from omx/gstomxaacdec.c
rename to subprojects/gst-omx/omx/gstomxaacdec.c
diff --git a/omx/gstomxaacdec.h b/subprojects/gst-omx/omx/gstomxaacdec.h
similarity index 100%
rename from omx/gstomxaacdec.h
rename to subprojects/gst-omx/omx/gstomxaacdec.h
diff --git a/omx/gstomxaacenc.c b/subprojects/gst-omx/omx/gstomxaacenc.c
similarity index 100%
rename from omx/gstomxaacenc.c
rename to subprojects/gst-omx/omx/gstomxaacenc.c
diff --git a/omx/gstomxaacenc.h b/subprojects/gst-omx/omx/gstomxaacenc.h
similarity index 100%
rename from omx/gstomxaacenc.h
rename to subprojects/gst-omx/omx/gstomxaacenc.h
diff --git a/omx/gstomxallocator.c b/subprojects/gst-omx/omx/gstomxallocator.c
similarity index 100%
rename from omx/gstomxallocator.c
rename to subprojects/gst-omx/omx/gstomxallocator.c
diff --git a/omx/gstomxallocator.h b/subprojects/gst-omx/omx/gstomxallocator.h
similarity index 100%
rename from omx/gstomxallocator.h
rename to subprojects/gst-omx/omx/gstomxallocator.h
diff --git a/omx/gstomxamrdec.c b/subprojects/gst-omx/omx/gstomxamrdec.c
similarity index 100%
rename from omx/gstomxamrdec.c
rename to subprojects/gst-omx/omx/gstomxamrdec.c
diff --git a/omx/gstomxamrdec.h b/subprojects/gst-omx/omx/gstomxamrdec.h
similarity index 100%
rename from omx/gstomxamrdec.h
rename to subprojects/gst-omx/omx/gstomxamrdec.h
diff --git a/omx/gstomxanalogaudiosink.c b/subprojects/gst-omx/omx/gstomxanalogaudiosink.c
similarity index 100%
rename from omx/gstomxanalogaudiosink.c
rename to subprojects/gst-omx/omx/gstomxanalogaudiosink.c
diff --git a/omx/gstomxanalogaudiosink.h b/subprojects/gst-omx/omx/gstomxanalogaudiosink.h
similarity index 100%
rename from omx/gstomxanalogaudiosink.h
rename to subprojects/gst-omx/omx/gstomxanalogaudiosink.h
diff --git a/omx/gstomxaudiodec.c b/subprojects/gst-omx/omx/gstomxaudiodec.c
similarity index 100%
rename from omx/gstomxaudiodec.c
rename to subprojects/gst-omx/omx/gstomxaudiodec.c
diff --git a/omx/gstomxaudiodec.h b/subprojects/gst-omx/omx/gstomxaudiodec.h
similarity index 100%
rename from omx/gstomxaudiodec.h
rename to subprojects/gst-omx/omx/gstomxaudiodec.h
diff --git a/omx/gstomxaudioenc.c b/subprojects/gst-omx/omx/gstomxaudioenc.c
similarity index 100%
rename from omx/gstomxaudioenc.c
rename to subprojects/gst-omx/omx/gstomxaudioenc.c
diff --git a/omx/gstomxaudioenc.h b/subprojects/gst-omx/omx/gstomxaudioenc.h
similarity index 100%
rename from omx/gstomxaudioenc.h
rename to subprojects/gst-omx/omx/gstomxaudioenc.h
diff --git a/omx/gstomxaudiosink.c b/subprojects/gst-omx/omx/gstomxaudiosink.c
similarity index 100%
rename from omx/gstomxaudiosink.c
rename to subprojects/gst-omx/omx/gstomxaudiosink.c
diff --git a/omx/gstomxaudiosink.h b/subprojects/gst-omx/omx/gstomxaudiosink.h
similarity index 100%
rename from omx/gstomxaudiosink.h
rename to subprojects/gst-omx/omx/gstomxaudiosink.h
diff --git a/omx/gstomxbufferpool.c b/subprojects/gst-omx/omx/gstomxbufferpool.c
similarity index 100%
rename from omx/gstomxbufferpool.c
rename to subprojects/gst-omx/omx/gstomxbufferpool.c
diff --git a/omx/gstomxbufferpool.h b/subprojects/gst-omx/omx/gstomxbufferpool.h
similarity index 100%
rename from omx/gstomxbufferpool.h
rename to subprojects/gst-omx/omx/gstomxbufferpool.h
diff --git a/omx/gstomxh263dec.c b/subprojects/gst-omx/omx/gstomxh263dec.c
similarity index 100%
rename from omx/gstomxh263dec.c
rename to subprojects/gst-omx/omx/gstomxh263dec.c
diff --git a/omx/gstomxh263dec.h b/subprojects/gst-omx/omx/gstomxh263dec.h
similarity index 100%
rename from omx/gstomxh263dec.h
rename to subprojects/gst-omx/omx/gstomxh263dec.h
diff --git a/omx/gstomxh263enc.c b/subprojects/gst-omx/omx/gstomxh263enc.c
similarity index 100%
rename from omx/gstomxh263enc.c
rename to subprojects/gst-omx/omx/gstomxh263enc.c
diff --git a/omx/gstomxh263enc.h b/subprojects/gst-omx/omx/gstomxh263enc.h
similarity index 100%
rename from omx/gstomxh263enc.h
rename to subprojects/gst-omx/omx/gstomxh263enc.h
diff --git a/omx/gstomxh264dec.c b/subprojects/gst-omx/omx/gstomxh264dec.c
similarity index 100%
rename from omx/gstomxh264dec.c
rename to subprojects/gst-omx/omx/gstomxh264dec.c
diff --git a/omx/gstomxh264dec.h b/subprojects/gst-omx/omx/gstomxh264dec.h
similarity index 100%
rename from omx/gstomxh264dec.h
rename to subprojects/gst-omx/omx/gstomxh264dec.h
diff --git a/omx/gstomxh264enc.c b/subprojects/gst-omx/omx/gstomxh264enc.c
similarity index 100%
rename from omx/gstomxh264enc.c
rename to subprojects/gst-omx/omx/gstomxh264enc.c
diff --git a/omx/gstomxh264enc.h b/subprojects/gst-omx/omx/gstomxh264enc.h
similarity index 100%
rename from omx/gstomxh264enc.h
rename to subprojects/gst-omx/omx/gstomxh264enc.h
diff --git a/omx/gstomxh264utils.c b/subprojects/gst-omx/omx/gstomxh264utils.c
similarity index 100%
rename from omx/gstomxh264utils.c
rename to subprojects/gst-omx/omx/gstomxh264utils.c
diff --git a/omx/gstomxh264utils.h b/subprojects/gst-omx/omx/gstomxh264utils.h
similarity index 100%
rename from omx/gstomxh264utils.h
rename to subprojects/gst-omx/omx/gstomxh264utils.h
diff --git a/omx/gstomxh265dec.c b/subprojects/gst-omx/omx/gstomxh265dec.c
similarity index 100%
rename from omx/gstomxh265dec.c
rename to subprojects/gst-omx/omx/gstomxh265dec.c
diff --git a/omx/gstomxh265dec.h b/subprojects/gst-omx/omx/gstomxh265dec.h
similarity index 100%
rename from omx/gstomxh265dec.h
rename to subprojects/gst-omx/omx/gstomxh265dec.h
diff --git a/omx/gstomxh265enc.c b/subprojects/gst-omx/omx/gstomxh265enc.c
similarity index 100%
rename from omx/gstomxh265enc.c
rename to subprojects/gst-omx/omx/gstomxh265enc.c
diff --git a/omx/gstomxh265enc.h b/subprojects/gst-omx/omx/gstomxh265enc.h
similarity index 100%
rename from omx/gstomxh265enc.h
rename to subprojects/gst-omx/omx/gstomxh265enc.h
diff --git a/omx/gstomxh265utils.c b/subprojects/gst-omx/omx/gstomxh265utils.c
similarity index 100%
rename from omx/gstomxh265utils.c
rename to subprojects/gst-omx/omx/gstomxh265utils.c
diff --git a/omx/gstomxh265utils.h b/subprojects/gst-omx/omx/gstomxh265utils.h
similarity index 100%
rename from omx/gstomxh265utils.h
rename to subprojects/gst-omx/omx/gstomxh265utils.h
diff --git a/omx/gstomxhdmiaudiosink.c b/subprojects/gst-omx/omx/gstomxhdmiaudiosink.c
similarity index 100%
rename from omx/gstomxhdmiaudiosink.c
rename to subprojects/gst-omx/omx/gstomxhdmiaudiosink.c
diff --git a/omx/gstomxhdmiaudiosink.h b/subprojects/gst-omx/omx/gstomxhdmiaudiosink.h
similarity index 100%
rename from omx/gstomxhdmiaudiosink.h
rename to subprojects/gst-omx/omx/gstomxhdmiaudiosink.h
diff --git a/omx/gstomxmjpegdec.c b/subprojects/gst-omx/omx/gstomxmjpegdec.c
similarity index 100%
rename from omx/gstomxmjpegdec.c
rename to subprojects/gst-omx/omx/gstomxmjpegdec.c
diff --git a/omx/gstomxmjpegdec.h b/subprojects/gst-omx/omx/gstomxmjpegdec.h
similarity index 100%
rename from omx/gstomxmjpegdec.h
rename to subprojects/gst-omx/omx/gstomxmjpegdec.h
diff --git a/omx/gstomxmp3dec.c b/subprojects/gst-omx/omx/gstomxmp3dec.c
similarity index 100%
rename from omx/gstomxmp3dec.c
rename to subprojects/gst-omx/omx/gstomxmp3dec.c
diff --git a/omx/gstomxmp3dec.h b/subprojects/gst-omx/omx/gstomxmp3dec.h
similarity index 100%
rename from omx/gstomxmp3dec.h
rename to subprojects/gst-omx/omx/gstomxmp3dec.h
diff --git a/omx/gstomxmp3enc.c b/subprojects/gst-omx/omx/gstomxmp3enc.c
similarity index 100%
rename from omx/gstomxmp3enc.c
rename to subprojects/gst-omx/omx/gstomxmp3enc.c
diff --git a/omx/gstomxmp3enc.h b/subprojects/gst-omx/omx/gstomxmp3enc.h
similarity index 100%
rename from omx/gstomxmp3enc.h
rename to subprojects/gst-omx/omx/gstomxmp3enc.h
diff --git a/omx/gstomxmpeg2videodec.c b/subprojects/gst-omx/omx/gstomxmpeg2videodec.c
similarity index 100%
rename from omx/gstomxmpeg2videodec.c
rename to subprojects/gst-omx/omx/gstomxmpeg2videodec.c
diff --git a/omx/gstomxmpeg2videodec.h b/subprojects/gst-omx/omx/gstomxmpeg2videodec.h
similarity index 100%
rename from omx/gstomxmpeg2videodec.h
rename to subprojects/gst-omx/omx/gstomxmpeg2videodec.h
diff --git a/omx/gstomxmpeg4videodec.c b/subprojects/gst-omx/omx/gstomxmpeg4videodec.c
similarity index 100%
rename from omx/gstomxmpeg4videodec.c
rename to subprojects/gst-omx/omx/gstomxmpeg4videodec.c
diff --git a/omx/gstomxmpeg4videodec.h b/subprojects/gst-omx/omx/gstomxmpeg4videodec.h
similarity index 100%
rename from omx/gstomxmpeg4videodec.h
rename to subprojects/gst-omx/omx/gstomxmpeg4videodec.h
diff --git a/omx/gstomxmpeg4videoenc.c b/subprojects/gst-omx/omx/gstomxmpeg4videoenc.c
similarity index 100%
rename from omx/gstomxmpeg4videoenc.c
rename to subprojects/gst-omx/omx/gstomxmpeg4videoenc.c
diff --git a/omx/gstomxmpeg4videoenc.h b/subprojects/gst-omx/omx/gstomxmpeg4videoenc.h
similarity index 100%
rename from omx/gstomxmpeg4videoenc.h
rename to subprojects/gst-omx/omx/gstomxmpeg4videoenc.h
diff --git a/omx/gstomxtheoradec.c b/subprojects/gst-omx/omx/gstomxtheoradec.c
similarity index 100%
rename from omx/gstomxtheoradec.c
rename to subprojects/gst-omx/omx/gstomxtheoradec.c
diff --git a/omx/gstomxtheoradec.h b/subprojects/gst-omx/omx/gstomxtheoradec.h
similarity index 100%
rename from omx/gstomxtheoradec.h
rename to subprojects/gst-omx/omx/gstomxtheoradec.h
diff --git a/omx/gstomxvideo.c b/subprojects/gst-omx/omx/gstomxvideo.c
similarity index 100%
rename from omx/gstomxvideo.c
rename to subprojects/gst-omx/omx/gstomxvideo.c
diff --git a/omx/gstomxvideo.h b/subprojects/gst-omx/omx/gstomxvideo.h
similarity index 100%
rename from omx/gstomxvideo.h
rename to subprojects/gst-omx/omx/gstomxvideo.h
diff --git a/omx/gstomxvideodec.c b/subprojects/gst-omx/omx/gstomxvideodec.c
similarity index 100%
rename from omx/gstomxvideodec.c
rename to subprojects/gst-omx/omx/gstomxvideodec.c
diff --git a/omx/gstomxvideodec.h b/subprojects/gst-omx/omx/gstomxvideodec.h
similarity index 100%
rename from omx/gstomxvideodec.h
rename to subprojects/gst-omx/omx/gstomxvideodec.h
diff --git a/omx/gstomxvideoenc.c b/subprojects/gst-omx/omx/gstomxvideoenc.c
similarity index 100%
rename from omx/gstomxvideoenc.c
rename to subprojects/gst-omx/omx/gstomxvideoenc.c
diff --git a/omx/gstomxvideoenc.h b/subprojects/gst-omx/omx/gstomxvideoenc.h
similarity index 100%
rename from omx/gstomxvideoenc.h
rename to subprojects/gst-omx/omx/gstomxvideoenc.h
diff --git a/omx/gstomxvp8dec.c b/subprojects/gst-omx/omx/gstomxvp8dec.c
similarity index 100%
rename from omx/gstomxvp8dec.c
rename to subprojects/gst-omx/omx/gstomxvp8dec.c
diff --git a/omx/gstomxvp8dec.h b/subprojects/gst-omx/omx/gstomxvp8dec.h
similarity index 100%
rename from omx/gstomxvp8dec.h
rename to subprojects/gst-omx/omx/gstomxvp8dec.h
diff --git a/omx/gstomxwmvdec.c b/subprojects/gst-omx/omx/gstomxwmvdec.c
similarity index 100%
rename from omx/gstomxwmvdec.c
rename to subprojects/gst-omx/omx/gstomxwmvdec.c
diff --git a/omx/gstomxwmvdec.h b/subprojects/gst-omx/omx/gstomxwmvdec.h
similarity index 100%
rename from omx/gstomxwmvdec.h
rename to subprojects/gst-omx/omx/gstomxwmvdec.h
diff --git a/omx/meson.build b/subprojects/gst-omx/omx/meson.build
similarity index 100%
rename from omx/meson.build
rename to subprojects/gst-omx/omx/meson.build
diff --git a/omx/openmax/OMX_Audio.h b/subprojects/gst-omx/omx/openmax/OMX_Audio.h
similarity index 100%
rename from omx/openmax/OMX_Audio.h
rename to subprojects/gst-omx/omx/openmax/OMX_Audio.h
diff --git a/omx/openmax/OMX_Component.h b/subprojects/gst-omx/omx/openmax/OMX_Component.h
similarity index 100%
rename from omx/openmax/OMX_Component.h
rename to subprojects/gst-omx/omx/openmax/OMX_Component.h
diff --git a/omx/openmax/OMX_ComponentExt.h b/subprojects/gst-omx/omx/openmax/OMX_ComponentExt.h
similarity index 100%
rename from omx/openmax/OMX_ComponentExt.h
rename to subprojects/gst-omx/omx/openmax/OMX_ComponentExt.h
diff --git a/omx/openmax/OMX_ContentPipe.h b/subprojects/gst-omx/omx/openmax/OMX_ContentPipe.h
similarity index 100%
rename from omx/openmax/OMX_ContentPipe.h
rename to subprojects/gst-omx/omx/openmax/OMX_ContentPipe.h
diff --git a/omx/openmax/OMX_Core.h b/subprojects/gst-omx/omx/openmax/OMX_Core.h
similarity index 100%
rename from omx/openmax/OMX_Core.h
rename to subprojects/gst-omx/omx/openmax/OMX_Core.h
diff --git a/omx/openmax/OMX_CoreExt.h b/subprojects/gst-omx/omx/openmax/OMX_CoreExt.h
similarity index 100%
rename from omx/openmax/OMX_CoreExt.h
rename to subprojects/gst-omx/omx/openmax/OMX_CoreExt.h
diff --git a/omx/openmax/OMX_IVCommon.h b/subprojects/gst-omx/omx/openmax/OMX_IVCommon.h
similarity index 100%
rename from omx/openmax/OMX_IVCommon.h
rename to subprojects/gst-omx/omx/openmax/OMX_IVCommon.h
diff --git a/omx/openmax/OMX_Image.h b/subprojects/gst-omx/omx/openmax/OMX_Image.h
similarity index 100%
rename from omx/openmax/OMX_Image.h
rename to subprojects/gst-omx/omx/openmax/OMX_Image.h
diff --git a/omx/openmax/OMX_Index.h b/subprojects/gst-omx/omx/openmax/OMX_Index.h
similarity index 100%
rename from omx/openmax/OMX_Index.h
rename to subprojects/gst-omx/omx/openmax/OMX_Index.h
diff --git a/omx/openmax/OMX_IndexExt.h b/subprojects/gst-omx/omx/openmax/OMX_IndexExt.h
similarity index 100%
rename from omx/openmax/OMX_IndexExt.h
rename to subprojects/gst-omx/omx/openmax/OMX_IndexExt.h
diff --git a/omx/openmax/OMX_Other.h b/subprojects/gst-omx/omx/openmax/OMX_Other.h
similarity index 100%
rename from omx/openmax/OMX_Other.h
rename to subprojects/gst-omx/omx/openmax/OMX_Other.h
diff --git a/omx/openmax/OMX_Types.h b/subprojects/gst-omx/omx/openmax/OMX_Types.h
similarity index 100%
rename from omx/openmax/OMX_Types.h
rename to subprojects/gst-omx/omx/openmax/OMX_Types.h
diff --git a/omx/openmax/OMX_Video.h b/subprojects/gst-omx/omx/openmax/OMX_Video.h
similarity index 100%
rename from omx/openmax/OMX_Video.h
rename to subprojects/gst-omx/omx/openmax/OMX_Video.h
diff --git a/omx/openmax/OMX_VideoExt.h b/subprojects/gst-omx/omx/openmax/OMX_VideoExt.h
similarity index 100%
rename from omx/openmax/OMX_VideoExt.h
rename to subprojects/gst-omx/omx/openmax/OMX_VideoExt.h
diff --git a/scripts/extract-release-date-from-doap-file.py b/subprojects/gst-omx/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-omx/scripts/extract-release-date-from-doap-file.py
diff --git a/tests/check/generic/states.c b/subprojects/gst-omx/tests/check/generic/states.c
similarity index 100%
rename from tests/check/generic/states.c
rename to subprojects/gst-omx/tests/check/generic/states.c
diff --git a/tests/check/meson.build b/subprojects/gst-omx/tests/check/meson.build
similarity index 100%
rename from tests/check/meson.build
rename to subprojects/gst-omx/tests/check/meson.build
diff --git a/tests/meson.build b/subprojects/gst-omx/tests/meson.build
similarity index 100%
rename from tests/meson.build
rename to subprojects/gst-omx/tests/meson.build
diff --git a/tools/listcomponents.c b/subprojects/gst-omx/tools/listcomponents.c
similarity index 100%
rename from tools/listcomponents.c
rename to subprojects/gst-omx/tools/listcomponents.c
diff --git a/tools/meson.build b/subprojects/gst-omx/tools/meson.build
similarity index 100%
rename from tools/meson.build
rename to subprojects/gst-omx/tools/meson.build