202 files changed, 37 insertions, 37 deletions

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
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
index 0d1ddb61..0d1ddb61 100644
--- a/audio/gst-plugin-audiofx/build.rs
+++ b/audio/audiofx/build.rs
diff --git a/audio/gst-plugin-audiofx/src/audioecho.rs b/audio/audiofx/src/audioecho.rs
index 5fdb9bd2..5fdb9bd2 100644
--- a/audio/gst-plugin-audiofx/src/audioecho.rs
+++ b/audio/audiofx/src/audioecho.rs
diff --git a/audio/gst-plugin-audiofx/src/audioloudnorm.rs b/audio/audiofx/src/audioloudnorm.rs
index 3d62c374..3d62c374 100644
--- a/audio/gst-plugin-audiofx/src/audioloudnorm.rs
+++ b/audio/audiofx/src/audioloudnorm.rs
diff --git a/audio/gst-plugin-audiofx/src/lib.rs b/audio/audiofx/src/lib.rs
index 10aaf46b..10aaf46b 100644
--- a/audio/gst-plugin-audiofx/src/lib.rs
+++ b/audio/audiofx/src/lib.rs
diff --git a/audio/gst-plugin-audiofx/tests/audioloudnorm.rs b/audio/audiofx/tests/audioloudnorm.rs
index 164e38a1..164e38a1 100644
--- a/audio/gst-plugin-audiofx/tests/audioloudnorm.rs
+++ b/audio/audiofx/tests/audioloudnorm.rs
diff --git a/audio/gst-plugin-claxon/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/audio/gst-plugin-claxon/build.rs
+++ b/audio/claxon/build.rs
diff --git a/audio/gst-plugin-claxon/src/claxondec.rs b/audio/claxon/src/claxondec.rs
index c39e32bd..c39e32bd 100644
--- a/audio/gst-plugin-claxon/src/claxondec.rs
+++ b/audio/claxon/src/claxondec.rs
diff --git a/audio/gst-plugin-claxon/src/lib.rs b/audio/claxon/src/lib.rs
index d6058bd7..d6058bd7 100644
--- a/audio/gst-plugin-claxon/src/lib.rs
+++ b/audio/claxon/src/lib.rs
diff --git a/audio/gst-plugin-claxon/tests/claxondec.rs b/audio/claxon/tests/claxondec.rs
index 00d99af4..00d99af4 100644
--- a/audio/gst-plugin-claxon/tests/claxondec.rs
+++ b/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
index 7312dd63..7312dd63 100644
--- a/audio/gst-plugin-claxon/tests/test_mono_s16.flac
+++ b/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
index bf3d3d45..bf3d3d45 100644
--- a/audio/gst-plugin-claxon/tests/test_stereo_s32.flac
+++ b/audio/claxon/tests/test_stereo_s32.flac
diff --git a/audio/gst-plugin-csound/Cargo.toml b/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
index 1b856362..1b856362 100644
--- a/audio/gst-plugin-csound/README.md
+++ b/audio/csound/README.md
diff --git a/audio/gst-plugin-csound/build.rs b/audio/csound/build.rs
index 0d1ddb61..0d1ddb61 100644
--- a/audio/gst-plugin-csound/build.rs
+++ b/audio/csound/build.rs
diff --git a/audio/gst-plugin-csound/examples/effect_example.rs b/audio/csound/examples/effect_example.rs
index b330aa25..b330aa25 100644
--- a/audio/gst-plugin-csound/examples/effect_example.rs
+++ b/audio/csound/examples/effect_example.rs
diff --git a/audio/gst-plugin-csound/src/filter.rs b/audio/csound/src/filter.rs
index 7c17563e..7c17563e 100644
--- a/audio/gst-plugin-csound/src/filter.rs
+++ b/audio/csound/src/filter.rs
diff --git a/audio/gst-plugin-csound/src/lib.rs b/audio/csound/src/lib.rs
index d2b52bf7..d2b52bf7 100644
--- a/audio/gst-plugin-csound/src/lib.rs
+++ b/audio/csound/src/lib.rs
diff --git a/audio/gst-plugin-csound/tests/csound_filter.rs b/audio/csound/tests/csound_filter.rs
index bfbf2c5b..bfbf2c5b 100644
--- a/audio/gst-plugin-csound/tests/csound_filter.rs
+++ b/audio/csound/tests/csound_filter.rs
diff --git a/audio/gst-plugin-lewton/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/audio/gst-plugin-lewton/build.rs
+++ b/audio/lewton/build.rs
diff --git a/audio/gst-plugin-lewton/src/lewtondec.rs b/audio/lewton/src/lewtondec.rs
index 8910f4a6..8910f4a6 100644
--- a/audio/gst-plugin-lewton/src/lewtondec.rs
+++ b/audio/lewton/src/lewtondec.rs
diff --git a/audio/gst-plugin-lewton/src/lib.rs b/audio/lewton/src/lib.rs
index 2ba1f7e7..2ba1f7e7 100644
--- a/audio/gst-plugin-lewton/src/lib.rs
+++ b/audio/lewton/src/lib.rs
diff --git a/audio/gst-plugin-lewton/tests/lewtondec.rs b/audio/lewton/tests/lewtondec.rs
index 177415ee..177415ee 100644
--- a/audio/gst-plugin-lewton/tests/lewtondec.rs
+++ b/audio/lewton/tests/lewtondec.rs
diff --git a/audio/gst-plugin-lewton/tests/test.vorbis b/audio/lewton/tests/test.vorbis
index 1a99d1bc..1a99d1bc 100644
--- a/audio/gst-plugin-lewton/tests/test.vorbis
+++ b/audio/lewton/tests/test.vorbis
diff --git a/generic/gst-plugin-file/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/generic/gst-plugin-file/build.rs
+++ b/generic/file/build.rs
diff --git a/generic/gst-plugin-file/src/file_location.rs b/generic/file/src/file_location.rs
index 8eba2c01..8eba2c01 100644
--- a/generic/gst-plugin-file/src/file_location.rs
+++ b/generic/file/src/file_location.rs
diff --git a/generic/gst-plugin-file/src/filesink.rs b/generic/file/src/filesink.rs
index ee912ec1..ee912ec1 100644
--- a/generic/gst-plugin-file/src/filesink.rs
+++ b/generic/file/src/filesink.rs
diff --git a/generic/gst-plugin-file/src/filesrc.rs b/generic/file/src/filesrc.rs
index 7d7b9f55..7d7b9f55 100644
--- a/generic/gst-plugin-file/src/filesrc.rs
+++ b/generic/file/src/filesrc.rs
diff --git a/generic/gst-plugin-file/src/lib.rs b/generic/file/src/lib.rs
index 90616e87..90616e87 100644
--- a/generic/gst-plugin-file/src/lib.rs
+++ b/generic/file/src/lib.rs
diff --git a/generic/gst-plugin-sodium/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/generic/gst-plugin-sodium/build.rs
+++ b/generic/sodium/build.rs
diff --git a/generic/gst-plugin-sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
index 9908a0fd..9908a0fd 100644
--- a/generic/gst-plugin-sodium/examples/decrypt_example.rs
+++ b/generic/sodium/examples/decrypt_example.rs
diff --git a/generic/gst-plugin-sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs
index 6189e324..6189e324 100644
--- a/generic/gst-plugin-sodium/examples/encrypt_example.rs
+++ b/generic/sodium/examples/encrypt_example.rs
diff --git a/generic/gst-plugin-sodium/examples/generate_keys.rs b/generic/sodium/examples/generate_keys.rs
index b7de4777..b7de4777 100644
--- a/generic/gst-plugin-sodium/examples/generate_keys.rs
+++ b/generic/sodium/examples/generate_keys.rs
diff --git a/generic/gst-plugin-sodium/examples/receiver_sample.json b/generic/sodium/examples/receiver_sample.json
index 619b365f..619b365f 100644
--- a/generic/gst-plugin-sodium/examples/receiver_sample.json
+++ b/generic/sodium/examples/receiver_sample.json
diff --git a/generic/gst-plugin-sodium/examples/sender_sample.json b/generic/sodium/examples/sender_sample.json
index d7ab1fa6..d7ab1fa6 100644
--- a/generic/gst-plugin-sodium/examples/sender_sample.json
+++ b/generic/sodium/examples/sender_sample.json
diff --git a/generic/gst-plugin-sodium/src/decrypter.rs b/generic/sodium/src/decrypter.rs
index 39891ee1..39891ee1 100644
--- a/generic/gst-plugin-sodium/src/decrypter.rs
+++ b/generic/sodium/src/decrypter.rs
diff --git a/generic/gst-plugin-sodium/src/encrypter.rs b/generic/sodium/src/encrypter.rs
index 60a6e01e..60a6e01e 100644
--- a/generic/gst-plugin-sodium/src/encrypter.rs
+++ b/generic/sodium/src/encrypter.rs
diff --git a/generic/gst-plugin-sodium/src/lib.rs b/generic/sodium/src/lib.rs
index 3961ddc7..3961ddc7 100644
--- a/generic/gst-plugin-sodium/src/lib.rs
+++ b/generic/sodium/src/lib.rs
diff --git a/generic/gst-plugin-sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index 2fbb91e7..2fbb91e7 100644
--- a/generic/gst-plugin-sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
diff --git a/generic/gst-plugin-sodium/tests/encrypted_sample.enc b/generic/sodium/tests/encrypted_sample.enc
index f63b133a..f63b133a 100644
--- a/generic/gst-plugin-sodium/tests/encrypted_sample.enc
+++ b/generic/sodium/tests/encrypted_sample.enc
diff --git a/generic/gst-plugin-sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
index e2f6dc83..e2f6dc83 100644
--- a/generic/gst-plugin-sodium/tests/encrypter.rs
+++ b/generic/sodium/tests/encrypter.rs
diff --git a/generic/gst-plugin-sodium/tests/sample.mp3 b/generic/sodium/tests/sample.mp3
index 839e90d5..839e90d5 100644
--- a/generic/gst-plugin-sodium/tests/sample.mp3
+++ b/generic/sodium/tests/sample.mp3
diff --git a/generic/gst-plugin-threadshare/Cargo.toml b/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
index fd089efd..fd089efd 100644
--- a/generic/gst-plugin-threadshare/build.rs
+++ b/generic/threadshare/build.rs
diff --git a/generic/gst-plugin-threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs
index f7d164ed..f7d164ed 100644
--- a/generic/gst-plugin-threadshare/examples/benchmark.rs
+++ b/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
index 435ba2c2..435ba2c2 100644
--- a/generic/gst-plugin-threadshare/examples/tcpclientsrc_benchmark_sender.rs
+++ b/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
index 2993b475..2993b475 100644
--- a/generic/gst-plugin-threadshare/examples/udpsrc_benchmark_sender.rs
+++ b/generic/threadshare/examples/udpsrc_benchmark_sender.rs
diff --git a/generic/gst-plugin-threadshare/src/appsrc.rs b/generic/threadshare/src/appsrc.rs
index 689b276b..689b276b 100644
--- a/generic/gst-plugin-threadshare/src/appsrc.rs
+++ b/generic/threadshare/src/appsrc.rs
diff --git a/generic/gst-plugin-threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs
index 9f77d966..9f77d966 100644
--- a/generic/gst-plugin-threadshare/src/dataqueue.rs
+++ b/generic/threadshare/src/dataqueue.rs
diff --git a/generic/gst-plugin-threadshare/src/inputselector.rs b/generic/threadshare/src/inputselector.rs
index 47e3ba6f..47e3ba6f 100644
--- a/generic/gst-plugin-threadshare/src/inputselector.rs
+++ b/generic/threadshare/src/inputselector.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
index 6e2a2244..6e2a2244 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
+++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs b/generic/threadshare/src/jitterbuffer/mod.rs
index 81873205..81873205 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/mod.rs
+++ b/generic/threadshare/src/jitterbuffer/mod.rs
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.c
index eee28406..eee28406 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.c
+++ b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.c
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.h
index 31fbb747..31fbb747 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpjitterbuffer.h
+++ b/generic/threadshare/src/jitterbuffer/rtpjitterbuffer.h
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c b/generic/threadshare/src/jitterbuffer/rtpstats.c
index 3cad086c..3cad086c 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.c
+++ b/generic/threadshare/src/jitterbuffer/rtpstats.c
diff --git a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h b/generic/threadshare/src/jitterbuffer/rtpstats.h
index bd3a54ef..bd3a54ef 100644
--- a/generic/gst-plugin-threadshare/src/jitterbuffer/rtpstats.h
+++ b/generic/threadshare/src/jitterbuffer/rtpstats.h
diff --git a/generic/gst-plugin-threadshare/src/lib.rs b/generic/threadshare/src/lib.rs
index 42ecc114..42ecc114 100644
--- a/generic/gst-plugin-threadshare/src/lib.rs
+++ b/generic/threadshare/src/lib.rs
diff --git a/generic/gst-plugin-threadshare/src/proxy.rs b/generic/threadshare/src/proxy.rs
index 19145451..19145451 100644
--- a/generic/gst-plugin-threadshare/src/proxy.rs
+++ b/generic/threadshare/src/proxy.rs
diff --git a/generic/gst-plugin-threadshare/src/queue.rs b/generic/threadshare/src/queue.rs
index 7c02602f..7c02602f 100644
--- a/generic/gst-plugin-threadshare/src/queue.rs
+++ b/generic/threadshare/src/queue.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/executor.rs b/generic/threadshare/src/runtime/executor.rs
index 9ee0ce61..9ee0ce61 100644
--- a/generic/gst-plugin-threadshare/src/runtime/executor.rs
+++ b/generic/threadshare/src/runtime/executor.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/mod.rs b/generic/threadshare/src/runtime/mod.rs
index 39923a4e..39923a4e 100644
--- a/generic/gst-plugin-threadshare/src/runtime/mod.rs
+++ b/generic/threadshare/src/runtime/mod.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs
index fde5ed3b..fde5ed3b 100644
--- a/generic/gst-plugin-threadshare/src/runtime/pad.rs
+++ b/generic/threadshare/src/runtime/pad.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/task.rs b/generic/threadshare/src/runtime/task.rs
index c48327cc..c48327cc 100644
--- a/generic/gst-plugin-threadshare/src/runtime/task.rs
+++ b/generic/threadshare/src/runtime/task.rs
diff --git a/generic/gst-plugin-threadshare/src/runtime/time.rs b/generic/threadshare/src/runtime/time.rs
index 0ea857b0..0ea857b0 100644
--- a/generic/gst-plugin-threadshare/src/runtime/time.rs
+++ b/generic/threadshare/src/runtime/time.rs
diff --git a/generic/gst-plugin-threadshare/src/socket.rs b/generic/threadshare/src/socket.rs
index 790e977b..790e977b 100644
--- a/generic/gst-plugin-threadshare/src/socket.rs
+++ b/generic/threadshare/src/socket.rs
diff --git a/generic/gst-plugin-threadshare/src/tcpclientsrc.rs b/generic/threadshare/src/tcpclientsrc.rs
index 1a35a668..1a35a668 100644
--- a/generic/gst-plugin-threadshare/src/tcpclientsrc.rs
+++ b/generic/threadshare/src/tcpclientsrc.rs
diff --git a/generic/gst-plugin-threadshare/src/udpsink.rs b/generic/threadshare/src/udpsink.rs
index 3c95f25c..3c95f25c 100644
--- a/generic/gst-plugin-threadshare/src/udpsink.rs
+++ b/generic/threadshare/src/udpsink.rs
diff --git a/generic/gst-plugin-threadshare/src/udpsrc.rs b/generic/threadshare/src/udpsrc.rs
index 6542b0ba..6542b0ba 100644
--- a/generic/gst-plugin-threadshare/src/udpsrc.rs
+++ b/generic/threadshare/src/udpsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/appsrc.rs b/generic/threadshare/tests/appsrc.rs
index 8610fcb4..8610fcb4 100644
--- a/generic/gst-plugin-threadshare/tests/appsrc.rs
+++ b/generic/threadshare/tests/appsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/inputselector.rs b/generic/threadshare/tests/inputselector.rs
index 965c266c..965c266c 100644
--- a/generic/gst-plugin-threadshare/tests/inputselector.rs
+++ b/generic/threadshare/tests/inputselector.rs
diff --git a/generic/gst-plugin-threadshare/tests/jitterbuffer.rs b/generic/threadshare/tests/jitterbuffer.rs
index cdc22767..cdc22767 100644
--- a/generic/gst-plugin-threadshare/tests/jitterbuffer.rs
+++ b/generic/threadshare/tests/jitterbuffer.rs
diff --git a/generic/gst-plugin-threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 8bf680c0..8bf680c0 100644
--- a/generic/gst-plugin-threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
diff --git a/generic/gst-plugin-threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs
index 61a7851a..61a7851a 100644
--- a/generic/gst-plugin-threadshare/tests/pipeline.rs
+++ b/generic/threadshare/tests/pipeline.rs
diff --git a/generic/gst-plugin-threadshare/tests/proxy.rs b/generic/threadshare/tests/proxy.rs
index b593b16e..b593b16e 100644
--- a/generic/gst-plugin-threadshare/tests/proxy.rs
+++ b/generic/threadshare/tests/proxy.rs
diff --git a/generic/gst-plugin-threadshare/tests/queue.rs b/generic/threadshare/tests/queue.rs
index c170516f..c170516f 100644
--- a/generic/gst-plugin-threadshare/tests/queue.rs
+++ b/generic/threadshare/tests/queue.rs
diff --git a/generic/gst-plugin-threadshare/tests/tcpclientsrc.rs b/generic/threadshare/tests/tcpclientsrc.rs
index 7498dcc7..7498dcc7 100644
--- a/generic/gst-plugin-threadshare/tests/tcpclientsrc.rs
+++ b/generic/threadshare/tests/tcpclientsrc.rs
diff --git a/generic/gst-plugin-threadshare/tests/udpsink.rs b/generic/threadshare/tests/udpsink.rs
index 420b34fe..420b34fe 100644
--- a/generic/gst-plugin-threadshare/tests/udpsink.rs
+++ b/generic/threadshare/tests/udpsink.rs
diff --git a/generic/gst-plugin-threadshare/tests/udpsrc.rs b/generic/threadshare/tests/udpsrc.rs
index eadfac74..eadfac74 100644
--- a/generic/gst-plugin-threadshare/tests/udpsrc.rs
+++ b/generic/threadshare/tests/udpsrc.rs
diff --git a/net/gst-plugin-reqwest/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/gst-plugin-tutorial/build.rs
+++ b/net/reqwest/build.rs
diff --git a/net/gst-plugin-reqwest/src/lib.rs b/net/reqwest/src/lib.rs
index 7960329b..7960329b 100644
--- a/net/gst-plugin-reqwest/src/lib.rs
+++ b/net/reqwest/src/lib.rs
diff --git a/net/gst-plugin-reqwest/src/reqwesthttpsrc.rs b/net/reqwest/src/reqwesthttpsrc.rs
index 380f5df2..380f5df2 100644
--- a/net/gst-plugin-reqwest/src/reqwesthttpsrc.rs
+++ b/net/reqwest/src/reqwesthttpsrc.rs
diff --git a/net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs
index 4daa1421..4daa1421 100644
--- a/net/gst-plugin-reqwest/tests/reqwesthttpsrc.rs
+++ b/net/reqwest/tests/reqwesthttpsrc.rs
diff --git a/net/gst-plugin-rusoto/Cargo.toml b/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
index 9b86b746..9b86b746 100644
--- a/net/gst-plugin-rusoto/README.md
+++ b/net/rusoto/README.md
diff --git a/net/gst-plugin-reqwest/build.rs b/net/rusoto/build.rs
index 0d1ddb61..0d1ddb61 100644
--- a/net/gst-plugin-reqwest/build.rs
+++ b/net/rusoto/build.rs
diff --git a/net/gst-plugin-rusoto/src/lib.rs b/net/rusoto/src/lib.rs
index 245e9626..245e9626 100644
--- a/net/gst-plugin-rusoto/src/lib.rs
+++ b/net/rusoto/src/lib.rs
diff --git a/net/gst-plugin-rusoto/src/s3sink.rs b/net/rusoto/src/s3sink.rs
index 3cd36822..3cd36822 100644
--- a/net/gst-plugin-rusoto/src/s3sink.rs
+++ b/net/rusoto/src/s3sink.rs
diff --git a/net/gst-plugin-rusoto/src/s3src.rs b/net/rusoto/src/s3src.rs
index 2984098f..2984098f 100644
--- a/net/gst-plugin-rusoto/src/s3src.rs
+++ b/net/rusoto/src/s3src.rs
diff --git a/net/gst-plugin-rusoto/src/s3url.rs b/net/rusoto/src/s3url.rs
index 01a41a83..01a41a83 100644
--- a/net/gst-plugin-rusoto/src/s3url.rs
+++ b/net/rusoto/src/s3url.rs
diff --git a/net/gst-plugin-rusoto/src/s3utils.rs b/net/rusoto/src/s3utils.rs
index 70620730..70620730 100644
--- a/net/gst-plugin-rusoto/src/s3utils.rs
+++ b/net/rusoto/src/s3utils.rs
diff --git a/gst-plugin-tutorial/Cargo.toml b/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
index 7592e26b..7592e26b 100644
--- a/gst-plugin-tutorial/README.md
+++ b/tutorial/README.md
diff --git a/net/gst-plugin-rusoto/build.rs b/tutorial/build.rs
index 0d1ddb61..0d1ddb61 100644
--- a/net/gst-plugin-rusoto/build.rs
+++ b/tutorial/build.rs
diff --git a/gst-plugin-tutorial/img/bbb.jpg b/tutorial/img/bbb.jpg
index e69de29b..e69de29b 100644
--- a/gst-plugin-tutorial/img/bbb.jpg
+++ b/tutorial/img/bbb.jpg
diff --git a/gst-plugin-tutorial/src/identity.rs b/tutorial/src/identity.rs
index ae770add..ae770add 100644
--- a/gst-plugin-tutorial/src/identity.rs
+++ b/tutorial/src/identity.rs
diff --git a/gst-plugin-tutorial/src/lib.rs b/tutorial/src/lib.rs
index d8709ee3..d8709ee3 100644
--- a/gst-plugin-tutorial/src/lib.rs
+++ b/tutorial/src/lib.rs
diff --git a/gst-plugin-tutorial/src/progressbin.rs b/tutorial/src/progressbin.rs
index 13d68156..13d68156 100644
--- a/gst-plugin-tutorial/src/progressbin.rs
+++ b/tutorial/src/progressbin.rs
diff --git a/gst-plugin-tutorial/src/rgb2gray.rs b/tutorial/src/rgb2gray.rs
index 614cc234..614cc234 100644
--- a/gst-plugin-tutorial/src/rgb2gray.rs
+++ b/tutorial/src/rgb2gray.rs
diff --git a/gst-plugin-tutorial/src/sinesrc.rs b/tutorial/src/sinesrc.rs
index f91fe772..f91fe772 100644
--- a/gst-plugin-tutorial/src/sinesrc.rs
+++ b/tutorial/src/sinesrc.rs
diff --git a/gst-plugin-tutorial/tutorial-1.md b/tutorial/tutorial-1.md
index 5ac4169d..5ac4169d 100644
--- a/gst-plugin-tutorial/tutorial-1.md
+++ b/tutorial/tutorial-1.md
diff --git a/gst-plugin-tutorial/tutorial-2.md b/tutorial/tutorial-2.md
index 9c821761..9c821761 100644
--- a/gst-plugin-tutorial/tutorial-2.md
+++ b/tutorial/tutorial-2.md
diff --git a/utils/gst-plugin-fallbackswitch/Cargo.toml b/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
index 0ff81ccb..0ff81ccb 100644
--- a/utils/gst-plugin-fallbackswitch/build.rs
+++ b/utils/fallbackswitch/build.rs
diff --git a/utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs
index ffb64542..ffb64542 100644
--- a/utils/gst-plugin-fallbackswitch/examples/gtk_fallbackswitch.rs
+++ b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/aggregator.rs b/utils/fallbackswitch/src/base/aggregator.rs
index d6ac7fa6..d6ac7fa6 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/aggregator.rs
+++ b/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
index eb57f614..eb57f614 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/aggregator_pad.rs
+++ b/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
index 912892ee..912892ee 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
+++ b/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
index 7c8df57e..7c8df57e 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
+++ b/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
index 0081d7c4..0081d7c4 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/auto/mod.rs
+++ b/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
index 06389895..06389895 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.c
+++ b/utils/fallbackswitch/src/base/gstaggregator.c
diff --git a/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h b/utils/fallbackswitch/src/base/gstaggregator.h
index b8f4216e..b8f4216e 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/gstaggregator.h
+++ b/utils/fallbackswitch/src/base/gstaggregator.h
diff --git a/utils/gst-plugin-fallbackswitch/src/base/mod.rs b/utils/fallbackswitch/src/base/mod.rs
index 2d097356..2d097356 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/mod.rs
+++ b/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
index 5f8e2744..5f8e2744 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
+++ b/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
index c09c4a36..c09c4a36 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
+++ b/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
index 319dc131..319dc131 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/subclass/mod.rs
+++ b/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
index ac3e8ffc..ac3e8ffc 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/sys.rs
+++ b/utils/fallbackswitch/src/base/sys.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/base/utils.rs b/utils/fallbackswitch/src/base/utils.rs
index dca8cf69..dca8cf69 100644
--- a/utils/gst-plugin-fallbackswitch/src/base/utils.rs
+++ b/utils/fallbackswitch/src/base/utils.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs b/utils/fallbackswitch/src/fallbackswitch.rs
index ddf4cca4..ddf4cca4 100644
--- a/utils/gst-plugin-fallbackswitch/src/fallbackswitch.rs
+++ b/utils/fallbackswitch/src/fallbackswitch.rs
diff --git a/utils/gst-plugin-fallbackswitch/src/lib.rs b/utils/fallbackswitch/src/lib.rs
index c2b2b0fd..c2b2b0fd 100644
--- a/utils/gst-plugin-fallbackswitch/src/lib.rs
+++ b/utils/fallbackswitch/src/lib.rs
diff --git a/utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs
index 20d45ae7..20d45ae7 100644
--- a/utils/gst-plugin-fallbackswitch/tests/fallbackswitch.rs
+++ b/utils/fallbackswitch/tests/fallbackswitch.rs
diff --git a/utils/gst-plugin-togglerecord/Cargo.toml b/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
index 4362b491..4362b491 100644
--- a/utils/gst-plugin-togglerecord/LICENSE
+++ b/utils/togglerecord/LICENSE
diff --git a/utils/gst-plugin-togglerecord/build.rs b/utils/togglerecord/build.rs
index 0d1ddb61..0d1ddb61 100644
--- a/utils/gst-plugin-togglerecord/build.rs
+++ b/utils/togglerecord/build.rs
diff --git a/utils/gst-plugin-togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs
index 8f0bc0bb..8f0bc0bb 100644
--- a/utils/gst-plugin-togglerecord/examples/gtk_recording.rs
+++ b/utils/togglerecord/examples/gtk_recording.rs
diff --git a/utils/gst-plugin-togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs
index 9f215466..9f215466 100644
--- a/utils/gst-plugin-togglerecord/src/lib.rs
+++ b/utils/togglerecord/src/lib.rs
diff --git a/utils/gst-plugin-togglerecord/src/togglerecord.rs b/utils/togglerecord/src/togglerecord.rs
index 07872b73..07872b73 100644
--- a/utils/gst-plugin-togglerecord/src/togglerecord.rs
+++ b/utils/togglerecord/src/togglerecord.rs
diff --git a/utils/gst-plugin-togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs
index c0eaf674..c0eaf674 100644
--- a/utils/gst-plugin-togglerecord/tests/tests.rs
+++ b/utils/togglerecord/tests/tests.rs
diff --git a/gst-plugin-version-helper/Cargo.toml b/version-helper/Cargo.toml
index 8e0758d7..8e0758d7 100644
--- a/gst-plugin-version-helper/Cargo.toml
+++ b/version-helper/Cargo.toml
diff --git a/gst-plugin-version-helper/LICENSE b/version-helper/LICENSE
index 31aa7938..31aa7938 100644
--- a/gst-plugin-version-helper/LICENSE
+++ b/version-helper/LICENSE
diff --git a/gst-plugin-version-helper/src/git.rs b/version-helper/src/git.rs
index 2bd188dc..2bd188dc 100644
--- a/gst-plugin-version-helper/src/git.rs
+++ b/version-helper/src/git.rs
diff --git a/gst-plugin-version-helper/src/lib.rs b/version-helper/src/lib.rs
index fc85fb70..fc85fb70 100644
--- a/gst-plugin-version-helper/src/lib.rs
+++ b/version-helper/src/lib.rs
diff --git a/video/gst-plugin-cdg/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/video/gst-plugin-cdg/build.rs
+++ b/video/cdg/build.rs
diff --git a/video/gst-plugin-cdg/src/cdgdec.rs b/video/cdg/src/cdgdec.rs
index 6ea7b59d..6ea7b59d 100644
--- a/video/gst-plugin-cdg/src/cdgdec.rs
+++ b/video/cdg/src/cdgdec.rs
diff --git a/video/gst-plugin-cdg/src/cdgparse.rs b/video/cdg/src/cdgparse.rs
index a23910e6..a23910e6 100644
--- a/video/gst-plugin-cdg/src/cdgparse.rs
+++ b/video/cdg/src/cdgparse.rs
diff --git a/video/gst-plugin-cdg/src/constants.rs b/video/cdg/src/constants.rs
index 5f8d8000..5f8d8000 100644
--- a/video/gst-plugin-cdg/src/constants.rs
+++ b/video/cdg/src/constants.rs
diff --git a/video/gst-plugin-cdg/src/lib.rs b/video/cdg/src/lib.rs
index 433f6fde..433f6fde 100644
--- a/video/gst-plugin-cdg/src/lib.rs
+++ b/video/cdg/src/lib.rs
diff --git a/video/gst-plugin-cdg/tests/BrotherJohn.cdg b/video/cdg/tests/BrotherJohn.cdg
index 9ec6ec15..9ec6ec15 100644
--- a/video/gst-plugin-cdg/tests/BrotherJohn.cdg
+++ b/video/cdg/tests/BrotherJohn.cdg
diff --git a/video/gst-plugin-cdg/tests/cdgdec.rs b/video/cdg/tests/cdgdec.rs
index 69b9d3ff..69b9d3ff 100644
--- a/video/gst-plugin-cdg/tests/cdgdec.rs
+++ b/video/cdg/tests/cdgdec.rs
diff --git a/video/gst-plugin-closedcaption/Cargo.toml b/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
index 84d168ec..84d168ec 100644
--- a/video/gst-plugin-closedcaption/build.rs
+++ b/video/closedcaption/build.rs
diff --git a/video/gst-plugin-closedcaption/src/c/LICENSE.txt b/video/closedcaption/src/c/LICENSE.txt
index a770bbb5..a770bbb5 100644
--- a/video/gst-plugin-closedcaption/src/c/LICENSE.txt
+++ b/video/closedcaption/src/c/LICENSE.txt
diff --git a/video/gst-plugin-closedcaption/src/c/all.h b/video/closedcaption/src/c/all.h
index efd4ab65..efd4ab65 100644
--- a/video/gst-plugin-closedcaption/src/c/all.h
+++ b/video/closedcaption/src/c/all.h
diff --git a/video/gst-plugin-closedcaption/src/c/caption.c b/video/closedcaption/src/c/caption.c
index 1ca11f22..1ca11f22 100644
--- a/video/gst-plugin-closedcaption/src/c/caption.c
+++ b/video/closedcaption/src/c/caption.c
diff --git a/video/gst-plugin-closedcaption/src/c/caption.h b/video/closedcaption/src/c/caption.h
index 508935c1..508935c1 100644
--- a/video/gst-plugin-closedcaption/src/c/caption.h
+++ b/video/closedcaption/src/c/caption.h
diff --git a/video/gst-plugin-closedcaption/src/c/eia608.c b/video/closedcaption/src/c/eia608.c
index cb51ad3e..cb51ad3e 100644
--- a/video/gst-plugin-closedcaption/src/c/eia608.c
+++ b/video/closedcaption/src/c/eia608.c
diff --git a/video/gst-plugin-closedcaption/src/c/eia608.h b/video/closedcaption/src/c/eia608.h
index 668a6fd9..668a6fd9 100644
--- a/video/gst-plugin-closedcaption/src/c/eia608.h
+++ b/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
index 705a2737..705a2737 100644
--- a/video/gst-plugin-closedcaption/src/c/eia608_charmap.c
+++ b/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
index 37d33460..37d33460 100644
--- a/video/gst-plugin-closedcaption/src/c/eia608_charmap.h
+++ b/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
index cd7412b9..cd7412b9 100644
--- a/video/gst-plugin-closedcaption/src/c/eia608_from_utf8.c
+++ b/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
index d90c24f1..d90c24f1 100644
--- a/video/gst-plugin-closedcaption/src/c/utf8.c
+++ b/video/closedcaption/src/c/utf8.c
diff --git a/video/gst-plugin-closedcaption/src/c/utf8.h b/video/closedcaption/src/c/utf8.h
index 3a17d75a..3a17d75a 100644
--- a/video/gst-plugin-closedcaption/src/c/utf8.h
+++ b/video/closedcaption/src/c/utf8.h
diff --git a/video/gst-plugin-closedcaption/src/c/version.txt b/video/closedcaption/src/c/version.txt
index 8e838745..8e838745 100644
--- a/video/gst-plugin-closedcaption/src/c/version.txt
+++ b/video/closedcaption/src/c/version.txt
diff --git a/video/gst-plugin-closedcaption/src/c/xds.c b/video/closedcaption/src/c/xds.c
index a9fae455..a9fae455 100644
--- a/video/gst-plugin-closedcaption/src/c/xds.c
+++ b/video/closedcaption/src/c/xds.c
diff --git a/video/gst-plugin-closedcaption/src/c/xds.h b/video/closedcaption/src/c/xds.h
index e457a597..e457a597 100644
--- a/video/gst-plugin-closedcaption/src/c/xds.h
+++ b/video/closedcaption/src/c/xds.h
diff --git a/video/gst-plugin-closedcaption/src/cea608tott.rs b/video/closedcaption/src/cea608tott.rs
index 15307618..15307618 100644
--- a/video/gst-plugin-closedcaption/src/cea608tott.rs
+++ b/video/closedcaption/src/cea608tott.rs
diff --git a/video/gst-plugin-closedcaption/src/cea608tott_ffi.rs b/video/closedcaption/src/cea608tott_ffi.rs
index 9349f9ce..9349f9ce 100644
--- a/video/gst-plugin-closedcaption/src/cea608tott_ffi.rs
+++ b/video/closedcaption/src/cea608tott_ffi.rs
diff --git a/video/gst-plugin-closedcaption/src/lib.rs b/video/closedcaption/src/lib.rs
index fa77b0c1..fa77b0c1 100644
--- a/video/gst-plugin-closedcaption/src/lib.rs
+++ b/video/closedcaption/src/lib.rs
diff --git a/video/gst-plugin-closedcaption/src/line_reader.rs b/video/closedcaption/src/line_reader.rs
index 7ab48833..7ab48833 100644
--- a/video/gst-plugin-closedcaption/src/line_reader.rs
+++ b/video/closedcaption/src/line_reader.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_enc.rs b/video/closedcaption/src/mcc_enc.rs
index 8318151f..8318151f 100644
--- a/video/gst-plugin-closedcaption/src/mcc_enc.rs
+++ b/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
index 6995c99c..6995c99c 100644
--- a/video/gst-plugin-closedcaption/src/mcc_enc_headers.rs
+++ b/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
index 3e8da179..3e8da179 100644
--- a/video/gst-plugin-closedcaption/src/mcc_parse.rs
+++ b/video/closedcaption/src/mcc_parse.rs
diff --git a/video/gst-plugin-closedcaption/src/mcc_parser.rs b/video/closedcaption/src/mcc_parser.rs
index 294807e2..294807e2 100644
--- a/video/gst-plugin-closedcaption/src/mcc_parser.rs
+++ b/video/closedcaption/src/mcc_parser.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_enc.rs b/video/closedcaption/src/scc_enc.rs
index f7edf0c6..f7edf0c6 100644
--- a/video/gst-plugin-closedcaption/src/scc_enc.rs
+++ b/video/closedcaption/src/scc_enc.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_parse.rs b/video/closedcaption/src/scc_parse.rs
index 3b2ab9f8..3b2ab9f8 100644
--- a/video/gst-plugin-closedcaption/src/scc_parse.rs
+++ b/video/closedcaption/src/scc_parse.rs
diff --git a/video/gst-plugin-closedcaption/src/scc_parser.rs b/video/closedcaption/src/scc_parser.rs
index 2757251b..2757251b 100644
--- a/video/gst-plugin-closedcaption/src/scc_parser.rs
+++ b/video/closedcaption/src/scc_parser.rs
diff --git a/video/gst-plugin-closedcaption/src/tttocea608.rs b/video/closedcaption/src/tttocea608.rs
index 2348a29d..2348a29d 100644
--- a/video/gst-plugin-closedcaption/src/tttocea608.rs
+++ b/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
index 75d0aca8..75d0aca8 100644
--- a/video/gst-plugin-closedcaption/tests/captions-test_708.mcc
+++ b/video/closedcaption/tests/captions-test_708.mcc
diff --git a/video/gst-plugin-closedcaption/tests/cea608tott.rs b/video/closedcaption/tests/cea608tott.rs
index 4489d6ac..4489d6ac 100644
--- a/video/gst-plugin-closedcaption/tests/cea608tott.rs
+++ b/video/closedcaption/tests/cea608tott.rs
diff --git a/video/gst-plugin-closedcaption/tests/dn2018-1217.scc b/video/closedcaption/tests/dn2018-1217.scc
index 7ae37e70..7ae37e70 100644
--- a/video/gst-plugin-closedcaption/tests/dn2018-1217.scc
+++ b/video/closedcaption/tests/dn2018-1217.scc
diff --git a/video/gst-plugin-closedcaption/tests/mcc_enc.rs b/video/closedcaption/tests/mcc_enc.rs
index 9b5876e4..9b5876e4 100644
--- a/video/gst-plugin-closedcaption/tests/mcc_enc.rs
+++ b/video/closedcaption/tests/mcc_enc.rs
diff --git a/video/gst-plugin-closedcaption/tests/mcc_parse.rs b/video/closedcaption/tests/mcc_parse.rs
index 42b0f3c9..42b0f3c9 100644
--- a/video/gst-plugin-closedcaption/tests/mcc_parse.rs
+++ b/video/closedcaption/tests/mcc_parse.rs
diff --git a/video/gst-plugin-closedcaption/tests/scc_enc.rs b/video/closedcaption/tests/scc_enc.rs
index 92003df9..92003df9 100644
--- a/video/gst-plugin-closedcaption/tests/scc_enc.rs
+++ b/video/closedcaption/tests/scc_enc.rs
diff --git a/video/gst-plugin-closedcaption/tests/scc_parse.rs b/video/closedcaption/tests/scc_parse.rs
index fa3797a4..fa3797a4 100644
--- a/video/gst-plugin-closedcaption/tests/scc_parse.rs
+++ b/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
index 6c3aad22..6c3aad22 100644
--- a/video/gst-plugin-closedcaption/tests/timecodes-cut-down-sample.scc
+++ b/video/closedcaption/tests/timecodes-cut-down-sample.scc
diff --git a/video/gst-plugin-closedcaption/tests/tttocea608.rs b/video/closedcaption/tests/tttocea608.rs
index 699ade4e..699ade4e 100644
--- a/video/gst-plugin-closedcaption/tests/tttocea608.rs
+++ b/video/closedcaption/tests/tttocea608.rs
diff --git a/video/gst-plugin-dav1d/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/video/gst-plugin-dav1d/build.rs
+++ b/video/dav1d/build.rs
diff --git a/video/gst-plugin-dav1d/src/dav1ddec.rs b/video/dav1d/src/dav1ddec.rs
index 2db1b958..2db1b958 100644
--- a/video/gst-plugin-dav1d/src/dav1ddec.rs
+++ b/video/dav1d/src/dav1ddec.rs
diff --git a/video/gst-plugin-dav1d/src/lib.rs b/video/dav1d/src/lib.rs
index a12b195f..a12b195f 100644
--- a/video/gst-plugin-dav1d/src/lib.rs
+++ b/video/dav1d/src/lib.rs
diff --git a/video/gst-plugin-flv/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/video/gst-plugin-flv/build.rs
+++ b/video/flv/build.rs
diff --git a/video/gst-plugin-flv/src/bytes.rs b/video/flv/src/bytes.rs
index d16be1d1..d16be1d1 100644
--- a/video/gst-plugin-flv/src/bytes.rs
+++ b/video/flv/src/bytes.rs
diff --git a/video/gst-plugin-flv/src/flvdemux.rs b/video/flv/src/flvdemux.rs
index 717caa48..717caa48 100644
--- a/video/gst-plugin-flv/src/flvdemux.rs
+++ b/video/flv/src/flvdemux.rs
diff --git a/video/gst-plugin-flv/src/lib.rs b/video/flv/src/lib.rs
index 7cab1829..7cab1829 100644
--- a/video/gst-plugin-flv/src/lib.rs
+++ b/video/flv/src/lib.rs
diff --git a/video/gst-plugin-gif/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/video/gst-plugin-gif/build.rs
+++ b/video/gif/build.rs
diff --git a/video/gst-plugin-gif/examples/testvideosrc2gif.rs b/video/gif/examples/testvideosrc2gif.rs
index 51083144..51083144 100644
--- a/video/gst-plugin-gif/examples/testvideosrc2gif.rs
+++ b/video/gif/examples/testvideosrc2gif.rs
diff --git a/video/gst-plugin-gif/src/gifenc.rs b/video/gif/src/gifenc.rs
index 966fd3f6..966fd3f6 100644
--- a/video/gst-plugin-gif/src/gifenc.rs
+++ b/video/gif/src/gifenc.rs
diff --git a/video/gst-plugin-gif/src/lib.rs b/video/gif/src/lib.rs
index 64cb0330..64cb0330 100644
--- a/video/gst-plugin-gif/src/lib.rs
+++ b/video/gif/src/lib.rs
diff --git a/video/gst-plugin-gif/tests/gifenc.rs b/video/gif/tests/gifenc.rs
index ade3b121..ade3b121 100644
--- a/video/gst-plugin-gif/tests/gifenc.rs
+++ b/video/gif/tests/gifenc.rs
diff --git a/video/gst-plugin-rav1e/Cargo.toml b/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
index 0d1ddb61..0d1ddb61 100644
--- a/video/gst-plugin-rav1e/build.rs
+++ b/video/rav1e/build.rs
diff --git a/video/gst-plugin-rav1e/src/lib.rs b/video/rav1e/src/lib.rs
index 153a5542..153a5542 100644
--- a/video/gst-plugin-rav1e/src/lib.rs
+++ b/video/rav1e/src/lib.rs
diff --git a/video/gst-plugin-rav1e/src/rav1enc.rs b/video/rav1e/src/rav1enc.rs
index 0d69a19c..0d69a19c 100644
--- a/video/gst-plugin-rav1e/src/rav1enc.rs
+++ b/video/rav1e/src/rav1enc.rs
diff --git a/video/gst-plugin-rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs
index c574b912..c574b912 100644
--- a/video/gst-plugin-rav1e/tests/rav1enc.rs
+++ b/video/rav1e/tests/rav1enc.rs