diff --git a/.gitignore b/subprojects/gst-rtsp-server/.gitignore
similarity index 100%
rename from .gitignore
rename to subprojects/gst-rtsp-server/.gitignore
diff --git a/.gitlab-ci.yml b/subprojects/gst-rtsp-server/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to subprojects/gst-rtsp-server/.gitlab-ci.yml
diff --git a/AUTHORS b/subprojects/gst-rtsp-server/AUTHORS
similarity index 100%
rename from AUTHORS
rename to subprojects/gst-rtsp-server/AUTHORS
diff --git a/COPYING b/subprojects/gst-rtsp-server/COPYING
similarity index 100%
rename from COPYING
rename to subprojects/gst-rtsp-server/COPYING
diff --git a/COPYING.LIB b/subprojects/gst-rtsp-server/COPYING.LIB
similarity index 100%
rename from COPYING.LIB
rename to subprojects/gst-rtsp-server/COPYING.LIB
diff --git a/ChangeLog b/subprojects/gst-rtsp-server/ChangeLog
similarity index 100%
rename from ChangeLog
rename to subprojects/gst-rtsp-server/ChangeLog
diff --git a/NEWS b/subprojects/gst-rtsp-server/NEWS
similarity index 100%
rename from NEWS
rename to subprojects/gst-rtsp-server/NEWS
diff --git a/README b/subprojects/gst-rtsp-server/README
similarity index 100%
rename from README
rename to subprojects/gst-rtsp-server/README
diff --git a/RELEASE b/subprojects/gst-rtsp-server/RELEASE
similarity index 100%
rename from RELEASE
rename to subprojects/gst-rtsp-server/RELEASE
diff --git a/REQUIREMENTS b/subprojects/gst-rtsp-server/REQUIREMENTS
similarity index 100%
rename from REQUIREMENTS
rename to subprojects/gst-rtsp-server/REQUIREMENTS
diff --git a/TODO b/subprojects/gst-rtsp-server/TODO
similarity index 100%
rename from TODO
rename to subprojects/gst-rtsp-server/TODO
diff --git a/docs/README b/subprojects/gst-rtsp-server/docs/README
similarity index 100%
rename from docs/README
rename to subprojects/gst-rtsp-server/docs/README
diff --git a/docs/design/gst-rtp-server-design b/subprojects/gst-rtsp-server/docs/design/gst-rtp-server-design
similarity index 100%
rename from docs/design/gst-rtp-server-design
rename to subprojects/gst-rtsp-server/docs/design/gst-rtp-server-design
diff --git a/docs/gst_plugins_cache.json b/subprojects/gst-rtsp-server/docs/gst_plugins_cache.json
similarity index 100%
rename from docs/gst_plugins_cache.json
rename to subprojects/gst-rtsp-server/docs/gst_plugins_cache.json
diff --git a/docs/index.md b/subprojects/gst-rtsp-server/docs/index.md
similarity index 100%
rename from docs/index.md
rename to subprojects/gst-rtsp-server/docs/index.md
diff --git a/docs/meson.build b/subprojects/gst-rtsp-server/docs/meson.build
similarity index 100%
rename from docs/meson.build
rename to subprojects/gst-rtsp-server/docs/meson.build
diff --git a/docs/plugin-index.md b/subprojects/gst-rtsp-server/docs/plugin-index.md
similarity index 100%
rename from docs/plugin-index.md
rename to subprojects/gst-rtsp-server/docs/plugin-index.md
diff --git a/docs/plugin-sitemap.txt b/subprojects/gst-rtsp-server/docs/plugin-sitemap.txt
similarity index 100%
rename from docs/plugin-sitemap.txt
rename to subprojects/gst-rtsp-server/docs/plugin-sitemap.txt
diff --git a/docs/sitemap.md b/subprojects/gst-rtsp-server/docs/sitemap.md
similarity index 100%
rename from docs/sitemap.md
rename to subprojects/gst-rtsp-server/docs/sitemap.md
diff --git a/docs/sitemap.txt b/subprojects/gst-rtsp-server/docs/sitemap.txt
similarity index 100%
rename from docs/sitemap.txt
rename to subprojects/gst-rtsp-server/docs/sitemap.txt
diff --git a/examples/meson.build b/subprojects/gst-rtsp-server/examples/meson.build
similarity index 100%
rename from examples/meson.build
rename to subprojects/gst-rtsp-server/examples/meson.build
diff --git a/examples/test-appsrc.c b/subprojects/gst-rtsp-server/examples/test-appsrc.c
similarity index 100%
rename from examples/test-appsrc.c
rename to subprojects/gst-rtsp-server/examples/test-appsrc.c
diff --git a/examples/test-appsrc2.c b/subprojects/gst-rtsp-server/examples/test-appsrc2.c
similarity index 100%
rename from examples/test-appsrc2.c
rename to subprojects/gst-rtsp-server/examples/test-appsrc2.c
diff --git a/examples/test-auth-digest.c b/subprojects/gst-rtsp-server/examples/test-auth-digest.c
similarity index 100%
rename from examples/test-auth-digest.c
rename to subprojects/gst-rtsp-server/examples/test-auth-digest.c
diff --git a/examples/test-auth.c b/subprojects/gst-rtsp-server/examples/test-auth.c
similarity index 100%
rename from examples/test-auth.c
rename to subprojects/gst-rtsp-server/examples/test-auth.c
diff --git a/examples/test-cgroups.c b/subprojects/gst-rtsp-server/examples/test-cgroups.c
similarity index 100%
rename from examples/test-cgroups.c
rename to subprojects/gst-rtsp-server/examples/test-cgroups.c
diff --git a/examples/test-launch.c b/subprojects/gst-rtsp-server/examples/test-launch.c
similarity index 100%
rename from examples/test-launch.c
rename to subprojects/gst-rtsp-server/examples/test-launch.c
diff --git a/examples/test-mp4.c b/subprojects/gst-rtsp-server/examples/test-mp4.c
similarity index 100%
rename from examples/test-mp4.c
rename to subprojects/gst-rtsp-server/examples/test-mp4.c
diff --git a/examples/test-multicast.c b/subprojects/gst-rtsp-server/examples/test-multicast.c
similarity index 100%
rename from examples/test-multicast.c
rename to subprojects/gst-rtsp-server/examples/test-multicast.c
diff --git a/examples/test-multicast2.c b/subprojects/gst-rtsp-server/examples/test-multicast2.c
similarity index 100%
rename from examples/test-multicast2.c
rename to subprojects/gst-rtsp-server/examples/test-multicast2.c
diff --git a/examples/test-netclock-client.c b/subprojects/gst-rtsp-server/examples/test-netclock-client.c
similarity index 100%
rename from examples/test-netclock-client.c
rename to subprojects/gst-rtsp-server/examples/test-netclock-client.c
diff --git a/examples/test-netclock.c b/subprojects/gst-rtsp-server/examples/test-netclock.c
similarity index 100%
rename from examples/test-netclock.c
rename to subprojects/gst-rtsp-server/examples/test-netclock.c
diff --git a/examples/test-ogg.c b/subprojects/gst-rtsp-server/examples/test-ogg.c
similarity index 100%
rename from examples/test-ogg.c
rename to subprojects/gst-rtsp-server/examples/test-ogg.c
diff --git a/examples/test-onvif-backchannel.c b/subprojects/gst-rtsp-server/examples/test-onvif-backchannel.c
similarity index 100%
rename from examples/test-onvif-backchannel.c
rename to subprojects/gst-rtsp-server/examples/test-onvif-backchannel.c
diff --git a/examples/test-onvif-client.c b/subprojects/gst-rtsp-server/examples/test-onvif-client.c
similarity index 100%
rename from examples/test-onvif-client.c
rename to subprojects/gst-rtsp-server/examples/test-onvif-client.c
diff --git a/examples/test-onvif-server.c b/subprojects/gst-rtsp-server/examples/test-onvif-server.c
similarity index 100%
rename from examples/test-onvif-server.c
rename to subprojects/gst-rtsp-server/examples/test-onvif-server.c
diff --git a/examples/test-onvif-server.h b/subprojects/gst-rtsp-server/examples/test-onvif-server.h
similarity index 100%
rename from examples/test-onvif-server.h
rename to subprojects/gst-rtsp-server/examples/test-onvif-server.h
diff --git a/examples/test-readme.c b/subprojects/gst-rtsp-server/examples/test-readme.c
similarity index 100%
rename from examples/test-readme.c
rename to subprojects/gst-rtsp-server/examples/test-readme.c
diff --git a/examples/test-record-auth.c b/subprojects/gst-rtsp-server/examples/test-record-auth.c
similarity index 100%
rename from examples/test-record-auth.c
rename to subprojects/gst-rtsp-server/examples/test-record-auth.c
diff --git a/examples/test-record.c b/subprojects/gst-rtsp-server/examples/test-record.c
similarity index 100%
rename from examples/test-record.c
rename to subprojects/gst-rtsp-server/examples/test-record.c
diff --git a/examples/test-replay-server.c b/subprojects/gst-rtsp-server/examples/test-replay-server.c
similarity index 100%
rename from examples/test-replay-server.c
rename to subprojects/gst-rtsp-server/examples/test-replay-server.c
diff --git a/examples/test-replay-server.h b/subprojects/gst-rtsp-server/examples/test-replay-server.h
similarity index 100%
rename from examples/test-replay-server.h
rename to subprojects/gst-rtsp-server/examples/test-replay-server.h
diff --git a/examples/test-sdp.c b/subprojects/gst-rtsp-server/examples/test-sdp.c
similarity index 100%
rename from examples/test-sdp.c
rename to subprojects/gst-rtsp-server/examples/test-sdp.c
diff --git a/examples/test-uri.c b/subprojects/gst-rtsp-server/examples/test-uri.c
similarity index 100%
rename from examples/test-uri.c
rename to subprojects/gst-rtsp-server/examples/test-uri.c
diff --git a/examples/test-video-disconnect.c b/subprojects/gst-rtsp-server/examples/test-video-disconnect.c
similarity index 100%
rename from examples/test-video-disconnect.c
rename to subprojects/gst-rtsp-server/examples/test-video-disconnect.c
diff --git a/examples/test-video-rtx.c b/subprojects/gst-rtsp-server/examples/test-video-rtx.c
similarity index 100%
rename from examples/test-video-rtx.c
rename to subprojects/gst-rtsp-server/examples/test-video-rtx.c
diff --git a/examples/test-video.c b/subprojects/gst-rtsp-server/examples/test-video.c
similarity index 100%
rename from examples/test-video.c
rename to subprojects/gst-rtsp-server/examples/test-video.c
diff --git a/gst-rtsp-server.doap b/subprojects/gst-rtsp-server/gst-rtsp-server.doap
similarity index 100%
rename from gst-rtsp-server.doap
rename to subprojects/gst-rtsp-server/gst-rtsp-server.doap
diff --git a/gst/meson.build b/subprojects/gst-rtsp-server/gst/meson.build
similarity index 100%
rename from gst/meson.build
rename to subprojects/gst-rtsp-server/gst/meson.build
diff --git a/gst/rtsp-server/meson.build b/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
similarity index 100%
rename from gst/rtsp-server/meson.build
rename to subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
diff --git a/gst/rtsp-server/rtsp-address-pool.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-address-pool.c
similarity index 100%
rename from gst/rtsp-server/rtsp-address-pool.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-address-pool.c
diff --git a/gst/rtsp-server/rtsp-address-pool.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-address-pool.h
similarity index 100%
rename from gst/rtsp-server/rtsp-address-pool.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-address-pool.h
diff --git a/gst/rtsp-server/rtsp-auth.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-auth.c
similarity index 100%
rename from gst/rtsp-server/rtsp-auth.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-auth.c
diff --git a/gst/rtsp-server/rtsp-auth.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-auth.h
similarity index 100%
rename from gst/rtsp-server/rtsp-auth.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-auth.h
diff --git a/gst/rtsp-server/rtsp-client.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.c
similarity index 100%
rename from gst/rtsp-server/rtsp-client.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.c
diff --git a/gst/rtsp-server/rtsp-client.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.h
similarity index 100%
rename from gst/rtsp-server/rtsp-client.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.h
diff --git a/gst/rtsp-server/rtsp-context.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-context.c
similarity index 100%
rename from gst/rtsp-server/rtsp-context.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-context.c
diff --git a/gst/rtsp-server/rtsp-context.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-context.h
similarity index 100%
rename from gst/rtsp-server/rtsp-context.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-context.h
diff --git a/gst/rtsp-server/rtsp-latency-bin.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-latency-bin.c
similarity index 100%
rename from gst/rtsp-server/rtsp-latency-bin.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-latency-bin.c
diff --git a/gst/rtsp-server/rtsp-latency-bin.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-latency-bin.h
similarity index 100%
rename from gst/rtsp-server/rtsp-latency-bin.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-latency-bin.h
diff --git a/gst/rtsp-server/rtsp-media-factory-uri.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-uri.c
similarity index 100%
rename from gst/rtsp-server/rtsp-media-factory-uri.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-uri.c
diff --git a/gst/rtsp-server/rtsp-media-factory-uri.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-uri.h
similarity index 100%
rename from gst/rtsp-server/rtsp-media-factory-uri.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-uri.h
diff --git a/gst/rtsp-server/rtsp-media-factory.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory.c
similarity index 100%
rename from gst/rtsp-server/rtsp-media-factory.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory.c
diff --git a/gst/rtsp-server/rtsp-media-factory.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory.h
similarity index 100%
rename from gst/rtsp-server/rtsp-media-factory.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory.h
diff --git a/gst/rtsp-server/rtsp-media.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.c
similarity index 100%
rename from gst/rtsp-server/rtsp-media.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.c
diff --git a/gst/rtsp-server/rtsp-media.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.h
similarity index 100%
rename from gst/rtsp-server/rtsp-media.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.h
diff --git a/gst/rtsp-server/rtsp-mount-points.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-mount-points.c
similarity index 100%
rename from gst/rtsp-server/rtsp-mount-points.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-mount-points.c
diff --git a/gst/rtsp-server/rtsp-mount-points.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-mount-points.h
similarity index 100%
rename from gst/rtsp-server/rtsp-mount-points.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-mount-points.h
diff --git a/gst/rtsp-server/rtsp-onvif-client.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-client.c
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-client.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-client.c
diff --git a/gst/rtsp-server/rtsp-onvif-client.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-client.h
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-client.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-client.h
diff --git a/gst/rtsp-server/rtsp-onvif-media-factory.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media-factory.c
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-media-factory.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media-factory.c
diff --git a/gst/rtsp-server/rtsp-onvif-media-factory.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media-factory.h
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-media-factory.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media-factory.h
diff --git a/gst/rtsp-server/rtsp-onvif-media.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media.c
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-media.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media.c
diff --git a/gst/rtsp-server/rtsp-onvif-media.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media.h
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-media.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-media.h
diff --git a/gst/rtsp-server/rtsp-onvif-server.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-server.c
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-server.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-server.c
diff --git a/gst/rtsp-server/rtsp-onvif-server.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-server.h
similarity index 100%
rename from gst/rtsp-server/rtsp-onvif-server.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-onvif-server.h
diff --git a/gst/rtsp-server/rtsp-params.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-params.c
similarity index 100%
rename from gst/rtsp-server/rtsp-params.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-params.c
diff --git a/gst/rtsp-server/rtsp-params.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-params.h
similarity index 100%
rename from gst/rtsp-server/rtsp-params.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-params.h
diff --git a/gst/rtsp-server/rtsp-permissions.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-permissions.c
similarity index 100%
rename from gst/rtsp-server/rtsp-permissions.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-permissions.c
diff --git a/gst/rtsp-server/rtsp-permissions.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-permissions.h
similarity index 100%
rename from gst/rtsp-server/rtsp-permissions.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-permissions.h
diff --git a/gst/rtsp-server/rtsp-sdp.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-sdp.c
similarity index 100%
rename from gst/rtsp-server/rtsp-sdp.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-sdp.c
diff --git a/gst/rtsp-server/rtsp-sdp.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-sdp.h
similarity index 100%
rename from gst/rtsp-server/rtsp-sdp.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-sdp.h
diff --git a/gst/rtsp-server/rtsp-server-internal.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-internal.h
similarity index 100%
rename from gst/rtsp-server/rtsp-server-internal.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-internal.h
diff --git a/gst/rtsp-server/rtsp-server-object.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-object.h
similarity index 100%
rename from gst/rtsp-server/rtsp-server-object.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-object.h
diff --git a/gst/rtsp-server/rtsp-server-prelude.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-prelude.h
similarity index 100%
rename from gst/rtsp-server/rtsp-server-prelude.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-prelude.h
diff --git a/gst/rtsp-server/rtsp-server.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server.c
similarity index 100%
rename from gst/rtsp-server/rtsp-server.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server.c
diff --git a/gst/rtsp-server/rtsp-server.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server.h
similarity index 100%
rename from gst/rtsp-server/rtsp-server.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server.h
diff --git a/gst/rtsp-server/rtsp-session-media.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-media.c
similarity index 100%
rename from gst/rtsp-server/rtsp-session-media.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-media.c
diff --git a/gst/rtsp-server/rtsp-session-media.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-media.h
similarity index 100%
rename from gst/rtsp-server/rtsp-session-media.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-media.h
diff --git a/gst/rtsp-server/rtsp-session-pool.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-pool.c
similarity index 100%
rename from gst/rtsp-server/rtsp-session-pool.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-pool.c
diff --git a/gst/rtsp-server/rtsp-session-pool.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-pool.h
similarity index 100%
rename from gst/rtsp-server/rtsp-session-pool.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session-pool.h
diff --git a/gst/rtsp-server/rtsp-session.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session.c
similarity index 100%
rename from gst/rtsp-server/rtsp-session.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session.c
diff --git a/gst/rtsp-server/rtsp-session.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session.h
similarity index 100%
rename from gst/rtsp-server/rtsp-session.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session.h
diff --git a/gst/rtsp-server/rtsp-stream-transport.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream-transport.c
similarity index 100%
rename from gst/rtsp-server/rtsp-stream-transport.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream-transport.c
diff --git a/gst/rtsp-server/rtsp-stream-transport.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream-transport.h
similarity index 100%
rename from gst/rtsp-server/rtsp-stream-transport.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream-transport.h
diff --git a/gst/rtsp-server/rtsp-stream.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.c
similarity index 100%
rename from gst/rtsp-server/rtsp-stream.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.c
diff --git a/gst/rtsp-server/rtsp-stream.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.h
similarity index 100%
rename from gst/rtsp-server/rtsp-stream.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.h
diff --git a/gst/rtsp-server/rtsp-thread-pool.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-thread-pool.c
similarity index 100%
rename from gst/rtsp-server/rtsp-thread-pool.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-thread-pool.c
diff --git a/gst/rtsp-server/rtsp-thread-pool.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-thread-pool.h
similarity index 100%
rename from gst/rtsp-server/rtsp-thread-pool.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-thread-pool.h
diff --git a/gst/rtsp-server/rtsp-token.c b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-token.c
similarity index 100%
rename from gst/rtsp-server/rtsp-token.c
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-token.c
diff --git a/gst/rtsp-server/rtsp-token.h b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-token.h
similarity index 100%
rename from gst/rtsp-server/rtsp-token.h
rename to subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-token.h
diff --git a/gst/rtsp-sink/gstrtspclientsink.c b/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
similarity index 100%
rename from gst/rtsp-sink/gstrtspclientsink.c
rename to subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
diff --git a/gst/rtsp-sink/gstrtspclientsink.h b/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.h
similarity index 100%
rename from gst/rtsp-sink/gstrtspclientsink.h
rename to subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.h
diff --git a/gst/rtsp-sink/meson.build b/subprojects/gst-rtsp-server/gst/rtsp-sink/meson.build
similarity index 100%
rename from gst/rtsp-sink/meson.build
rename to subprojects/gst-rtsp-server/gst/rtsp-sink/meson.build
diff --git a/gst/rtsp-sink/plugin.c b/subprojects/gst-rtsp-server/gst/rtsp-sink/plugin.c
similarity index 100%
rename from gst/rtsp-sink/plugin.c
rename to subprojects/gst-rtsp-server/gst/rtsp-sink/plugin.c
diff --git a/hooks/pre-commit.hook b/subprojects/gst-rtsp-server/hooks/pre-commit.hook
similarity index 100%
rename from hooks/pre-commit.hook
rename to subprojects/gst-rtsp-server/hooks/pre-commit.hook
diff --git a/meson.build b/subprojects/gst-rtsp-server/meson.build
similarity index 100%
rename from meson.build
rename to subprojects/gst-rtsp-server/meson.build
diff --git a/meson_options.txt b/subprojects/gst-rtsp-server/meson_options.txt
similarity index 100%
rename from meson_options.txt
rename to subprojects/gst-rtsp-server/meson_options.txt
diff --git a/scripts/extract-release-date-from-doap-file.py b/subprojects/gst-rtsp-server/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-rtsp-server/scripts/extract-release-date-from-doap-file.py
diff --git a/tests/check/gst/addresspool.c b/subprojects/gst-rtsp-server/tests/check/gst/addresspool.c
similarity index 100%
rename from tests/check/gst/addresspool.c
rename to subprojects/gst-rtsp-server/tests/check/gst/addresspool.c
diff --git a/tests/check/gst/client.c b/subprojects/gst-rtsp-server/tests/check/gst/client.c
similarity index 100%
rename from tests/check/gst/client.c
rename to subprojects/gst-rtsp-server/tests/check/gst/client.c
diff --git a/tests/check/gst/media.c b/subprojects/gst-rtsp-server/tests/check/gst/media.c
similarity index 100%
rename from tests/check/gst/media.c
rename to subprojects/gst-rtsp-server/tests/check/gst/media.c
diff --git a/tests/check/gst/mediafactory.c b/subprojects/gst-rtsp-server/tests/check/gst/mediafactory.c
similarity index 100%
rename from tests/check/gst/mediafactory.c
rename to subprojects/gst-rtsp-server/tests/check/gst/mediafactory.c
diff --git a/tests/check/gst/mountpoints.c b/subprojects/gst-rtsp-server/tests/check/gst/mountpoints.c
similarity index 100%
rename from tests/check/gst/mountpoints.c
rename to subprojects/gst-rtsp-server/tests/check/gst/mountpoints.c
diff --git a/tests/check/gst/onvif.c b/subprojects/gst-rtsp-server/tests/check/gst/onvif.c
similarity index 100%
rename from tests/check/gst/onvif.c
rename to subprojects/gst-rtsp-server/tests/check/gst/onvif.c
diff --git a/tests/check/gst/permissions.c b/subprojects/gst-rtsp-server/tests/check/gst/permissions.c
similarity index 100%
rename from tests/check/gst/permissions.c
rename to subprojects/gst-rtsp-server/tests/check/gst/permissions.c
diff --git a/tests/check/gst/rtspclientsink.c b/subprojects/gst-rtsp-server/tests/check/gst/rtspclientsink.c
similarity index 100%
rename from tests/check/gst/rtspclientsink.c
rename to subprojects/gst-rtsp-server/tests/check/gst/rtspclientsink.c
diff --git a/tests/check/gst/rtspserver.c b/subprojects/gst-rtsp-server/tests/check/gst/rtspserver.c
similarity index 100%
rename from tests/check/gst/rtspserver.c
rename to subprojects/gst-rtsp-server/tests/check/gst/rtspserver.c
diff --git a/tests/check/gst/sessionmedia.c b/subprojects/gst-rtsp-server/tests/check/gst/sessionmedia.c
similarity index 100%
rename from tests/check/gst/sessionmedia.c
rename to subprojects/gst-rtsp-server/tests/check/gst/sessionmedia.c
diff --git a/tests/check/gst/sessionpool.c b/subprojects/gst-rtsp-server/tests/check/gst/sessionpool.c
similarity index 100%
rename from tests/check/gst/sessionpool.c
rename to subprojects/gst-rtsp-server/tests/check/gst/sessionpool.c
diff --git a/tests/check/gst/stream.c b/subprojects/gst-rtsp-server/tests/check/gst/stream.c
similarity index 100%
rename from tests/check/gst/stream.c
rename to subprojects/gst-rtsp-server/tests/check/gst/stream.c
diff --git a/tests/check/gst/threadpool.c b/subprojects/gst-rtsp-server/tests/check/gst/threadpool.c
similarity index 100%
rename from tests/check/gst/threadpool.c
rename to subprojects/gst-rtsp-server/tests/check/gst/threadpool.c
diff --git a/tests/check/gst/token.c b/subprojects/gst-rtsp-server/tests/check/gst/token.c
similarity index 100%
rename from tests/check/gst/token.c
rename to subprojects/gst-rtsp-server/tests/check/gst/token.c
diff --git a/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build
similarity index 100%
rename from tests/check/meson.build
rename to subprojects/gst-rtsp-server/tests/check/meson.build
diff --git a/tests/files/test.avi b/subprojects/gst-rtsp-server/tests/files/test.avi
similarity index 100%
rename from tests/files/test.avi
rename to subprojects/gst-rtsp-server/tests/files/test.avi
diff --git a/tests/meson.build b/subprojects/gst-rtsp-server/tests/meson.build
similarity index 100%
rename from tests/meson.build
rename to subprojects/gst-rtsp-server/tests/meson.build
diff --git a/tests/test-cleanup.c b/subprojects/gst-rtsp-server/tests/test-cleanup.c
similarity index 100%
rename from tests/test-cleanup.c
rename to subprojects/gst-rtsp-server/tests/test-cleanup.c
diff --git a/tests/test-reuse.c b/subprojects/gst-rtsp-server/tests/test-reuse.c
similarity index 100%
rename from tests/test-reuse.c
rename to subprojects/gst-rtsp-server/tests/test-reuse.c