diff --git a/Cargo.toml b/Cargo.toml
index 55ad99de..0e29b655 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,25 +1,25 @@
 [workspace]
 
 members = [
-    "gst-plugin-dav1d",
-    "gst-plugin-file",
-    "gst-plugin-reqwest",
-    "gst-plugin-flv",
-    "gst-plugin-audiofx",
-    "gst-plugin-togglerecord",
-    "gst-plugin-threadshare",
     "gst-plugin-tutorial",
-    "gst-plugin-closedcaption",
     "gst-plugin-version-helper",
-    "gst-plugin-sodium",
-    "gst-plugin-cdg",
-    "gst-plugin-rav1e",
-    "gst-plugin-rusoto",
-    "gst-plugin-fallbackswitch",
-    "gst-plugin-lewton",
-    "gst-plugin-claxon",
-    "gst-plugin-gif",
-    "gst-plugin-csound",
+    "audio/gst-plugin-audiofx",
+    "audio/gst-plugin-claxon",
+    "audio/gst-plugin-csound",
+    "audio/gst-plugin-lewton",
+    "generic/gst-plugin-file",
+    "generic/gst-plugin-sodium",
+    "generic/gst-plugin-threadshare",
+    "net/gst-plugin-reqwest",
+    "net/gst-plugin-rusoto",
+    "utils/gst-plugin-fallbackswitch",
+    "utils/gst-plugin-togglerecord",
+    "video/gst-plugin-cdg",
+    "video/gst-plugin-closedcaption",
+    "video/gst-plugin-dav1d",
+    "video/gst-plugin-flv",
+    "video/gst-plugin-gif",
+    "video/gst-plugin-rav1e",
 ]
 
 [profile.release]
diff --git a/gst-plugin-audiofx/Cargo.toml b/audio/gst-plugin-audiofx/Cargo.toml
similarity index 93%
rename from gst-plugin-audiofx/Cargo.toml
rename to audio/gst-plugin-audiofx/Cargo.toml
index a435a0be..b9dafb34 100644
--- a/gst-plugin-audiofx/Cargo.toml
+++ b/audio/gst-plugin-audiofx/Cargo.toml
@@ -27,4 +27,4 @@ gstreamer-check = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs
 gstreamer-app = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-audiofx/build.rs b/audio/gst-plugin-audiofx/build.rs
similarity index 100%
rename from gst-plugin-audiofx/build.rs
rename to audio/gst-plugin-audiofx/build.rs
diff --git a/gst-plugin-audiofx/src/audioecho.rs b/audio/gst-plugin-audiofx/src/audioecho.rs
similarity index 100%
rename from gst-plugin-audiofx/src/audioecho.rs
rename to audio/gst-plugin-audiofx/src/audioecho.rs
diff --git a/gst-plugin-audiofx/src/audioloudnorm.rs b/audio/gst-plugin-audiofx/src/audioloudnorm.rs
similarity index 100%
rename from gst-plugin-audiofx/src/audioloudnorm.rs
rename to audio/gst-plugin-audiofx/src/audioloudnorm.rs
diff --git a/gst-plugin-audiofx/src/lib.rs b/audio/gst-plugin-audiofx/src/lib.rs
similarity index 100%
rename from gst-plugin-audiofx/src/lib.rs
rename to audio/gst-plugin-audiofx/src/lib.rs
diff --git a/gst-plugin-audiofx/tests/audioloudnorm.rs b/audio/gst-plugin-audiofx/tests/audioloudnorm.rs
similarity index 100%
rename from gst-plugin-audiofx/tests/audioloudnorm.rs
rename to audio/gst-plugin-audiofx/tests/audioloudnorm.rs
diff --git a/gst-plugin-claxon/Cargo.toml b/audio/gst-plugin-claxon/Cargo.toml
similarity index 91%
rename from gst-plugin-claxon/Cargo.toml
rename to audio/gst-plugin-claxon/Cargo.toml
index 46551581..75949eec 100644
--- a/gst-plugin-claxon/Cargo.toml
+++ b/audio/gst-plugin-claxon/Cargo.toml
@@ -22,4 +22,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-cdg/build.rs b/audio/gst-plugin-claxon/build.rs
similarity index 100%
rename from gst-plugin-cdg/build.rs
rename to audio/gst-plugin-claxon/build.rs
diff --git a/gst-plugin-claxon/src/claxondec.rs b/audio/gst-plugin-claxon/src/claxondec.rs
similarity index 100%
rename from gst-plugin-claxon/src/claxondec.rs
rename to audio/gst-plugin-claxon/src/claxondec.rs
diff --git a/gst-plugin-claxon/src/lib.rs b/audio/gst-plugin-claxon/src/lib.rs
similarity index 100%
rename from gst-plugin-claxon/src/lib.rs
rename to audio/gst-plugin-claxon/src/lib.rs
diff --git a/gst-plugin-claxon/tests/claxondec.rs b/audio/gst-plugin-claxon/tests/claxondec.rs
similarity index 100%
rename from gst-plugin-claxon/tests/claxondec.rs
rename to audio/gst-plugin-claxon/tests/claxondec.rs
diff --git a/gst-plugin-claxon/tests/test_mono_s16.flac b/audio/gst-plugin-claxon/tests/test_mono_s16.flac
similarity index 100%
rename from gst-plugin-claxon/tests/test_mono_s16.flac
rename to audio/gst-plugin-claxon/tests/test_mono_s16.flac
diff --git a/gst-plugin-claxon/tests/test_stereo_s32.flac b/audio/gst-plugin-claxon/tests/test_stereo_s32.flac
similarity index 100%
rename from gst-plugin-claxon/tests/test_stereo_s32.flac
rename to audio/gst-plugin-claxon/tests/test_stereo_s32.flac
diff --git a/gst-plugin-csound/Cargo.toml b/audio/gst-plugin-csound/Cargo.toml
similarity index 93%
rename from gst-plugin-csound/Cargo.toml
rename to audio/gst-plugin-csound/Cargo.toml
index b6d00019..69ab1daf 100644
--- a/gst-plugin-csound/Cargo.toml
+++ b/audio/gst-plugin-csound/Cargo.toml
@@ -27,4 +27,4 @@ name = "csound-effect"
 path = "examples/effect_example.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path = "../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path = "../../gst-plugin-version-helper" }
diff --git a/gst-plugin-csound/README.md b/audio/gst-plugin-csound/README.md
similarity index 100%
rename from gst-plugin-csound/README.md
rename to audio/gst-plugin-csound/README.md
diff --git a/gst-plugin-claxon/build.rs b/audio/gst-plugin-csound/build.rs
similarity index 100%
rename from gst-plugin-claxon/build.rs
rename to audio/gst-plugin-csound/build.rs
diff --git a/gst-plugin-csound/examples/effect_example.rs b/audio/gst-plugin-csound/examples/effect_example.rs
similarity index 100%
rename from gst-plugin-csound/examples/effect_example.rs
rename to audio/gst-plugin-csound/examples/effect_example.rs
diff --git a/gst-plugin-csound/src/filter.rs b/audio/gst-plugin-csound/src/filter.rs
similarity index 100%
rename from gst-plugin-csound/src/filter.rs
rename to audio/gst-plugin-csound/src/filter.rs
diff --git a/gst-plugin-csound/src/lib.rs b/audio/gst-plugin-csound/src/lib.rs
similarity index 100%
rename from gst-plugin-csound/src/lib.rs
rename to audio/gst-plugin-csound/src/lib.rs
diff --git a/gst-plugin-csound/tests/csound_filter.rs b/audio/gst-plugin-csound/tests/csound_filter.rs
similarity index 100%
rename from gst-plugin-csound/tests/csound_filter.rs
rename to audio/gst-plugin-csound/tests/csound_filter.rs
diff --git a/gst-plugin-lewton/Cargo.toml b/audio/gst-plugin-lewton/Cargo.toml
similarity index 91%
rename from gst-plugin-lewton/Cargo.toml
rename to audio/gst-plugin-lewton/Cargo.toml
index 1127eab3..c12b4efb 100644
--- a/gst-plugin-lewton/Cargo.toml
+++ b/audio/gst-plugin-lewton/Cargo.toml
@@ -23,4 +23,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-csound/build.rs b/audio/gst-plugin-lewton/build.rs
similarity index 100%
rename from gst-plugin-csound/build.rs
rename to audio/gst-plugin-lewton/build.rs
diff --git a/gst-plugin-lewton/src/lewtondec.rs b/audio/gst-plugin-lewton/src/lewtondec.rs
similarity index 100%
rename from gst-plugin-lewton/src/lewtondec.rs
rename to audio/gst-plugin-lewton/src/lewtondec.rs
diff --git a/gst-plugin-lewton/src/lib.rs b/audio/gst-plugin-lewton/src/lib.rs
similarity index 100%
rename from gst-plugin-lewton/src/lib.rs
rename to audio/gst-plugin-lewton/src/lib.rs
diff --git a/gst-plugin-lewton/tests/lewtondec.rs b/audio/gst-plugin-lewton/tests/lewtondec.rs
similarity index 100%
rename from gst-plugin-lewton/tests/lewtondec.rs
rename to audio/gst-plugin-lewton/tests/lewtondec.rs
diff --git a/gst-plugin-lewton/tests/test.vorbis b/audio/gst-plugin-lewton/tests/test.vorbis
similarity index 100%
rename from gst-plugin-lewton/tests/test.vorbis
rename to audio/gst-plugin-lewton/tests/test.vorbis
diff --git a/gst-plugin-file/Cargo.toml b/generic/gst-plugin-file/Cargo.toml
similarity index 89%
rename from gst-plugin-file/Cargo.toml
rename to generic/gst-plugin-file/Cargo.toml
index 55fd88b8..bc1949c4 100644
--- a/gst-plugin-file/Cargo.toml
+++ b/generic/gst-plugin-file/Cargo.toml
@@ -19,4 +19,4 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-dav1d/build.rs b/generic/gst-plugin-file/build.rs
similarity index 100%
rename from gst-plugin-dav1d/build.rs
rename to generic/gst-plugin-file/build.rs
diff --git a/gst-plugin-file/src/file_location.rs b/generic/gst-plugin-file/src/file_location.rs
similarity index 100%
rename from gst-plugin-file/src/file_location.rs
rename to generic/gst-plugin-file/src/file_location.rs
diff --git a/gst-plugin-file/src/filesink.rs b/generic/gst-plugin-file/src/filesink.rs
similarity index 100%
rename from gst-plugin-file/src/filesink.rs
rename to generic/gst-plugin-file/src/filesink.rs
diff --git a/gst-plugin-file/src/filesrc.rs b/generic/gst-plugin-file/src/filesrc.rs
similarity index 100%
rename from gst-plugin-file/src/filesrc.rs
rename to generic/gst-plugin-file/src/filesrc.rs
diff --git a/gst-plugin-file/src/lib.rs b/generic/gst-plugin-file/src/lib.rs
similarity index 100%
rename from gst-plugin-file/src/lib.rs
rename to generic/gst-plugin-file/src/lib.rs
diff --git a/gst-plugin-sodium/Cargo.toml b/generic/gst-plugin-sodium/Cargo.toml
similarity index 95%
rename from gst-plugin-sodium/Cargo.toml
rename to generic/gst-plugin-sodium/Cargo.toml
index 0db9746f..85f44983 100644
--- a/gst-plugin-sodium/Cargo.toml
+++ b/generic/gst-plugin-sodium/Cargo.toml
@@ -54,4 +54,4 @@ path = "examples/decrypt_example.rs"
 required-features = ["serde", "serde_json", "clap"]
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-file/build.rs b/generic/gst-plugin-sodium/build.rs
similarity index 100%
rename from gst-plugin-file/build.rs
rename to generic/gst-plugin-sodium/build.rs
diff --git a/gst-plugin-sodium/examples/decrypt_example.rs b/generic/gst-plugin-sodium/examples/decrypt_example.rs
similarity index 100%
rename from gst-plugin-sodium/examples/decrypt_example.rs
rename to generic/gst-plugin-sodium/examples/decrypt_example.rs
diff --git a/gst-plugin-sodium/examples/encrypt_example.rs b/generic/gst-plugin-sodium/examples/encrypt_example.rs
similarity index 100%
rename from gst-plugin-sodium/examples/encrypt_example.rs
rename to generic/gst-plugin-sodium/examples/encrypt_example.rs
diff --git a/gst-plugin-sodium/examples/generate_keys.rs b/generic/gst-plugin-sodium/examples/generate_keys.rs
similarity index 100%
rename from gst-plugin-sodium/examples/generate_keys.rs
rename to generic/gst-plugin-sodium/examples/generate_keys.rs
diff --git a/gst-plugin-sodium/examples/receiver_sample.json b/generic/gst-plugin-sodium/examples/receiver_sample.json
similarity index 100%
rename from gst-plugin-sodium/examples/receiver_sample.json
rename to generic/gst-plugin-sodium/examples/receiver_sample.json
diff --git a/gst-plugin-sodium/examples/sender_sample.json b/generic/gst-plugin-sodium/examples/sender_sample.json
similarity index 100%
rename from gst-plugin-sodium/examples/sender_sample.json
rename to generic/gst-plugin-sodium/examples/sender_sample.json
diff --git a/gst-plugin-sodium/src/decrypter.rs b/generic/gst-plugin-sodium/src/decrypter.rs
similarity index 100%
rename from gst-plugin-sodium/src/decrypter.rs
rename to generic/gst-plugin-sodium/src/decrypter.rs
diff --git a/gst-plugin-sodium/src/encrypter.rs b/generic/gst-plugin-sodium/src/encrypter.rs
similarity index 100%
rename from gst-plugin-sodium/src/encrypter.rs
rename to generic/gst-plugin-sodium/src/encrypter.rs
diff --git a/gst-plugin-sodium/src/lib.rs b/generic/gst-plugin-sodium/src/lib.rs
similarity index 100%
rename from gst-plugin-sodium/src/lib.rs
rename to generic/gst-plugin-sodium/src/lib.rs
diff --git a/gst-plugin-sodium/tests/decrypter.rs b/generic/gst-plugin-sodium/tests/decrypter.rs
similarity index 100%
rename from gst-plugin-sodium/tests/decrypter.rs
rename to generic/gst-plugin-sodium/tests/decrypter.rs
diff --git a/gst-plugin-sodium/tests/encrypted_sample.enc b/generic/gst-plugin-sodium/tests/encrypted_sample.enc
similarity index 100%
rename from gst-plugin-sodium/tests/encrypted_sample.enc
rename to generic/gst-plugin-sodium/tests/encrypted_sample.enc
diff --git a/gst-plugin-sodium/tests/encrypter.rs b/generic/gst-plugin-sodium/tests/encrypter.rs
similarity index 100%
rename from gst-plugin-sodium/tests/encrypter.rs
rename to generic/gst-plugin-sodium/tests/encrypter.rs
diff --git a/gst-plugin-sodium/tests/sample.mp3 b/generic/gst-plugin-sodium/tests/sample.mp3
similarity index 100%
rename from gst-plugin-sodium/tests/sample.mp3
rename to generic/gst-plugin-sodium/tests/sample.mp3
diff --git a/gst-plugin-threadshare/Cargo.toml b/generic/gst-plugin-threadshare/Cargo.toml
similarity index 96%
rename from gst-plugin-threadshare/Cargo.toml
rename to generic/gst-plugin-threadshare/Cargo.toml
index 37a546e8..3186d56a 100644
--- a/gst-plugin-threadshare/Cargo.toml
+++ b/generic/gst-plugin-threadshare/Cargo.toml
@@ -48,6 +48,6 @@ name = "tcpclientsrc-benchmark-sender"
 path = "examples/tcpclientsrc_benchmark_sender.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
 cc = "1.0.38"
 pkg-config = "0.3.15"
diff --git a/gst-plugin-threadshare/build.rs b/generic/gst-plugin-threadshare/build.rs
similarity index 100%
rename from gst-plugin-threadshare/build.rs
rename to generic/gst-plugin-threadshare/build.rs
diff --git a/gst-plugin-threadshare/examples/benchmark.rs b/generic/gst-plugin-threadshare/examples/benchmark.rs
similarity index 100%
rename from gst-plugin-threadshare/examples/benchmark.rs
rename to generic/gst-plugin-threadshare/examples/benchmark.rs
diff --git a/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs b/generic/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs
similarity index 100%
rename from gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs
rename to generic/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs
diff --git a/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs b/generic/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs
similarity index 100%
rename from gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs
rename to generic/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs
diff --git a/gst-plugin-threadshare/src/appsrc.rs b/generic/gst-plugin-threadshare/src/appsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/src/appsrc.rs
rename to generic/gst-plugin-threadshare/src/appsrc.rs
diff --git a/gst-plugin-threadshare/src/dataqueue.rs b/generic/gst-plugin-threadshare/src/dataqueue.rs
similarity index 100%
rename from gst-plugin-threadshare/src/dataqueue.rs
rename to generic/gst-plugin-threadshare/src/dataqueue.rs
diff --git a/gst-plugin-threadshare/src/inputselector.rs b/generic/gst-plugin-threadshare/src/inputselector.rs
similarity index 100%
rename from gst-plugin-threadshare/src/inputselector.rs
rename to generic/gst-plugin-threadshare/src/inputselector.rs
diff --git a/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
rename to generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
diff --git a/gst-plugin-threadshare/src/jitterbuffer/mod.rs b/generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/mod.rs
rename to generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs
diff --git a/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c b/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c
rename to generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c
diff --git a/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h b/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h
rename to generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h
diff --git a/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c b/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/rtpstats.c
rename to generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c
diff --git a/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h b/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h
similarity index 100%
rename from gst-plugin-threadshare/src/jitterbuffer/rtpstats.h
rename to generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h
diff --git a/gst-plugin-threadshare/src/lib.rs b/generic/gst-plugin-threadshare/src/lib.rs
similarity index 100%
rename from gst-plugin-threadshare/src/lib.rs
rename to generic/gst-plugin-threadshare/src/lib.rs
diff --git a/gst-plugin-threadshare/src/proxy.rs b/generic/gst-plugin-threadshare/src/proxy.rs
similarity index 100%
rename from gst-plugin-threadshare/src/proxy.rs
rename to generic/gst-plugin-threadshare/src/proxy.rs
diff --git a/gst-plugin-threadshare/src/queue.rs b/generic/gst-plugin-threadshare/src/queue.rs
similarity index 100%
rename from gst-plugin-threadshare/src/queue.rs
rename to generic/gst-plugin-threadshare/src/queue.rs
diff --git a/gst-plugin-threadshare/src/runtime/executor.rs b/generic/gst-plugin-threadshare/src/runtime/executor.rs
similarity index 100%
rename from gst-plugin-threadshare/src/runtime/executor.rs
rename to generic/gst-plugin-threadshare/src/runtime/executor.rs
diff --git a/gst-plugin-threadshare/src/runtime/mod.rs b/generic/gst-plugin-threadshare/src/runtime/mod.rs
similarity index 100%
rename from gst-plugin-threadshare/src/runtime/mod.rs
rename to generic/gst-plugin-threadshare/src/runtime/mod.rs
diff --git a/gst-plugin-threadshare/src/runtime/pad.rs b/generic/gst-plugin-threadshare/src/runtime/pad.rs
similarity index 100%
rename from gst-plugin-threadshare/src/runtime/pad.rs
rename to generic/gst-plugin-threadshare/src/runtime/pad.rs
diff --git a/gst-plugin-threadshare/src/runtime/task.rs b/generic/gst-plugin-threadshare/src/runtime/task.rs
similarity index 100%
rename from gst-plugin-threadshare/src/runtime/task.rs
rename to generic/gst-plugin-threadshare/src/runtime/task.rs
diff --git a/gst-plugin-threadshare/src/runtime/time.rs b/generic/gst-plugin-threadshare/src/runtime/time.rs
similarity index 100%
rename from gst-plugin-threadshare/src/runtime/time.rs
rename to generic/gst-plugin-threadshare/src/runtime/time.rs
diff --git a/gst-plugin-threadshare/src/socket.rs b/generic/gst-plugin-threadshare/src/socket.rs
similarity index 100%
rename from gst-plugin-threadshare/src/socket.rs
rename to generic/gst-plugin-threadshare/src/socket.rs
diff --git a/gst-plugin-threadshare/src/tcpclientsrc.rs b/generic/gst-plugin-threadshare/src/tcpclientsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/src/tcpclientsrc.rs
rename to generic/gst-plugin-threadshare/src/tcpclientsrc.rs
diff --git a/gst-plugin-threadshare/src/udpsink.rs b/generic/gst-plugin-threadshare/src/udpsink.rs
similarity index 100%
rename from gst-plugin-threadshare/src/udpsink.rs
rename to generic/gst-plugin-threadshare/src/udpsink.rs
diff --git a/gst-plugin-threadshare/src/udpsrc.rs b/generic/gst-plugin-threadshare/src/udpsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/src/udpsrc.rs
rename to generic/gst-plugin-threadshare/src/udpsrc.rs
diff --git a/gst-plugin-threadshare/tests/appsrc.rs b/generic/gst-plugin-threadshare/tests/appsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/appsrc.rs
rename to generic/gst-plugin-threadshare/tests/appsrc.rs
diff --git a/gst-plugin-threadshare/tests/inputselector.rs b/generic/gst-plugin-threadshare/tests/inputselector.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/inputselector.rs
rename to generic/gst-plugin-threadshare/tests/inputselector.rs
diff --git a/gst-plugin-threadshare/tests/jitterbuffer.rs b/generic/gst-plugin-threadshare/tests/jitterbuffer.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/jitterbuffer.rs
rename to generic/gst-plugin-threadshare/tests/jitterbuffer.rs
diff --git a/gst-plugin-threadshare/tests/pad.rs b/generic/gst-plugin-threadshare/tests/pad.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/pad.rs
rename to generic/gst-plugin-threadshare/tests/pad.rs
diff --git a/gst-plugin-threadshare/tests/pipeline.rs b/generic/gst-plugin-threadshare/tests/pipeline.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/pipeline.rs
rename to generic/gst-plugin-threadshare/tests/pipeline.rs
diff --git a/gst-plugin-threadshare/tests/proxy.rs b/generic/gst-plugin-threadshare/tests/proxy.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/proxy.rs
rename to generic/gst-plugin-threadshare/tests/proxy.rs
diff --git a/gst-plugin-threadshare/tests/queue.rs b/generic/gst-plugin-threadshare/tests/queue.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/queue.rs
rename to generic/gst-plugin-threadshare/tests/queue.rs
diff --git a/gst-plugin-threadshare/tests/tcpclientsrc.rs b/generic/gst-plugin-threadshare/tests/tcpclientsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/tcpclientsrc.rs
rename to generic/gst-plugin-threadshare/tests/tcpclientsrc.rs
diff --git a/gst-plugin-threadshare/tests/udpsink.rs b/generic/gst-plugin-threadshare/tests/udpsink.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/udpsink.rs
rename to generic/gst-plugin-threadshare/tests/udpsink.rs
diff --git a/gst-plugin-threadshare/tests/udpsrc.rs b/generic/gst-plugin-threadshare/tests/udpsrc.rs
similarity index 100%
rename from gst-plugin-threadshare/tests/udpsrc.rs
rename to generic/gst-plugin-threadshare/tests/udpsrc.rs
diff --git a/gst-plugin-reqwest/Cargo.toml b/net/gst-plugin-reqwest/Cargo.toml
similarity index 92%
rename from gst-plugin-reqwest/Cargo.toml
rename to net/gst-plugin-reqwest/Cargo.toml
index 8c7772b7..7ef9c897 100644
--- a/gst-plugin-reqwest/Cargo.toml
+++ b/net/gst-plugin-reqwest/Cargo.toml
@@ -28,4 +28,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-flv/build.rs b/net/gst-plugin-reqwest/build.rs
similarity index 100%
rename from gst-plugin-flv/build.rs
rename to net/gst-plugin-reqwest/build.rs
diff --git a/gst-plugin-reqwest/src/lib.rs b/net/gst-plugin-reqwest/src/lib.rs
similarity index 100%
rename from gst-plugin-reqwest/src/lib.rs
rename to net/gst-plugin-reqwest/src/lib.rs
diff --git a/gst-plugin-reqwest/src/reqwesthttpsrc.rs b/net/gst-plugin-reqwest/src/reqwesthttpsrc.rs
similarity index 100%
rename from gst-plugin-reqwest/src/reqwesthttpsrc.rs
rename to net/gst-plugin-reqwest/src/reqwesthttpsrc.rs
diff --git a/gst-plugin-reqwest/tests/reqwesthttpsrc.rs b/net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs
similarity index 100%
rename from gst-plugin-reqwest/tests/reqwesthttpsrc.rs
rename to net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs
diff --git a/gst-plugin-rusoto/Cargo.toml b/net/gst-plugin-rusoto/Cargo.toml
similarity index 91%
rename from gst-plugin-rusoto/Cargo.toml
rename to net/gst-plugin-rusoto/Cargo.toml
index 0404eb3a..65777222 100644
--- a/gst-plugin-rusoto/Cargo.toml
+++ b/net/gst-plugin-rusoto/Cargo.toml
@@ -26,4 +26,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-rusoto/README.md b/net/gst-plugin-rusoto/README.md
similarity index 100%
rename from gst-plugin-rusoto/README.md
rename to net/gst-plugin-rusoto/README.md
diff --git a/gst-plugin-gif/build.rs b/net/gst-plugin-rusoto/build.rs
similarity index 100%
rename from gst-plugin-gif/build.rs
rename to net/gst-plugin-rusoto/build.rs
diff --git a/gst-plugin-rusoto/src/lib.rs b/net/gst-plugin-rusoto/src/lib.rs
similarity index 100%
rename from gst-plugin-rusoto/src/lib.rs
rename to net/gst-plugin-rusoto/src/lib.rs
diff --git a/gst-plugin-rusoto/src/s3sink.rs b/net/gst-plugin-rusoto/src/s3sink.rs
similarity index 100%
rename from gst-plugin-rusoto/src/s3sink.rs
rename to net/gst-plugin-rusoto/src/s3sink.rs
diff --git a/gst-plugin-rusoto/src/s3src.rs b/net/gst-plugin-rusoto/src/s3src.rs
similarity index 100%
rename from gst-plugin-rusoto/src/s3src.rs
rename to net/gst-plugin-rusoto/src/s3src.rs
diff --git a/gst-plugin-rusoto/src/s3url.rs b/net/gst-plugin-rusoto/src/s3url.rs
similarity index 100%
rename from gst-plugin-rusoto/src/s3url.rs
rename to net/gst-plugin-rusoto/src/s3url.rs
diff --git a/gst-plugin-rusoto/src/s3utils.rs b/net/gst-plugin-rusoto/src/s3utils.rs
similarity index 100%
rename from gst-plugin-rusoto/src/s3utils.rs
rename to net/gst-plugin-rusoto/src/s3utils.rs
diff --git a/gst-plugin-fallbackswitch/Cargo.toml b/utils/gst-plugin-fallbackswitch/Cargo.toml
similarity index 96%
rename from gst-plugin-fallbackswitch/Cargo.toml
rename to utils/gst-plugin-fallbackswitch/Cargo.toml
index 6f9a66d3..bb6a8749 100644
--- a/gst-plugin-fallbackswitch/Cargo.toml
+++ b/utils/gst-plugin-fallbackswitch/Cargo.toml
@@ -37,7 +37,7 @@ path = "examples/gtk_fallbackswitch.rs"
 required-features = ["gtk", "gio"]
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
 cc = "1.0"
 pkg-config = "0.3"
 
diff --git a/gst-plugin-fallbackswitch/build.rs b/utils/gst-plugin-fallbackswitch/build.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/build.rs
rename to utils/gst-plugin-fallbackswitch/build.rs
diff --git a/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs b/utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs
rename to utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs
diff --git a/gst-plugin-fallbackswitch/src/base/aggregator.rs b/utils/gst-plugin-fallbackswitch/src/base/aggregator.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/aggregator.rs
rename to utils/gst-plugin-fallbackswitch/src/base/aggregator.rs
diff --git a/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs b/utils/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/aggregator_pad.rs
rename to utils/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs
diff --git a/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs b/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
rename to utils/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
diff --git a/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs b/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
rename to utils/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
diff --git a/gst-plugin-fallbackswitch/src/base/auto/mod.rs b/utils/gst-plugin-fallbackswitch/src/base/auto/mod.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/auto/mod.rs
rename to utils/gst-plugin-fallbackswitch/src/base/auto/mod.rs
diff --git a/gst-plugin-fallbackswitch/src/base/gstaggregator.c b/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.c
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/gstaggregator.c
rename to utils/gst-plugin-fallbackswitch/src/base/gstaggregator.c
diff --git a/gst-plugin-fallbackswitch/src/base/gstaggregator.h b/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/gstaggregator.h
rename to utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h
diff --git a/gst-plugin-fallbackswitch/src/base/mod.rs b/utils/gst-plugin-fallbackswitch/src/base/mod.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/mod.rs
rename to utils/gst-plugin-fallbackswitch/src/base/mod.rs
diff --git a/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs b/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
rename to utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
diff --git a/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs b/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
rename to utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
diff --git a/gst-plugin-fallbackswitch/src/base/subclass/mod.rs b/utils/gst-plugin-fallbackswitch/src/base/subclass/mod.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/subclass/mod.rs
rename to utils/gst-plugin-fallbackswitch/src/base/subclass/mod.rs
diff --git a/gst-plugin-fallbackswitch/src/base/sys.rs b/utils/gst-plugin-fallbackswitch/src/base/sys.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/sys.rs
rename to utils/gst-plugin-fallbackswitch/src/base/sys.rs
diff --git a/gst-plugin-fallbackswitch/src/base/utils.rs b/utils/gst-plugin-fallbackswitch/src/base/utils.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/base/utils.rs
rename to utils/gst-plugin-fallbackswitch/src/base/utils.rs
diff --git a/gst-plugin-fallbackswitch/src/fallbackswitch.rs b/utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/fallbackswitch.rs
rename to utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs
diff --git a/gst-plugin-fallbackswitch/src/lib.rs b/utils/gst-plugin-fallbackswitch/src/lib.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/src/lib.rs
rename to utils/gst-plugin-fallbackswitch/src/lib.rs
diff --git a/gst-plugin-fallbackswitch/tests/fallbackswitch.rs b/utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs
similarity index 100%
rename from gst-plugin-fallbackswitch/tests/fallbackswitch.rs
rename to utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs
diff --git a/gst-plugin-togglerecord/Cargo.toml b/utils/gst-plugin-togglerecord/Cargo.toml
similarity index 93%
rename from gst-plugin-togglerecord/Cargo.toml
rename to utils/gst-plugin-togglerecord/Cargo.toml
index 4573ed5e..ac25dba0 100644
--- a/gst-plugin-togglerecord/Cargo.toml
+++ b/utils/gst-plugin-togglerecord/Cargo.toml
@@ -31,4 +31,4 @@ path = "examples/gtk_recording.rs"
 required-features = ["gtk", "gio"]
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-togglerecord/LICENSE b/utils/gst-plugin-togglerecord/LICENSE
similarity index 100%
rename from gst-plugin-togglerecord/LICENSE
rename to utils/gst-plugin-togglerecord/LICENSE
diff --git a/gst-plugin-lewton/build.rs b/utils/gst-plugin-togglerecord/build.rs
similarity index 100%
rename from gst-plugin-lewton/build.rs
rename to utils/gst-plugin-togglerecord/build.rs
diff --git a/gst-plugin-togglerecord/examples/gtk_recording.rs b/utils/gst-plugin-togglerecord/examples/gtk_recording.rs
similarity index 100%
rename from gst-plugin-togglerecord/examples/gtk_recording.rs
rename to utils/gst-plugin-togglerecord/examples/gtk_recording.rs
diff --git a/gst-plugin-togglerecord/src/lib.rs b/utils/gst-plugin-togglerecord/src/lib.rs
similarity index 100%
rename from gst-plugin-togglerecord/src/lib.rs
rename to utils/gst-plugin-togglerecord/src/lib.rs
diff --git a/gst-plugin-togglerecord/src/togglerecord.rs b/utils/gst-plugin-togglerecord/src/togglerecord.rs
similarity index 100%
rename from gst-plugin-togglerecord/src/togglerecord.rs
rename to utils/gst-plugin-togglerecord/src/togglerecord.rs
diff --git a/gst-plugin-togglerecord/tests/tests.rs b/utils/gst-plugin-togglerecord/tests/tests.rs
similarity index 100%
rename from gst-plugin-togglerecord/tests/tests.rs
rename to utils/gst-plugin-togglerecord/tests/tests.rs
diff --git a/gst-plugin-cdg/Cargo.toml b/video/gst-plugin-cdg/Cargo.toml
similarity index 92%
rename from gst-plugin-cdg/Cargo.toml
rename to video/gst-plugin-cdg/Cargo.toml
index 2d22589f..6b75cf29 100644
--- a/gst-plugin-cdg/Cargo.toml
+++ b/video/gst-plugin-cdg/Cargo.toml
@@ -25,4 +25,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-rav1e/build.rs b/video/gst-plugin-cdg/build.rs
similarity index 100%
rename from gst-plugin-rav1e/build.rs
rename to video/gst-plugin-cdg/build.rs
diff --git a/gst-plugin-cdg/src/cdgdec.rs b/video/gst-plugin-cdg/src/cdgdec.rs
similarity index 100%
rename from gst-plugin-cdg/src/cdgdec.rs
rename to video/gst-plugin-cdg/src/cdgdec.rs
diff --git a/gst-plugin-cdg/src/cdgparse.rs b/video/gst-plugin-cdg/src/cdgparse.rs
similarity index 100%
rename from gst-plugin-cdg/src/cdgparse.rs
rename to video/gst-plugin-cdg/src/cdgparse.rs
diff --git a/gst-plugin-cdg/src/constants.rs b/video/gst-plugin-cdg/src/constants.rs
similarity index 100%
rename from gst-plugin-cdg/src/constants.rs
rename to video/gst-plugin-cdg/src/constants.rs
diff --git a/gst-plugin-cdg/src/lib.rs b/video/gst-plugin-cdg/src/lib.rs
similarity index 100%
rename from gst-plugin-cdg/src/lib.rs
rename to video/gst-plugin-cdg/src/lib.rs
diff --git a/gst-plugin-cdg/tests/BrotherJohn.cdg b/video/gst-plugin-cdg/tests/BrotherJohn.cdg
similarity index 100%
rename from gst-plugin-cdg/tests/BrotherJohn.cdg
rename to video/gst-plugin-cdg/tests/BrotherJohn.cdg
diff --git a/gst-plugin-cdg/tests/cdgdec.rs b/video/gst-plugin-cdg/tests/cdgdec.rs
similarity index 100%
rename from gst-plugin-cdg/tests/cdgdec.rs
rename to video/gst-plugin-cdg/tests/cdgdec.rs
diff --git a/gst-plugin-closedcaption/Cargo.toml b/video/gst-plugin-closedcaption/Cargo.toml
similarity index 94%
rename from gst-plugin-closedcaption/Cargo.toml
rename to video/gst-plugin-closedcaption/Cargo.toml
index 2afb223d..a901f004 100644
--- a/gst-plugin-closedcaption/Cargo.toml
+++ b/video/gst-plugin-closedcaption/Cargo.toml
@@ -45,5 +45,5 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
 cc = "1.0"
diff --git a/gst-plugin-closedcaption/build.rs b/video/gst-plugin-closedcaption/build.rs
similarity index 100%
rename from gst-plugin-closedcaption/build.rs
rename to video/gst-plugin-closedcaption/build.rs
diff --git a/gst-plugin-closedcaption/src/c/LICENSE.txt b/video/gst-plugin-closedcaption/src/c/LICENSE.txt
similarity index 100%
rename from gst-plugin-closedcaption/src/c/LICENSE.txt
rename to video/gst-plugin-closedcaption/src/c/LICENSE.txt
diff --git a/gst-plugin-closedcaption/src/c/all.h b/video/gst-plugin-closedcaption/src/c/all.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/all.h
rename to video/gst-plugin-closedcaption/src/c/all.h
diff --git a/gst-plugin-closedcaption/src/c/caption.c b/video/gst-plugin-closedcaption/src/c/caption.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/caption.c
rename to video/gst-plugin-closedcaption/src/c/caption.c
diff --git a/gst-plugin-closedcaption/src/c/caption.h b/video/gst-plugin-closedcaption/src/c/caption.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/caption.h
rename to video/gst-plugin-closedcaption/src/c/caption.h
diff --git a/gst-plugin-closedcaption/src/c/eia608.c b/video/gst-plugin-closedcaption/src/c/eia608.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/eia608.c
rename to video/gst-plugin-closedcaption/src/c/eia608.c
diff --git a/gst-plugin-closedcaption/src/c/eia608.h b/video/gst-plugin-closedcaption/src/c/eia608.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/eia608.h
rename to video/gst-plugin-closedcaption/src/c/eia608.h
diff --git a/gst-plugin-closedcaption/src/c/eia608_charmap.c b/video/gst-plugin-closedcaption/src/c/eia608_charmap.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/eia608_charmap.c
rename to video/gst-plugin-closedcaption/src/c/eia608_charmap.c
diff --git a/gst-plugin-closedcaption/src/c/eia608_charmap.h b/video/gst-plugin-closedcaption/src/c/eia608_charmap.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/eia608_charmap.h
rename to video/gst-plugin-closedcaption/src/c/eia608_charmap.h
diff --git a/gst-plugin-closedcaption/src/c/eia608_from_utf8.c b/video/gst-plugin-closedcaption/src/c/eia608_from_utf8.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/eia608_from_utf8.c
rename to video/gst-plugin-closedcaption/src/c/eia608_from_utf8.c
diff --git a/gst-plugin-closedcaption/src/c/utf8.c b/video/gst-plugin-closedcaption/src/c/utf8.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/utf8.c
rename to video/gst-plugin-closedcaption/src/c/utf8.c
diff --git a/gst-plugin-closedcaption/src/c/utf8.h b/video/gst-plugin-closedcaption/src/c/utf8.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/utf8.h
rename to video/gst-plugin-closedcaption/src/c/utf8.h
diff --git a/gst-plugin-closedcaption/src/c/version.txt b/video/gst-plugin-closedcaption/src/c/version.txt
similarity index 100%
rename from gst-plugin-closedcaption/src/c/version.txt
rename to video/gst-plugin-closedcaption/src/c/version.txt
diff --git a/gst-plugin-closedcaption/src/c/xds.c b/video/gst-plugin-closedcaption/src/c/xds.c
similarity index 100%
rename from gst-plugin-closedcaption/src/c/xds.c
rename to video/gst-plugin-closedcaption/src/c/xds.c
diff --git a/gst-plugin-closedcaption/src/c/xds.h b/video/gst-plugin-closedcaption/src/c/xds.h
similarity index 100%
rename from gst-plugin-closedcaption/src/c/xds.h
rename to video/gst-plugin-closedcaption/src/c/xds.h
diff --git a/gst-plugin-closedcaption/src/cea608tott.rs b/video/gst-plugin-closedcaption/src/cea608tott.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/cea608tott.rs
rename to video/gst-plugin-closedcaption/src/cea608tott.rs
diff --git a/gst-plugin-closedcaption/src/cea608tott_ffi.rs b/video/gst-plugin-closedcaption/src/cea608tott_ffi.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/cea608tott_ffi.rs
rename to video/gst-plugin-closedcaption/src/cea608tott_ffi.rs
diff --git a/gst-plugin-closedcaption/src/lib.rs b/video/gst-plugin-closedcaption/src/lib.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/lib.rs
rename to video/gst-plugin-closedcaption/src/lib.rs
diff --git a/gst-plugin-closedcaption/src/line_reader.rs b/video/gst-plugin-closedcaption/src/line_reader.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/line_reader.rs
rename to video/gst-plugin-closedcaption/src/line_reader.rs
diff --git a/gst-plugin-closedcaption/src/mcc_enc.rs b/video/gst-plugin-closedcaption/src/mcc_enc.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/mcc_enc.rs
rename to video/gst-plugin-closedcaption/src/mcc_enc.rs
diff --git a/gst-plugin-closedcaption/src/mcc_enc_headers.rs b/video/gst-plugin-closedcaption/src/mcc_enc_headers.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/mcc_enc_headers.rs
rename to video/gst-plugin-closedcaption/src/mcc_enc_headers.rs
diff --git a/gst-plugin-closedcaption/src/mcc_parse.rs b/video/gst-plugin-closedcaption/src/mcc_parse.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/mcc_parse.rs
rename to video/gst-plugin-closedcaption/src/mcc_parse.rs
diff --git a/gst-plugin-closedcaption/src/mcc_parser.rs b/video/gst-plugin-closedcaption/src/mcc_parser.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/mcc_parser.rs
rename to video/gst-plugin-closedcaption/src/mcc_parser.rs
diff --git a/gst-plugin-closedcaption/src/scc_enc.rs b/video/gst-plugin-closedcaption/src/scc_enc.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/scc_enc.rs
rename to video/gst-plugin-closedcaption/src/scc_enc.rs
diff --git a/gst-plugin-closedcaption/src/scc_parse.rs b/video/gst-plugin-closedcaption/src/scc_parse.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/scc_parse.rs
rename to video/gst-plugin-closedcaption/src/scc_parse.rs
diff --git a/gst-plugin-closedcaption/src/scc_parser.rs b/video/gst-plugin-closedcaption/src/scc_parser.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/scc_parser.rs
rename to video/gst-plugin-closedcaption/src/scc_parser.rs
diff --git a/gst-plugin-closedcaption/src/tttocea608.rs b/video/gst-plugin-closedcaption/src/tttocea608.rs
similarity index 100%
rename from gst-plugin-closedcaption/src/tttocea608.rs
rename to video/gst-plugin-closedcaption/src/tttocea608.rs
diff --git a/gst-plugin-closedcaption/tests/captions-test_708.mcc b/video/gst-plugin-closedcaption/tests/captions-test_708.mcc
similarity index 100%
rename from gst-plugin-closedcaption/tests/captions-test_708.mcc
rename to video/gst-plugin-closedcaption/tests/captions-test_708.mcc
diff --git a/gst-plugin-closedcaption/tests/cea608tott.rs b/video/gst-plugin-closedcaption/tests/cea608tott.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/cea608tott.rs
rename to video/gst-plugin-closedcaption/tests/cea608tott.rs
diff --git a/gst-plugin-closedcaption/tests/dn2018-1217.scc b/video/gst-plugin-closedcaption/tests/dn2018-1217.scc
similarity index 100%
rename from gst-plugin-closedcaption/tests/dn2018-1217.scc
rename to video/gst-plugin-closedcaption/tests/dn2018-1217.scc
diff --git a/gst-plugin-closedcaption/tests/mcc_enc.rs b/video/gst-plugin-closedcaption/tests/mcc_enc.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/mcc_enc.rs
rename to video/gst-plugin-closedcaption/tests/mcc_enc.rs
diff --git a/gst-plugin-closedcaption/tests/mcc_parse.rs b/video/gst-plugin-closedcaption/tests/mcc_parse.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/mcc_parse.rs
rename to video/gst-plugin-closedcaption/tests/mcc_parse.rs
diff --git a/gst-plugin-closedcaption/tests/scc_enc.rs b/video/gst-plugin-closedcaption/tests/scc_enc.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/scc_enc.rs
rename to video/gst-plugin-closedcaption/tests/scc_enc.rs
diff --git a/gst-plugin-closedcaption/tests/scc_parse.rs b/video/gst-plugin-closedcaption/tests/scc_parse.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/scc_parse.rs
rename to video/gst-plugin-closedcaption/tests/scc_parse.rs
diff --git a/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc b/video/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc
similarity index 100%
rename from gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc
rename to video/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc
diff --git a/gst-plugin-closedcaption/tests/tttocea608.rs b/video/gst-plugin-closedcaption/tests/tttocea608.rs
similarity index 100%
rename from gst-plugin-closedcaption/tests/tttocea608.rs
rename to video/gst-plugin-closedcaption/tests/tttocea608.rs
diff --git a/gst-plugin-dav1d/Cargo.toml b/video/gst-plugin-dav1d/Cargo.toml
similarity index 90%
rename from gst-plugin-dav1d/Cargo.toml
rename to video/gst-plugin-dav1d/Cargo.toml
index 6928969d..8f57ce83 100644
--- a/gst-plugin-dav1d/Cargo.toml
+++ b/video/gst-plugin-dav1d/Cargo.toml
@@ -21,7 +21,7 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path = "../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path = "../../gst-plugin-version-helper" }
 
 [features]
 build = ["dav1d/build"]
diff --git a/gst-plugin-reqwest/build.rs b/video/gst-plugin-dav1d/build.rs
similarity index 100%
rename from gst-plugin-reqwest/build.rs
rename to video/gst-plugin-dav1d/build.rs
diff --git a/gst-plugin-dav1d/src/dav1ddec.rs b/video/gst-plugin-dav1d/src/dav1ddec.rs
similarity index 100%
rename from gst-plugin-dav1d/src/dav1ddec.rs
rename to video/gst-plugin-dav1d/src/dav1ddec.rs
diff --git a/gst-plugin-dav1d/src/lib.rs b/video/gst-plugin-dav1d/src/lib.rs
similarity index 100%
rename from gst-plugin-dav1d/src/lib.rs
rename to video/gst-plugin-dav1d/src/lib.rs
diff --git a/gst-plugin-flv/Cargo.toml b/video/gst-plugin-flv/Cargo.toml
similarity index 91%
rename from gst-plugin-flv/Cargo.toml
rename to video/gst-plugin-flv/Cargo.toml
index fc775894..d17b3290 100644
--- a/gst-plugin-flv/Cargo.toml
+++ b/video/gst-plugin-flv/Cargo.toml
@@ -26,4 +26,4 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-rusoto/build.rs b/video/gst-plugin-flv/build.rs
similarity index 100%
rename from gst-plugin-rusoto/build.rs
rename to video/gst-plugin-flv/build.rs
diff --git a/gst-plugin-flv/src/bytes.rs b/video/gst-plugin-flv/src/bytes.rs
similarity index 100%
rename from gst-plugin-flv/src/bytes.rs
rename to video/gst-plugin-flv/src/bytes.rs
diff --git a/gst-plugin-flv/src/flvdemux.rs b/video/gst-plugin-flv/src/flvdemux.rs
similarity index 100%
rename from gst-plugin-flv/src/flvdemux.rs
rename to video/gst-plugin-flv/src/flvdemux.rs
diff --git a/gst-plugin-flv/src/lib.rs b/video/gst-plugin-flv/src/lib.rs
similarity index 100%
rename from gst-plugin-flv/src/lib.rs
rename to video/gst-plugin-flv/src/lib.rs
diff --git a/gst-plugin-gif/Cargo.toml b/video/gst-plugin-gif/Cargo.toml
similarity index 91%
rename from gst-plugin-gif/Cargo.toml
rename to video/gst-plugin-gif/Cargo.toml
index c858a7d4..18fa6b3e 100644
--- a/gst-plugin-gif/Cargo.toml
+++ b/video/gst-plugin-gif/Cargo.toml
@@ -25,4 +25,4 @@ name = "testvideosrc2gif"
 path = "examples/testvideosrc2gif.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-sodium/build.rs b/video/gst-plugin-gif/build.rs
similarity index 100%
rename from gst-plugin-sodium/build.rs
rename to video/gst-plugin-gif/build.rs
diff --git a/gst-plugin-gif/examples/testvideosrc2gif.rs b/video/gst-plugin-gif/examples/testvideosrc2gif.rs
similarity index 100%
rename from gst-plugin-gif/examples/testvideosrc2gif.rs
rename to video/gst-plugin-gif/examples/testvideosrc2gif.rs
diff --git a/gst-plugin-gif/src/gifenc.rs b/video/gst-plugin-gif/src/gifenc.rs
similarity index 100%
rename from gst-plugin-gif/src/gifenc.rs
rename to video/gst-plugin-gif/src/gifenc.rs
diff --git a/gst-plugin-gif/src/lib.rs b/video/gst-plugin-gif/src/lib.rs
similarity index 100%
rename from gst-plugin-gif/src/lib.rs
rename to video/gst-plugin-gif/src/lib.rs
diff --git a/gst-plugin-gif/tests/gifenc.rs b/video/gst-plugin-gif/tests/gifenc.rs
similarity index 100%
rename from gst-plugin-gif/tests/gifenc.rs
rename to video/gst-plugin-gif/tests/gifenc.rs
diff --git a/gst-plugin-rav1e/Cargo.toml b/video/gst-plugin-rav1e/Cargo.toml
similarity index 91%
rename from gst-plugin-rav1e/Cargo.toml
rename to video/gst-plugin-rav1e/Cargo.toml
index e7e90e23..fc29cab9 100644
--- a/gst-plugin-rav1e/Cargo.toml
+++ b/video/gst-plugin-rav1e/Cargo.toml
@@ -22,4 +22,4 @@ crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../../gst-plugin-version-helper" }
diff --git a/gst-plugin-togglerecord/build.rs b/video/gst-plugin-rav1e/build.rs
similarity index 100%
rename from gst-plugin-togglerecord/build.rs
rename to video/gst-plugin-rav1e/build.rs
diff --git a/gst-plugin-rav1e/src/lib.rs b/video/gst-plugin-rav1e/src/lib.rs
similarity index 100%
rename from gst-plugin-rav1e/src/lib.rs
rename to video/gst-plugin-rav1e/src/lib.rs
diff --git a/gst-plugin-rav1e/src/rav1enc.rs b/video/gst-plugin-rav1e/src/rav1enc.rs
similarity index 100%
rename from gst-plugin-rav1e/src/rav1enc.rs
rename to video/gst-plugin-rav1e/src/rav1enc.rs
diff --git a/gst-plugin-rav1e/tests/rav1enc.rs b/video/gst-plugin-rav1e/tests/rav1enc.rs
similarity index 100%
rename from gst-plugin-rav1e/tests/rav1enc.rs
rename to video/gst-plugin-rav1e/tests/rav1enc.rs