diff --git a/Cargo.toml b/Cargo.toml
index 0e29b655..181fb547 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,25 +1,25 @@
 [workspace]
 
 members = [
-    "gst-plugin-tutorial",
-    "gst-plugin-version-helper",
-    "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",
+    "tutorial",
+    "version-helper",
+    "audio/audiofx",
+    "audio/claxon",
+    "audio/csound",
+    "audio/lewton",
+    "generic/file",
+    "generic/sodium",
+    "generic/threadshare",
+    "net/reqwest",
+    "net/rusoto",
+    "utils/fallbackswitch",
+    "utils/togglerecord",
+    "video/cdg",
+    "video/closedcaption",
+    "video/dav1d",
+    "video/flv",
+    "video/gif",
+    "video/rav1e",
 ]
 
 [profile.release]
diff --git a/audio/gst-plugin-audiofx/Cargo.toml b/audio/audiofx/Cargo.toml
similarity index 93%
rename from audio/gst-plugin-audiofx/Cargo.toml
rename to audio/audiofx/Cargo.toml
index b9dafb34..f7a49088 100644
--- a/audio/gst-plugin-audiofx/Cargo.toml
+++ b/audio/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="../../version-helper" }
diff --git a/audio/gst-plugin-audiofx/build.rs b/audio/audiofx/build.rs
similarity index 100%
rename from audio/gst-plugin-audiofx/build.rs
rename to audio/audiofx/build.rs
diff --git a/audio/gst-plugin-audiofx/src/audioecho.rs b/audio/audiofx/src/audioecho.rs
similarity index 100%
rename from audio/gst-plugin-audiofx/src/audioecho.rs
rename to audio/audiofx/src/audioecho.rs
diff --git a/audio/gst-plugin-audiofx/src/audioloudnorm.rs b/audio/audiofx/src/audioloudnorm.rs
similarity index 100%
rename from audio/gst-plugin-audiofx/src/audioloudnorm.rs
rename to audio/audiofx/src/audioloudnorm.rs
diff --git a/audio/gst-plugin-audiofx/src/lib.rs b/audio/audiofx/src/lib.rs
similarity index 100%
rename from audio/gst-plugin-audiofx/src/lib.rs
rename to audio/audiofx/src/lib.rs
diff --git a/audio/gst-plugin-audiofx/tests/audioloudnorm.rs b/audio/audiofx/tests/audioloudnorm.rs
similarity index 100%
rename from audio/gst-plugin-audiofx/tests/audioloudnorm.rs
rename to audio/audiofx/tests/audioloudnorm.rs
diff --git a/audio/gst-plugin-claxon/Cargo.toml b/audio/claxon/Cargo.toml
similarity index 91%
rename from audio/gst-plugin-claxon/Cargo.toml
rename to audio/claxon/Cargo.toml
index 75949eec..7cbc1fbc 100644
--- a/audio/gst-plugin-claxon/Cargo.toml
+++ b/audio/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="../../version-helper" }
diff --git a/audio/gst-plugin-claxon/build.rs b/audio/claxon/build.rs
similarity index 100%
rename from audio/gst-plugin-claxon/build.rs
rename to audio/claxon/build.rs
diff --git a/audio/gst-plugin-claxon/src/claxondec.rs b/audio/claxon/src/claxondec.rs
similarity index 100%
rename from audio/gst-plugin-claxon/src/claxondec.rs
rename to audio/claxon/src/claxondec.rs
diff --git a/audio/gst-plugin-claxon/src/lib.rs b/audio/claxon/src/lib.rs
similarity index 100%
rename from audio/gst-plugin-claxon/src/lib.rs
rename to audio/claxon/src/lib.rs
diff --git a/audio/gst-plugin-claxon/tests/claxondec.rs b/audio/claxon/tests/claxondec.rs
similarity index 100%
rename from audio/gst-plugin-claxon/tests/claxondec.rs
rename to audio/claxon/tests/claxondec.rs
diff --git a/audio/gst-plugin-claxon/tests/test_mono_s16.flac b/audio/claxon/tests/test_mono_s16.flac
similarity index 100%
rename from audio/gst-plugin-claxon/tests/test_mono_s16.flac
rename to audio/claxon/tests/test_mono_s16.flac
diff --git a/audio/gst-plugin-claxon/tests/test_stereo_s32.flac b/audio/claxon/tests/test_stereo_s32.flac
similarity index 100%
rename from audio/gst-plugin-claxon/tests/test_stereo_s32.flac
rename to audio/claxon/tests/test_stereo_s32.flac
diff --git a/audio/gst-plugin-csound/Cargo.toml b/audio/csound/Cargo.toml
similarity index 93%
rename from audio/gst-plugin-csound/Cargo.toml
rename to audio/csound/Cargo.toml
index 69ab1daf..ed676228 100644
--- a/audio/gst-plugin-csound/Cargo.toml
+++ b/audio/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 = "../../version-helper" }
diff --git a/audio/gst-plugin-csound/README.md b/audio/csound/README.md
similarity index 100%
rename from audio/gst-plugin-csound/README.md
rename to audio/csound/README.md
diff --git a/audio/gst-plugin-csound/build.rs b/audio/csound/build.rs
similarity index 100%
rename from audio/gst-plugin-csound/build.rs
rename to audio/csound/build.rs
diff --git a/audio/gst-plugin-csound/examples/effect_example.rs b/audio/csound/examples/effect_example.rs
similarity index 100%
rename from audio/gst-plugin-csound/examples/effect_example.rs
rename to audio/csound/examples/effect_example.rs
diff --git a/audio/gst-plugin-csound/src/filter.rs b/audio/csound/src/filter.rs
similarity index 100%
rename from audio/gst-plugin-csound/src/filter.rs
rename to audio/csound/src/filter.rs
diff --git a/audio/gst-plugin-csound/src/lib.rs b/audio/csound/src/lib.rs
similarity index 100%
rename from audio/gst-plugin-csound/src/lib.rs
rename to audio/csound/src/lib.rs
diff --git a/audio/gst-plugin-csound/tests/csound_filter.rs b/audio/csound/tests/csound_filter.rs
similarity index 100%
rename from audio/gst-plugin-csound/tests/csound_filter.rs
rename to audio/csound/tests/csound_filter.rs
diff --git a/audio/gst-plugin-lewton/Cargo.toml b/audio/lewton/Cargo.toml
similarity index 91%
rename from audio/gst-plugin-lewton/Cargo.toml
rename to audio/lewton/Cargo.toml
index c12b4efb..44af2444 100644
--- a/audio/gst-plugin-lewton/Cargo.toml
+++ b/audio/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="../../version-helper" }
diff --git a/audio/gst-plugin-lewton/build.rs b/audio/lewton/build.rs
similarity index 100%
rename from audio/gst-plugin-lewton/build.rs
rename to audio/lewton/build.rs
diff --git a/audio/gst-plugin-lewton/src/lewtondec.rs b/audio/lewton/src/lewtondec.rs
similarity index 100%
rename from audio/gst-plugin-lewton/src/lewtondec.rs
rename to audio/lewton/src/lewtondec.rs
diff --git a/audio/gst-plugin-lewton/src/lib.rs b/audio/lewton/src/lib.rs
similarity index 100%
rename from audio/gst-plugin-lewton/src/lib.rs
rename to audio/lewton/src/lib.rs
diff --git a/audio/gst-plugin-lewton/tests/lewtondec.rs b/audio/lewton/tests/lewtondec.rs
similarity index 100%
rename from audio/gst-plugin-lewton/tests/lewtondec.rs
rename to audio/lewton/tests/lewtondec.rs
diff --git a/audio/gst-plugin-lewton/tests/test.vorbis b/audio/lewton/tests/test.vorbis
similarity index 100%
rename from audio/gst-plugin-lewton/tests/test.vorbis
rename to audio/lewton/tests/test.vorbis
diff --git a/generic/gst-plugin-file/Cargo.toml b/generic/file/Cargo.toml
similarity index 89%
rename from generic/gst-plugin-file/Cargo.toml
rename to generic/file/Cargo.toml
index bc1949c4..7cbc5fc5 100644
--- a/generic/gst-plugin-file/Cargo.toml
+++ b/generic/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="../../version-helper" }
diff --git a/generic/gst-plugin-file/build.rs b/generic/file/build.rs
similarity index 100%
rename from generic/gst-plugin-file/build.rs
rename to generic/file/build.rs
diff --git a/generic/gst-plugin-file/src/file_location.rs b/generic/file/src/file_location.rs
similarity index 100%
rename from generic/gst-plugin-file/src/file_location.rs
rename to generic/file/src/file_location.rs
diff --git a/generic/gst-plugin-file/src/filesink.rs b/generic/file/src/filesink.rs
similarity index 100%
rename from generic/gst-plugin-file/src/filesink.rs
rename to generic/file/src/filesink.rs
diff --git a/generic/gst-plugin-file/src/filesrc.rs b/generic/file/src/filesrc.rs
similarity index 100%
rename from generic/gst-plugin-file/src/filesrc.rs
rename to generic/file/src/filesrc.rs
diff --git a/generic/gst-plugin-file/src/lib.rs b/generic/file/src/lib.rs
similarity index 100%
rename from generic/gst-plugin-file/src/lib.rs
rename to generic/file/src/lib.rs
diff --git a/generic/gst-plugin-sodium/Cargo.toml b/generic/sodium/Cargo.toml
similarity index 95%
rename from generic/gst-plugin-sodium/Cargo.toml
rename to generic/sodium/Cargo.toml
index 85f44983..a862ef9f 100644
--- a/generic/gst-plugin-sodium/Cargo.toml
+++ b/generic/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="../../version-helper" }
diff --git a/generic/gst-plugin-sodium/build.rs b/generic/sodium/build.rs
similarity index 100%
rename from generic/gst-plugin-sodium/build.rs
rename to generic/sodium/build.rs
diff --git a/generic/gst-plugin-sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
similarity index 100%
rename from generic/gst-plugin-sodium/examples/decrypt_example.rs
rename to generic/sodium/examples/decrypt_example.rs
diff --git a/generic/gst-plugin-sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs
similarity index 100%
rename from generic/gst-plugin-sodium/examples/encrypt_example.rs
rename to generic/sodium/examples/encrypt_example.rs
diff --git a/generic/gst-plugin-sodium/examples/generate_keys.rs b/generic/sodium/examples/generate_keys.rs
similarity index 100%
rename from generic/gst-plugin-sodium/examples/generate_keys.rs
rename to generic/sodium/examples/generate_keys.rs
diff --git a/generic/gst-plugin-sodium/examples/receiver_sample.json b/generic/sodium/examples/receiver_sample.json
similarity index 100%
rename from generic/gst-plugin-sodium/examples/receiver_sample.json
rename to generic/sodium/examples/receiver_sample.json
diff --git a/generic/gst-plugin-sodium/examples/sender_sample.json b/generic/sodium/examples/sender_sample.json
similarity index 100%
rename from generic/gst-plugin-sodium/examples/sender_sample.json
rename to generic/sodium/examples/sender_sample.json
diff --git a/generic/gst-plugin-sodium/src/decrypter.rs b/generic/sodium/src/decrypter.rs
similarity index 100%
rename from generic/gst-plugin-sodium/src/decrypter.rs
rename to generic/sodium/src/decrypter.rs
diff --git a/generic/gst-plugin-sodium/src/encrypter.rs b/generic/sodium/src/encrypter.rs
similarity index 100%
rename from generic/gst-plugin-sodium/src/encrypter.rs
rename to generic/sodium/src/encrypter.rs
diff --git a/generic/gst-plugin-sodium/src/lib.rs b/generic/sodium/src/lib.rs
similarity index 100%
rename from generic/gst-plugin-sodium/src/lib.rs
rename to generic/sodium/src/lib.rs
diff --git a/generic/gst-plugin-sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
similarity index 100%
rename from generic/gst-plugin-sodium/tests/decrypter.rs
rename to generic/sodium/tests/decrypter.rs
diff --git a/generic/gst-plugin-sodium/tests/encrypted_sample.enc b/generic/sodium/tests/encrypted_sample.enc
similarity index 100%
rename from generic/gst-plugin-sodium/tests/encrypted_sample.enc
rename to generic/sodium/tests/encrypted_sample.enc
diff --git a/generic/gst-plugin-sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
similarity index 100%
rename from generic/gst-plugin-sodium/tests/encrypter.rs
rename to generic/sodium/tests/encrypter.rs
diff --git a/generic/gst-plugin-sodium/tests/sample.mp3 b/generic/sodium/tests/sample.mp3
similarity index 100%
rename from generic/gst-plugin-sodium/tests/sample.mp3
rename to generic/sodium/tests/sample.mp3
diff --git a/generic/gst-plugin-threadshare/Cargo.toml b/generic/threadshare/Cargo.toml
similarity index 96%
rename from generic/gst-plugin-threadshare/Cargo.toml
rename to generic/threadshare/Cargo.toml
index 3186d56a..e6771d8a 100644
--- a/generic/gst-plugin-threadshare/Cargo.toml
+++ b/generic/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="../../version-helper" }
 cc = "1.0.38"
 pkg-config = "0.3.15"
diff --git a/generic/gst-plugin-threadshare/build.rs b/generic/threadshare/build.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/build.rs
rename to generic/threadshare/build.rs
diff --git a/generic/gst-plugin-threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/examples/benchmark.rs
rename to generic/threadshare/examples/benchmark.rs
diff --git a/generic/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs b/generic/threadshare/examples/tcpclientsrc_benchmark_sender.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs
rename to generic/threadshare/examples/tcpclientsrc_benchmark_sender.rs
diff --git a/generic/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs b/generic/threadshare/examples/udpsrc_benchmark_sender.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs
rename to generic/threadshare/examples/udpsrc_benchmark_sender.rs
diff --git a/generic/gst-plugin-threadshare/src/appsrc.rs b/generic/threadshare/src/appsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/appsrc.rs
rename to generic/threadshare/src/appsrc.rs
diff --git a/generic/gst-plugin-threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/dataqueue.rs
rename to generic/threadshare/src/dataqueue.rs
diff --git a/generic/gst-plugin-threadshare/src/inputselector.rs b/generic/threadshare/src/inputselector.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/inputselector.rs
rename to generic/threadshare/src/inputselector.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
rename to generic/threadshare/src/jitterbuffer/jitterbuffer.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs b/generic/threadshare/src/jitterbuffer/mod.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs
rename to generic/threadshare/src/jitterbuffer/mod.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.c
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c
rename to generic/threadshare/src/jitterbuffer/rtpjitterbuffer.c
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.h
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h
rename to generic/threadshare/src/jitterbuffer/rtpjitterbuffer.h
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c b/generic/threadshare/src/jitterbuffer/rtpstats.c
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c
rename to generic/threadshare/src/jitterbuffer/rtpstats.c
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h b/generic/threadshare/src/jitterbuffer/rtpstats.h
similarity index 100%
rename from generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h
rename to generic/threadshare/src/jitterbuffer/rtpstats.h
diff --git a/generic/gst-plugin-threadshare/src/lib.rs b/generic/threadshare/src/lib.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/lib.rs
rename to generic/threadshare/src/lib.rs
diff --git a/generic/gst-plugin-threadshare/src/proxy.rs b/generic/threadshare/src/proxy.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/proxy.rs
rename to generic/threadshare/src/proxy.rs
diff --git a/generic/gst-plugin-threadshare/src/queue.rs b/generic/threadshare/src/queue.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/queue.rs
rename to generic/threadshare/src/queue.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/executor.rs b/generic/threadshare/src/runtime/executor.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/runtime/executor.rs
rename to generic/threadshare/src/runtime/executor.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/mod.rs b/generic/threadshare/src/runtime/mod.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/runtime/mod.rs
rename to generic/threadshare/src/runtime/mod.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/runtime/pad.rs
rename to generic/threadshare/src/runtime/pad.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/task.rs b/generic/threadshare/src/runtime/task.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/runtime/task.rs
rename to generic/threadshare/src/runtime/task.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/time.rs b/generic/threadshare/src/runtime/time.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/runtime/time.rs
rename to generic/threadshare/src/runtime/time.rs
diff --git a/generic/gst-plugin-threadshare/src/socket.rs b/generic/threadshare/src/socket.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/socket.rs
rename to generic/threadshare/src/socket.rs
diff --git a/generic/gst-plugin-threadshare/src/tcpclientsrc.rs b/generic/threadshare/src/tcpclientsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/tcpclientsrc.rs
rename to generic/threadshare/src/tcpclientsrc.rs
diff --git a/generic/gst-plugin-threadshare/src/udpsink.rs b/generic/threadshare/src/udpsink.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/udpsink.rs
rename to generic/threadshare/src/udpsink.rs
diff --git a/generic/gst-plugin-threadshare/src/udpsrc.rs b/generic/threadshare/src/udpsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/src/udpsrc.rs
rename to generic/threadshare/src/udpsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/appsrc.rs b/generic/threadshare/tests/appsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/appsrc.rs
rename to generic/threadshare/tests/appsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/inputselector.rs b/generic/threadshare/tests/inputselector.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/inputselector.rs
rename to generic/threadshare/tests/inputselector.rs
diff --git a/generic/gst-plugin-threadshare/tests/jitterbuffer.rs b/generic/threadshare/tests/jitterbuffer.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/jitterbuffer.rs
rename to generic/threadshare/tests/jitterbuffer.rs
diff --git a/generic/gst-plugin-threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/pad.rs
rename to generic/threadshare/tests/pad.rs
diff --git a/generic/gst-plugin-threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/pipeline.rs
rename to generic/threadshare/tests/pipeline.rs
diff --git a/generic/gst-plugin-threadshare/tests/proxy.rs b/generic/threadshare/tests/proxy.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/proxy.rs
rename to generic/threadshare/tests/proxy.rs
diff --git a/generic/gst-plugin-threadshare/tests/queue.rs b/generic/threadshare/tests/queue.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/queue.rs
rename to generic/threadshare/tests/queue.rs
diff --git a/generic/gst-plugin-threadshare/tests/tcpclientsrc.rs b/generic/threadshare/tests/tcpclientsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/tcpclientsrc.rs
rename to generic/threadshare/tests/tcpclientsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/udpsink.rs b/generic/threadshare/tests/udpsink.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/udpsink.rs
rename to generic/threadshare/tests/udpsink.rs
diff --git a/generic/gst-plugin-threadshare/tests/udpsrc.rs b/generic/threadshare/tests/udpsrc.rs
similarity index 100%
rename from generic/gst-plugin-threadshare/tests/udpsrc.rs
rename to generic/threadshare/tests/udpsrc.rs
diff --git a/net/gst-plugin-reqwest/Cargo.toml b/net/reqwest/Cargo.toml
similarity index 92%
rename from net/gst-plugin-reqwest/Cargo.toml
rename to net/reqwest/Cargo.toml
index 7ef9c897..5cd0ffc5 100644
--- a/net/gst-plugin-reqwest/Cargo.toml
+++ b/net/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="../../version-helper" }
diff --git a/gst-plugin-tutorial/build.rs b/net/reqwest/build.rs
similarity index 100%
rename from gst-plugin-tutorial/build.rs
rename to net/reqwest/build.rs
diff --git a/net/gst-plugin-reqwest/src/lib.rs b/net/reqwest/src/lib.rs
similarity index 100%
rename from net/gst-plugin-reqwest/src/lib.rs
rename to net/reqwest/src/lib.rs
diff --git a/net/gst-plugin-reqwest/src/reqwesthttpsrc.rs b/net/reqwest/src/reqwesthttpsrc.rs
similarity index 100%
rename from net/gst-plugin-reqwest/src/reqwesthttpsrc.rs
rename to net/reqwest/src/reqwesthttpsrc.rs
diff --git a/net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs
similarity index 100%
rename from net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs
rename to net/reqwest/tests/reqwesthttpsrc.rs
diff --git a/net/gst-plugin-rusoto/Cargo.toml b/net/rusoto/Cargo.toml
similarity index 91%
rename from net/gst-plugin-rusoto/Cargo.toml
rename to net/rusoto/Cargo.toml
index 65777222..a10c3923 100644
--- a/net/gst-plugin-rusoto/Cargo.toml
+++ b/net/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="../../version-helper" }
diff --git a/net/gst-plugin-rusoto/README.md b/net/rusoto/README.md
similarity index 100%
rename from net/gst-plugin-rusoto/README.md
rename to net/rusoto/README.md
diff --git a/net/gst-plugin-reqwest/build.rs b/net/rusoto/build.rs
similarity index 100%
rename from net/gst-plugin-reqwest/build.rs
rename to net/rusoto/build.rs
diff --git a/net/gst-plugin-rusoto/src/lib.rs b/net/rusoto/src/lib.rs
similarity index 100%
rename from net/gst-plugin-rusoto/src/lib.rs
rename to net/rusoto/src/lib.rs
diff --git a/net/gst-plugin-rusoto/src/s3sink.rs b/net/rusoto/src/s3sink.rs
similarity index 100%
rename from net/gst-plugin-rusoto/src/s3sink.rs
rename to net/rusoto/src/s3sink.rs
diff --git a/net/gst-plugin-rusoto/src/s3src.rs b/net/rusoto/src/s3src.rs
similarity index 100%
rename from net/gst-plugin-rusoto/src/s3src.rs
rename to net/rusoto/src/s3src.rs
diff --git a/net/gst-plugin-rusoto/src/s3url.rs b/net/rusoto/src/s3url.rs
similarity index 100%
rename from net/gst-plugin-rusoto/src/s3url.rs
rename to net/rusoto/src/s3url.rs
diff --git a/net/gst-plugin-rusoto/src/s3utils.rs b/net/rusoto/src/s3utils.rs
similarity index 100%
rename from net/gst-plugin-rusoto/src/s3utils.rs
rename to net/rusoto/src/s3utils.rs
diff --git a/gst-plugin-tutorial/Cargo.toml b/tutorial/Cargo.toml
similarity index 92%
rename from gst-plugin-tutorial/Cargo.toml
rename to tutorial/Cargo.toml
index f19115dc..a57f5539 100644
--- a/gst-plugin-tutorial/Cargo.toml
+++ b/tutorial/Cargo.toml
@@ -23,4 +23,4 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [build-dependencies]
-gst-plugin-version-helper = { path="../gst-plugin-version-helper" }
+gst-plugin-version-helper = { path="../version-helper" }
diff --git a/gst-plugin-tutorial/README.md b/tutorial/README.md
similarity index 100%
rename from gst-plugin-tutorial/README.md
rename to tutorial/README.md
diff --git a/net/gst-plugin-rusoto/build.rs b/tutorial/build.rs
similarity index 100%
rename from net/gst-plugin-rusoto/build.rs
rename to tutorial/build.rs
diff --git a/gst-plugin-tutorial/img/bbb.jpg b/tutorial/img/bbb.jpg
similarity index 100%
rename from gst-plugin-tutorial/img/bbb.jpg
rename to tutorial/img/bbb.jpg
diff --git a/gst-plugin-tutorial/src/identity.rs b/tutorial/src/identity.rs
similarity index 100%
rename from gst-plugin-tutorial/src/identity.rs
rename to tutorial/src/identity.rs
diff --git a/gst-plugin-tutorial/src/lib.rs b/tutorial/src/lib.rs
similarity index 100%
rename from gst-plugin-tutorial/src/lib.rs
rename to tutorial/src/lib.rs
diff --git a/gst-plugin-tutorial/src/progressbin.rs b/tutorial/src/progressbin.rs
similarity index 100%
rename from gst-plugin-tutorial/src/progressbin.rs
rename to tutorial/src/progressbin.rs
diff --git a/gst-plugin-tutorial/src/rgb2gray.rs b/tutorial/src/rgb2gray.rs
similarity index 100%
rename from gst-plugin-tutorial/src/rgb2gray.rs
rename to tutorial/src/rgb2gray.rs
diff --git a/gst-plugin-tutorial/src/sinesrc.rs b/tutorial/src/sinesrc.rs
similarity index 100%
rename from gst-plugin-tutorial/src/sinesrc.rs
rename to tutorial/src/sinesrc.rs
diff --git a/gst-plugin-tutorial/tutorial-1.md b/tutorial/tutorial-1.md
similarity index 100%
rename from gst-plugin-tutorial/tutorial-1.md
rename to tutorial/tutorial-1.md
diff --git a/gst-plugin-tutorial/tutorial-2.md b/tutorial/tutorial-2.md
similarity index 100%
rename from gst-plugin-tutorial/tutorial-2.md
rename to tutorial/tutorial-2.md
diff --git a/utils/gst-plugin-fallbackswitch/Cargo.toml b/utils/fallbackswitch/Cargo.toml
similarity index 96%
rename from utils/gst-plugin-fallbackswitch/Cargo.toml
rename to utils/fallbackswitch/Cargo.toml
index bb6a8749..ed9ba904 100644
--- a/utils/gst-plugin-fallbackswitch/Cargo.toml
+++ b/utils/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="../../version-helper" }
 cc = "1.0"
 pkg-config = "0.3"
 
diff --git a/utils/gst-plugin-fallbackswitch/build.rs b/utils/fallbackswitch/build.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/build.rs
rename to utils/fallbackswitch/build.rs
diff --git a/utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs
rename to utils/fallbackswitch/examples/gtk_fallbackswitch.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/aggregator.rs b/utils/fallbackswitch/src/base/aggregator.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/aggregator.rs
rename to utils/fallbackswitch/src/base/aggregator.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs b/utils/fallbackswitch/src/base/aggregator_pad.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs
rename to utils/fallbackswitch/src/base/aggregator_pad.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs b/utils/fallbackswitch/src/base/auto/aggregator.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
rename to utils/fallbackswitch/src/base/auto/aggregator.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs b/utils/fallbackswitch/src/base/auto/aggregator_pad.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
rename to utils/fallbackswitch/src/base/auto/aggregator_pad.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/auto/mod.rs b/utils/fallbackswitch/src/base/auto/mod.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/auto/mod.rs
rename to utils/fallbackswitch/src/base/auto/mod.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.c b/utils/fallbackswitch/src/base/gstaggregator.c
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/gstaggregator.c
rename to utils/fallbackswitch/src/base/gstaggregator.c
diff --git a/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h b/utils/fallbackswitch/src/base/gstaggregator.h
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h
rename to utils/fallbackswitch/src/base/gstaggregator.h
diff --git a/utils/gst-plugin-fallbackswitch/src/base/mod.rs b/utils/fallbackswitch/src/base/mod.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/mod.rs
rename to utils/fallbackswitch/src/base/mod.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
rename to utils/fallbackswitch/src/base/subclass/aggregator.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
rename to utils/fallbackswitch/src/base/subclass/aggregator_pad.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/subclass/mod.rs b/utils/fallbackswitch/src/base/subclass/mod.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/subclass/mod.rs
rename to utils/fallbackswitch/src/base/subclass/mod.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/sys.rs b/utils/fallbackswitch/src/base/sys.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/sys.rs
rename to utils/fallbackswitch/src/base/sys.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/utils.rs b/utils/fallbackswitch/src/base/utils.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/base/utils.rs
rename to utils/fallbackswitch/src/base/utils.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs b/utils/fallbackswitch/src/fallbackswitch.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs
rename to utils/fallbackswitch/src/fallbackswitch.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/lib.rs b/utils/fallbackswitch/src/lib.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/src/lib.rs
rename to utils/fallbackswitch/src/lib.rs
diff --git a/utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs
similarity index 100%
rename from utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs
rename to utils/fallbackswitch/tests/fallbackswitch.rs
diff --git a/utils/gst-plugin-togglerecord/Cargo.toml b/utils/togglerecord/Cargo.toml
similarity index 93%
rename from utils/gst-plugin-togglerecord/Cargo.toml
rename to utils/togglerecord/Cargo.toml
index ac25dba0..df94b677 100644
--- a/utils/gst-plugin-togglerecord/Cargo.toml
+++ b/utils/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="../../version-helper" }
diff --git a/utils/gst-plugin-togglerecord/LICENSE b/utils/togglerecord/LICENSE
similarity index 100%
rename from utils/gst-plugin-togglerecord/LICENSE
rename to utils/togglerecord/LICENSE
diff --git a/utils/gst-plugin-togglerecord/build.rs b/utils/togglerecord/build.rs
similarity index 100%
rename from utils/gst-plugin-togglerecord/build.rs
rename to utils/togglerecord/build.rs
diff --git a/utils/gst-plugin-togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs
similarity index 100%
rename from utils/gst-plugin-togglerecord/examples/gtk_recording.rs
rename to utils/togglerecord/examples/gtk_recording.rs
diff --git a/utils/gst-plugin-togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs
similarity index 100%
rename from utils/gst-plugin-togglerecord/src/lib.rs
rename to utils/togglerecord/src/lib.rs
diff --git a/utils/gst-plugin-togglerecord/src/togglerecord.rs b/utils/togglerecord/src/togglerecord.rs
similarity index 100%
rename from utils/gst-plugin-togglerecord/src/togglerecord.rs
rename to utils/togglerecord/src/togglerecord.rs
diff --git a/utils/gst-plugin-togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs
similarity index 100%
rename from utils/gst-plugin-togglerecord/tests/tests.rs
rename to utils/togglerecord/tests/tests.rs
diff --git a/gst-plugin-version-helper/Cargo.toml b/version-helper/Cargo.toml
similarity index 100%
rename from gst-plugin-version-helper/Cargo.toml
rename to version-helper/Cargo.toml
diff --git a/gst-plugin-version-helper/LICENSE b/version-helper/LICENSE
similarity index 100%
rename from gst-plugin-version-helper/LICENSE
rename to version-helper/LICENSE
diff --git a/gst-plugin-version-helper/src/git.rs b/version-helper/src/git.rs
similarity index 100%
rename from gst-plugin-version-helper/src/git.rs
rename to version-helper/src/git.rs
diff --git a/gst-plugin-version-helper/src/lib.rs b/version-helper/src/lib.rs
similarity index 100%
rename from gst-plugin-version-helper/src/lib.rs
rename to version-helper/src/lib.rs
diff --git a/video/gst-plugin-cdg/Cargo.toml b/video/cdg/Cargo.toml
similarity index 92%
rename from video/gst-plugin-cdg/Cargo.toml
rename to video/cdg/Cargo.toml
index 6b75cf29..4ce1a51b 100644
--- a/video/gst-plugin-cdg/Cargo.toml
+++ b/video/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="../../version-helper" }
diff --git a/video/gst-plugin-cdg/build.rs b/video/cdg/build.rs
similarity index 100%
rename from video/gst-plugin-cdg/build.rs
rename to video/cdg/build.rs
diff --git a/video/gst-plugin-cdg/src/cdgdec.rs b/video/cdg/src/cdgdec.rs
similarity index 100%
rename from video/gst-plugin-cdg/src/cdgdec.rs
rename to video/cdg/src/cdgdec.rs
diff --git a/video/gst-plugin-cdg/src/cdgparse.rs b/video/cdg/src/cdgparse.rs
similarity index 100%
rename from video/gst-plugin-cdg/src/cdgparse.rs
rename to video/cdg/src/cdgparse.rs
diff --git a/video/gst-plugin-cdg/src/constants.rs b/video/cdg/src/constants.rs
similarity index 100%
rename from video/gst-plugin-cdg/src/constants.rs
rename to video/cdg/src/constants.rs
diff --git a/video/gst-plugin-cdg/src/lib.rs b/video/cdg/src/lib.rs
similarity index 100%
rename from video/gst-plugin-cdg/src/lib.rs
rename to video/cdg/src/lib.rs
diff --git a/video/gst-plugin-cdg/tests/BrotherJohn.cdg b/video/cdg/tests/BrotherJohn.cdg
similarity index 100%
rename from video/gst-plugin-cdg/tests/BrotherJohn.cdg
rename to video/cdg/tests/BrotherJohn.cdg
diff --git a/video/gst-plugin-cdg/tests/cdgdec.rs b/video/cdg/tests/cdgdec.rs
similarity index 100%
rename from video/gst-plugin-cdg/tests/cdgdec.rs
rename to video/cdg/tests/cdgdec.rs
diff --git a/video/gst-plugin-closedcaption/Cargo.toml b/video/closedcaption/Cargo.toml
similarity index 94%
rename from video/gst-plugin-closedcaption/Cargo.toml
rename to video/closedcaption/Cargo.toml
index a901f004..9f98dd27 100644
--- a/video/gst-plugin-closedcaption/Cargo.toml
+++ b/video/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="../../version-helper" }
 cc = "1.0"
diff --git a/video/gst-plugin-closedcaption/build.rs b/video/closedcaption/build.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/build.rs
rename to video/closedcaption/build.rs
diff --git a/video/gst-plugin-closedcaption/src/c/LICENSE.txt b/video/closedcaption/src/c/LICENSE.txt
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/LICENSE.txt
rename to video/closedcaption/src/c/LICENSE.txt
diff --git a/video/gst-plugin-closedcaption/src/c/all.h b/video/closedcaption/src/c/all.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/all.h
rename to video/closedcaption/src/c/all.h
diff --git a/video/gst-plugin-closedcaption/src/c/caption.c b/video/closedcaption/src/c/caption.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/caption.c
rename to video/closedcaption/src/c/caption.c
diff --git a/video/gst-plugin-closedcaption/src/c/caption.h b/video/closedcaption/src/c/caption.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/caption.h
rename to video/closedcaption/src/c/caption.h
diff --git a/video/gst-plugin-closedcaption/src/c/eia608.c b/video/closedcaption/src/c/eia608.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/eia608.c
rename to video/closedcaption/src/c/eia608.c
diff --git a/video/gst-plugin-closedcaption/src/c/eia608.h b/video/closedcaption/src/c/eia608.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/eia608.h
rename to video/closedcaption/src/c/eia608.h
diff --git a/video/gst-plugin-closedcaption/src/c/eia608_charmap.c b/video/closedcaption/src/c/eia608_charmap.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/eia608_charmap.c
rename to video/closedcaption/src/c/eia608_charmap.c
diff --git a/video/gst-plugin-closedcaption/src/c/eia608_charmap.h b/video/closedcaption/src/c/eia608_charmap.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/eia608_charmap.h
rename to video/closedcaption/src/c/eia608_charmap.h
diff --git a/video/gst-plugin-closedcaption/src/c/eia608_from_utf8.c b/video/closedcaption/src/c/eia608_from_utf8.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/eia608_from_utf8.c
rename to video/closedcaption/src/c/eia608_from_utf8.c
diff --git a/video/gst-plugin-closedcaption/src/c/utf8.c b/video/closedcaption/src/c/utf8.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/utf8.c
rename to video/closedcaption/src/c/utf8.c
diff --git a/video/gst-plugin-closedcaption/src/c/utf8.h b/video/closedcaption/src/c/utf8.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/utf8.h
rename to video/closedcaption/src/c/utf8.h
diff --git a/video/gst-plugin-closedcaption/src/c/version.txt b/video/closedcaption/src/c/version.txt
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/version.txt
rename to video/closedcaption/src/c/version.txt
diff --git a/video/gst-plugin-closedcaption/src/c/xds.c b/video/closedcaption/src/c/xds.c
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/xds.c
rename to video/closedcaption/src/c/xds.c
diff --git a/video/gst-plugin-closedcaption/src/c/xds.h b/video/closedcaption/src/c/xds.h
similarity index 100%
rename from video/gst-plugin-closedcaption/src/c/xds.h
rename to video/closedcaption/src/c/xds.h
diff --git a/video/gst-plugin-closedcaption/src/cea608tott.rs b/video/closedcaption/src/cea608tott.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/cea608tott.rs
rename to video/closedcaption/src/cea608tott.rs
diff --git a/video/gst-plugin-closedcaption/src/cea608tott_ffi.rs b/video/closedcaption/src/cea608tott_ffi.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/cea608tott_ffi.rs
rename to video/closedcaption/src/cea608tott_ffi.rs
diff --git a/video/gst-plugin-closedcaption/src/lib.rs b/video/closedcaption/src/lib.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/lib.rs
rename to video/closedcaption/src/lib.rs
diff --git a/video/gst-plugin-closedcaption/src/line_reader.rs b/video/closedcaption/src/line_reader.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/line_reader.rs
rename to video/closedcaption/src/line_reader.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_enc.rs b/video/closedcaption/src/mcc_enc.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/mcc_enc.rs
rename to video/closedcaption/src/mcc_enc.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_enc_headers.rs b/video/closedcaption/src/mcc_enc_headers.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/mcc_enc_headers.rs
rename to video/closedcaption/src/mcc_enc_headers.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_parse.rs b/video/closedcaption/src/mcc_parse.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/mcc_parse.rs
rename to video/closedcaption/src/mcc_parse.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_parser.rs b/video/closedcaption/src/mcc_parser.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/mcc_parser.rs
rename to video/closedcaption/src/mcc_parser.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_enc.rs b/video/closedcaption/src/scc_enc.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/scc_enc.rs
rename to video/closedcaption/src/scc_enc.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_parse.rs b/video/closedcaption/src/scc_parse.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/scc_parse.rs
rename to video/closedcaption/src/scc_parse.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_parser.rs b/video/closedcaption/src/scc_parser.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/scc_parser.rs
rename to video/closedcaption/src/scc_parser.rs
diff --git a/video/gst-plugin-closedcaption/src/tttocea608.rs b/video/closedcaption/src/tttocea608.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/src/tttocea608.rs
rename to video/closedcaption/src/tttocea608.rs
diff --git a/video/gst-plugin-closedcaption/tests/captions-test_708.mcc b/video/closedcaption/tests/captions-test_708.mcc
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/captions-test_708.mcc
rename to video/closedcaption/tests/captions-test_708.mcc
diff --git a/video/gst-plugin-closedcaption/tests/cea608tott.rs b/video/closedcaption/tests/cea608tott.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/cea608tott.rs
rename to video/closedcaption/tests/cea608tott.rs
diff --git a/video/gst-plugin-closedcaption/tests/dn2018-1217.scc b/video/closedcaption/tests/dn2018-1217.scc
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/dn2018-1217.scc
rename to video/closedcaption/tests/dn2018-1217.scc
diff --git a/video/gst-plugin-closedcaption/tests/mcc_enc.rs b/video/closedcaption/tests/mcc_enc.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/mcc_enc.rs
rename to video/closedcaption/tests/mcc_enc.rs
diff --git a/video/gst-plugin-closedcaption/tests/mcc_parse.rs b/video/closedcaption/tests/mcc_parse.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/mcc_parse.rs
rename to video/closedcaption/tests/mcc_parse.rs
diff --git a/video/gst-plugin-closedcaption/tests/scc_enc.rs b/video/closedcaption/tests/scc_enc.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/scc_enc.rs
rename to video/closedcaption/tests/scc_enc.rs
diff --git a/video/gst-plugin-closedcaption/tests/scc_parse.rs b/video/closedcaption/tests/scc_parse.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/scc_parse.rs
rename to video/closedcaption/tests/scc_parse.rs
diff --git a/video/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc b/video/closedcaption/tests/timecodes-cut-down-sample.scc
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc
rename to video/closedcaption/tests/timecodes-cut-down-sample.scc
diff --git a/video/gst-plugin-closedcaption/tests/tttocea608.rs b/video/closedcaption/tests/tttocea608.rs
similarity index 100%
rename from video/gst-plugin-closedcaption/tests/tttocea608.rs
rename to video/closedcaption/tests/tttocea608.rs
diff --git a/video/gst-plugin-dav1d/Cargo.toml b/video/dav1d/Cargo.toml
similarity index 90%
rename from video/gst-plugin-dav1d/Cargo.toml
rename to video/dav1d/Cargo.toml
index 8f57ce83..ed148d71 100644
--- a/video/gst-plugin-dav1d/Cargo.toml
+++ b/video/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 = "../../version-helper" }
 
 [features]
 build = ["dav1d/build"]
diff --git a/video/gst-plugin-dav1d/build.rs b/video/dav1d/build.rs
similarity index 100%
rename from video/gst-plugin-dav1d/build.rs
rename to video/dav1d/build.rs
diff --git a/video/gst-plugin-dav1d/src/dav1ddec.rs b/video/dav1d/src/dav1ddec.rs
similarity index 100%
rename from video/gst-plugin-dav1d/src/dav1ddec.rs
rename to video/dav1d/src/dav1ddec.rs
diff --git a/video/gst-plugin-dav1d/src/lib.rs b/video/dav1d/src/lib.rs
similarity index 100%
rename from video/gst-plugin-dav1d/src/lib.rs
rename to video/dav1d/src/lib.rs
diff --git a/video/gst-plugin-flv/Cargo.toml b/video/flv/Cargo.toml
similarity index 91%
rename from video/gst-plugin-flv/Cargo.toml
rename to video/flv/Cargo.toml
index d17b3290..a0136461 100644
--- a/video/gst-plugin-flv/Cargo.toml
+++ b/video/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="../../version-helper" }
diff --git a/video/gst-plugin-flv/build.rs b/video/flv/build.rs
similarity index 100%
rename from video/gst-plugin-flv/build.rs
rename to video/flv/build.rs
diff --git a/video/gst-plugin-flv/src/bytes.rs b/video/flv/src/bytes.rs
similarity index 100%
rename from video/gst-plugin-flv/src/bytes.rs
rename to video/flv/src/bytes.rs
diff --git a/video/gst-plugin-flv/src/flvdemux.rs b/video/flv/src/flvdemux.rs
similarity index 100%
rename from video/gst-plugin-flv/src/flvdemux.rs
rename to video/flv/src/flvdemux.rs
diff --git a/video/gst-plugin-flv/src/lib.rs b/video/flv/src/lib.rs
similarity index 100%
rename from video/gst-plugin-flv/src/lib.rs
rename to video/flv/src/lib.rs
diff --git a/video/gst-plugin-gif/Cargo.toml b/video/gif/Cargo.toml
similarity index 91%
rename from video/gst-plugin-gif/Cargo.toml
rename to video/gif/Cargo.toml
index 18fa6b3e..12929b6e 100644
--- a/video/gst-plugin-gif/Cargo.toml
+++ b/video/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="../../version-helper" }
diff --git a/video/gst-plugin-gif/build.rs b/video/gif/build.rs
similarity index 100%
rename from video/gst-plugin-gif/build.rs
rename to video/gif/build.rs
diff --git a/video/gst-plugin-gif/examples/testvideosrc2gif.rs b/video/gif/examples/testvideosrc2gif.rs
similarity index 100%
rename from video/gst-plugin-gif/examples/testvideosrc2gif.rs
rename to video/gif/examples/testvideosrc2gif.rs
diff --git a/video/gst-plugin-gif/src/gifenc.rs b/video/gif/src/gifenc.rs
similarity index 100%
rename from video/gst-plugin-gif/src/gifenc.rs
rename to video/gif/src/gifenc.rs
diff --git a/video/gst-plugin-gif/src/lib.rs b/video/gif/src/lib.rs
similarity index 100%
rename from video/gst-plugin-gif/src/lib.rs
rename to video/gif/src/lib.rs
diff --git a/video/gst-plugin-gif/tests/gifenc.rs b/video/gif/tests/gifenc.rs
similarity index 100%
rename from video/gst-plugin-gif/tests/gifenc.rs
rename to video/gif/tests/gifenc.rs
diff --git a/video/gst-plugin-rav1e/Cargo.toml b/video/rav1e/Cargo.toml
similarity index 91%
rename from video/gst-plugin-rav1e/Cargo.toml
rename to video/rav1e/Cargo.toml
index fc29cab9..806128f9 100644
--- a/video/gst-plugin-rav1e/Cargo.toml
+++ b/video/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="../../version-helper" }
diff --git a/video/gst-plugin-rav1e/build.rs b/video/rav1e/build.rs
similarity index 100%
rename from video/gst-plugin-rav1e/build.rs
rename to video/rav1e/build.rs
diff --git a/video/gst-plugin-rav1e/src/lib.rs b/video/rav1e/src/lib.rs
similarity index 100%
rename from video/gst-plugin-rav1e/src/lib.rs
rename to video/rav1e/src/lib.rs
diff --git a/video/gst-plugin-rav1e/src/rav1enc.rs b/video/rav1e/src/rav1enc.rs
similarity index 100%
rename from video/gst-plugin-rav1e/src/rav1enc.rs
rename to video/rav1e/src/rav1enc.rs
diff --git a/video/gst-plugin-rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs
similarity index 100%
rename from video/gst-plugin-rav1e/tests/rav1enc.rs
rename to video/rav1e/tests/rav1enc.rs