diff --git a/gir b/gir
index 60cbef054..7670e3da5 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit 60cbef05401bd73c3e8a0a7c0cbfb793394acfe7
+Subproject commit 7670e3da5a70c3f9a84767589f6cc6f42d41d02d
diff --git a/sys/gstreamer-app-sys/CHANGELOG.md b/gstreamer-app/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-app-sys/CHANGELOG.md
rename to gstreamer-app/sys/CHANGELOG.md
diff --git a/sys/gstreamer-app-sys/Cargo.toml b/gstreamer-app/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-app-sys/Cargo.toml
rename to gstreamer-app/sys/Cargo.toml
diff --git a/sys/Gir_GstApp.toml b/gstreamer-app/sys/Gir.toml
similarity index 84%
rename from sys/Gir_GstApp.toml
rename to gstreamer-app/sys/Gir.toml
index b8a4579df..5f0fc3cf6 100644
--- a/sys/Gir_GstApp.toml
+++ b/gstreamer-app/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstApp"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-app-sys"
+target_path = "."
 work_mode = "sys"
 
 external_libraries = [
diff --git a/sys/gstreamer-app-sys/LICENSE b/gstreamer-app/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-app-sys/LICENSE
rename to gstreamer-app/sys/LICENSE
diff --git a/sys/gstreamer-app-sys/README.md b/gstreamer-app/sys/README.md
similarity index 100%
rename from sys/gstreamer-app-sys/README.md
rename to gstreamer-app/sys/README.md
diff --git a/sys/gstreamer-app-sys/build.rs b/gstreamer-app/sys/build.rs
similarity index 100%
rename from sys/gstreamer-app-sys/build.rs
rename to gstreamer-app/sys/build.rs
diff --git a/sys/gstreamer-app-sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-app-sys/src/lib.rs
rename to gstreamer-app/sys/src/lib.rs
diff --git a/sys/gstreamer-app-sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-app-sys/tests/abi.rs
rename to gstreamer-app/sys/tests/abi.rs
diff --git a/sys/gstreamer-app-sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-app-sys/tests/constant.c
rename to gstreamer-app/sys/tests/constant.c
diff --git a/sys/gstreamer-app-sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-app-sys/tests/layout.c
rename to gstreamer-app/sys/tests/layout.c
diff --git a/sys/gstreamer-app-sys/tests/manual.h b/gstreamer-app/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-app-sys/tests/manual.h
rename to gstreamer-app/sys/tests/manual.h
diff --git a/sys/gstreamer-audio-sys/CHANGELOG.md b/gstreamer-audio/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-audio-sys/CHANGELOG.md
rename to gstreamer-audio/sys/CHANGELOG.md
diff --git a/sys/gstreamer-audio-sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-audio-sys/Cargo.toml
rename to gstreamer-audio/sys/Cargo.toml
diff --git a/sys/Gir_GstAudio.toml b/gstreamer-audio/sys/Gir.toml
similarity index 93%
rename from sys/Gir_GstAudio.toml
rename to gstreamer-audio/sys/Gir.toml
index 4fb961e2d..01da301e0 100644
--- a/sys/Gir_GstAudio.toml
+++ b/gstreamer-audio/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstAudio"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-audio-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-audio-sys/LICENSE b/gstreamer-audio/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-audio-sys/LICENSE
rename to gstreamer-audio/sys/LICENSE
diff --git a/sys/gstreamer-audio-sys/README.md b/gstreamer-audio/sys/README.md
similarity index 100%
rename from sys/gstreamer-audio-sys/README.md
rename to gstreamer-audio/sys/README.md
diff --git a/sys/gstreamer-audio-sys/build.rs b/gstreamer-audio/sys/build.rs
similarity index 100%
rename from sys/gstreamer-audio-sys/build.rs
rename to gstreamer-audio/sys/build.rs
diff --git a/sys/gstreamer-audio-sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-audio-sys/src/lib.rs
rename to gstreamer-audio/sys/src/lib.rs
diff --git a/sys/gstreamer-audio-sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-audio-sys/tests/abi.rs
rename to gstreamer-audio/sys/tests/abi.rs
diff --git a/sys/gstreamer-audio-sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-audio-sys/tests/constant.c
rename to gstreamer-audio/sys/tests/constant.c
diff --git a/sys/gstreamer-audio-sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-audio-sys/tests/layout.c
rename to gstreamer-audio/sys/tests/layout.c
diff --git a/sys/gstreamer-audio-sys/tests/manual.h b/gstreamer-audio/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-audio-sys/tests/manual.h
rename to gstreamer-audio/sys/tests/manual.h
diff --git a/sys/gstreamer-base-sys/CHANGELOG.md b/gstreamer-base/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-base-sys/CHANGELOG.md
rename to gstreamer-base/sys/CHANGELOG.md
diff --git a/sys/gstreamer-base-sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-base-sys/Cargo.toml
rename to gstreamer-base/sys/Cargo.toml
diff --git a/sys/Gir_GstBase.toml b/gstreamer-base/sys/Gir.toml
similarity index 84%
rename from sys/Gir_GstBase.toml
rename to gstreamer-base/sys/Gir.toml
index 202160a66..60e9ef76b 100644
--- a/sys/Gir_GstBase.toml
+++ b/gstreamer-base/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstBase"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-base-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-base-sys/LICENSE b/gstreamer-base/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-base-sys/LICENSE
rename to gstreamer-base/sys/LICENSE
diff --git a/sys/gstreamer-base-sys/README.md b/gstreamer-base/sys/README.md
similarity index 100%
rename from sys/gstreamer-base-sys/README.md
rename to gstreamer-base/sys/README.md
diff --git a/sys/gstreamer-base-sys/build.rs b/gstreamer-base/sys/build.rs
similarity index 100%
rename from sys/gstreamer-base-sys/build.rs
rename to gstreamer-base/sys/build.rs
diff --git a/sys/gstreamer-base-sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-base-sys/src/lib.rs
rename to gstreamer-base/sys/src/lib.rs
diff --git a/sys/gstreamer-base-sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-base-sys/tests/abi.rs
rename to gstreamer-base/sys/tests/abi.rs
diff --git a/sys/gstreamer-base-sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-base-sys/tests/constant.c
rename to gstreamer-base/sys/tests/constant.c
diff --git a/sys/gstreamer-base-sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-base-sys/tests/layout.c
rename to gstreamer-base/sys/tests/layout.c
diff --git a/sys/gstreamer-base-sys/tests/manual.h b/gstreamer-base/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-base-sys/tests/manual.h
rename to gstreamer-base/sys/tests/manual.h
diff --git a/sys/gstreamer-check-sys/CHANGELOG.md b/gstreamer-check/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-check-sys/CHANGELOG.md
rename to gstreamer-check/sys/CHANGELOG.md
diff --git a/sys/gstreamer-check-sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-check-sys/Cargo.toml
rename to gstreamer-check/sys/Cargo.toml
diff --git a/sys/Gir_GstCheck.toml b/gstreamer-check/sys/Gir.toml
similarity index 83%
rename from sys/Gir_GstCheck.toml
rename to gstreamer-check/sys/Gir.toml
index d42040a99..61a0aabbe 100644
--- a/sys/Gir_GstCheck.toml
+++ b/gstreamer-check/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstCheck"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-check-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-check-sys/LICENSE b/gstreamer-check/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-check-sys/LICENSE
rename to gstreamer-check/sys/LICENSE
diff --git a/sys/gstreamer-check-sys/README.md b/gstreamer-check/sys/README.md
similarity index 100%
rename from sys/gstreamer-check-sys/README.md
rename to gstreamer-check/sys/README.md
diff --git a/sys/gstreamer-check-sys/build.rs b/gstreamer-check/sys/build.rs
similarity index 100%
rename from sys/gstreamer-check-sys/build.rs
rename to gstreamer-check/sys/build.rs
diff --git a/sys/gstreamer-check-sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-check-sys/src/lib.rs
rename to gstreamer-check/sys/src/lib.rs
diff --git a/sys/gstreamer-check-sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-check-sys/tests/abi.rs
rename to gstreamer-check/sys/tests/abi.rs
diff --git a/sys/gstreamer-check-sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-check-sys/tests/constant.c
rename to gstreamer-check/sys/tests/constant.c
diff --git a/sys/gstreamer-check-sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-check-sys/tests/layout.c
rename to gstreamer-check/sys/tests/layout.c
diff --git a/sys/gstreamer-check-sys/tests/manual.h b/gstreamer-check/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-check-sys/tests/manual.h
rename to gstreamer-check/sys/tests/manual.h
diff --git a/sys/gstreamer-controller-sys/CHANGELOG.md b/gstreamer-controller/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-controller-sys/CHANGELOG.md
rename to gstreamer-controller/sys/CHANGELOG.md
diff --git a/sys/gstreamer-controller-sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-controller-sys/Cargo.toml
rename to gstreamer-controller/sys/Cargo.toml
diff --git a/sys/Gir_GstController.toml b/gstreamer-controller/sys/Gir.toml
similarity index 82%
rename from sys/Gir_GstController.toml
rename to gstreamer-controller/sys/Gir.toml
index 7689ecfdf..9a89b0316 100644
--- a/sys/Gir_GstController.toml
+++ b/gstreamer-controller/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstController"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-controller-sys"
+target_path = "."
 work_mode = "sys"
 
 external_libraries = [
diff --git a/sys/gstreamer-controller-sys/README.md b/gstreamer-controller/sys/README.md
similarity index 100%
rename from sys/gstreamer-controller-sys/README.md
rename to gstreamer-controller/sys/README.md
diff --git a/sys/gstreamer-controller-sys/build.rs b/gstreamer-controller/sys/build.rs
similarity index 100%
rename from sys/gstreamer-controller-sys/build.rs
rename to gstreamer-controller/sys/build.rs
diff --git a/sys/gstreamer-controller-sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-controller-sys/src/lib.rs
rename to gstreamer-controller/sys/src/lib.rs
diff --git a/sys/gstreamer-controller-sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-controller-sys/tests/abi.rs
rename to gstreamer-controller/sys/tests/abi.rs
diff --git a/sys/gstreamer-controller-sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-controller-sys/tests/constant.c
rename to gstreamer-controller/sys/tests/constant.c
diff --git a/sys/gstreamer-controller-sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-controller-sys/tests/layout.c
rename to gstreamer-controller/sys/tests/layout.c
diff --git a/sys/gstreamer-controller-sys/tests/manual.h b/gstreamer-controller/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-controller-sys/tests/manual.h
rename to gstreamer-controller/sys/tests/manual.h
diff --git a/sys/gstreamer-editing-services-sys/CHANGELOG.md b/gstreamer-editing-services/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-editing-services-sys/CHANGELOG.md
rename to gstreamer-editing-services/sys/CHANGELOG.md
diff --git a/sys/gstreamer-editing-services-sys/Cargo.toml b/gstreamer-editing-services/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-editing-services-sys/Cargo.toml
rename to gstreamer-editing-services/sys/Cargo.toml
diff --git a/sys/Gir_GstEditingServices.toml b/gstreamer-editing-services/sys/Gir.toml
similarity index 84%
rename from sys/Gir_GstEditingServices.toml
rename to gstreamer-editing-services/sys/Gir.toml
index f32d119e6..8f7e769f2 100644
--- a/sys/Gir_GstEditingServices.toml
+++ b/gstreamer-editing-services/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GES"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-editing-services-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-editing-services-sys/README.md b/gstreamer-editing-services/sys/README.md
similarity index 100%
rename from sys/gstreamer-editing-services-sys/README.md
rename to gstreamer-editing-services/sys/README.md
diff --git a/sys/gstreamer-editing-services-sys/build.rs b/gstreamer-editing-services/sys/build.rs
similarity index 100%
rename from sys/gstreamer-editing-services-sys/build.rs
rename to gstreamer-editing-services/sys/build.rs
diff --git a/sys/gstreamer-editing-services-sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-editing-services-sys/src/lib.rs
rename to gstreamer-editing-services/sys/src/lib.rs
diff --git a/sys/gstreamer-editing-services-sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-editing-services-sys/tests/abi.rs
rename to gstreamer-editing-services/sys/tests/abi.rs
diff --git a/sys/gstreamer-editing-services-sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-editing-services-sys/tests/constant.c
rename to gstreamer-editing-services/sys/tests/constant.c
diff --git a/sys/gstreamer-editing-services-sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-editing-services-sys/tests/layout.c
rename to gstreamer-editing-services/sys/tests/layout.c
diff --git a/sys/gstreamer-editing-services-sys/tests/manual.h b/gstreamer-editing-services/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-editing-services-sys/tests/manual.h
rename to gstreamer-editing-services/sys/tests/manual.h
diff --git a/sys/gstreamer-gl-sys/CHANGELOG.md b/gstreamer-gl/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-gl-sys/CHANGELOG.md
rename to gstreamer-gl/sys/CHANGELOG.md
diff --git a/sys/gstreamer-gl-sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-gl-sys/Cargo.toml
rename to gstreamer-gl/sys/Cargo.toml
diff --git a/sys/Gir_GstGL.toml b/gstreamer-gl/sys/Gir.toml
similarity index 96%
rename from sys/Gir_GstGL.toml
rename to gstreamer-gl/sys/Gir.toml
index 31b6ca00d..69346bffe 100644
--- a/sys/Gir_GstGL.toml
+++ b/gstreamer-gl/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstGL"
 version = "1.0"
 min_cfg_version = "1.14"
-target_path = "gstreamer-gl-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-gl-sys/README.md b/gstreamer-gl/sys/README.md
similarity index 100%
rename from sys/gstreamer-gl-sys/README.md
rename to gstreamer-gl/sys/README.md
diff --git a/sys/gstreamer-gl-sys/build.rs b/gstreamer-gl/sys/build.rs
similarity index 100%
rename from sys/gstreamer-gl-sys/build.rs
rename to gstreamer-gl/sys/build.rs
diff --git a/sys/gstreamer-gl-sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-gl-sys/src/lib.rs
rename to gstreamer-gl/sys/src/lib.rs
diff --git a/sys/gstreamer-gl-sys/src/manual.rs b/gstreamer-gl/sys/src/manual.rs
similarity index 100%
rename from sys/gstreamer-gl-sys/src/manual.rs
rename to gstreamer-gl/sys/src/manual.rs
diff --git a/sys/gstreamer-gl-sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-gl-sys/tests/abi.rs
rename to gstreamer-gl/sys/tests/abi.rs
diff --git a/sys/gstreamer-gl-sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-gl-sys/tests/constant.c
rename to gstreamer-gl/sys/tests/constant.c
diff --git a/sys/gstreamer-gl-sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-gl-sys/tests/layout.c
rename to gstreamer-gl/sys/tests/layout.c
diff --git a/sys/gstreamer-gl-sys/tests/manual.h b/gstreamer-gl/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-gl-sys/tests/manual.h
rename to gstreamer-gl/sys/tests/manual.h
diff --git a/sys/gstreamer-mpegts-sys/CHANGELOG.md b/gstreamer-mpegts/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-mpegts-sys/CHANGELOG.md
rename to gstreamer-mpegts/sys/CHANGELOG.md
diff --git a/sys/gstreamer-mpegts-sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-mpegts-sys/Cargo.toml
rename to gstreamer-mpegts/sys/Cargo.toml
diff --git a/sys/Gir_GstMpegts.toml b/gstreamer-mpegts/sys/Gir.toml
similarity index 83%
rename from sys/Gir_GstMpegts.toml
rename to gstreamer-mpegts/sys/Gir.toml
index 3075f3144..de508d177 100644
--- a/sys/Gir_GstMpegts.toml
+++ b/gstreamer-mpegts/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstMpegts"
 version = "1.0"
 min_cfg_version = "1.12"
-target_path = "gstreamer-mpegts-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-mpegts-sys/LICENSE b/gstreamer-mpegts/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-mpegts-sys/LICENSE
rename to gstreamer-mpegts/sys/LICENSE
diff --git a/sys/gstreamer-mpegts-sys/README.md b/gstreamer-mpegts/sys/README.md
similarity index 100%
rename from sys/gstreamer-mpegts-sys/README.md
rename to gstreamer-mpegts/sys/README.md
diff --git a/sys/gstreamer-mpegts-sys/build.rs b/gstreamer-mpegts/sys/build.rs
similarity index 100%
rename from sys/gstreamer-mpegts-sys/build.rs
rename to gstreamer-mpegts/sys/build.rs
diff --git a/sys/gstreamer-mpegts-sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-mpegts-sys/src/lib.rs
rename to gstreamer-mpegts/sys/src/lib.rs
diff --git a/sys/gstreamer-mpegts-sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-mpegts-sys/tests/abi.rs
rename to gstreamer-mpegts/sys/tests/abi.rs
diff --git a/sys/gstreamer-mpegts-sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-mpegts-sys/tests/constant.c
rename to gstreamer-mpegts/sys/tests/constant.c
diff --git a/sys/gstreamer-mpegts-sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-mpegts-sys/tests/layout.c
rename to gstreamer-mpegts/sys/tests/layout.c
diff --git a/sys/gstreamer-mpegts-sys/tests/manual.h b/gstreamer-mpegts/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-mpegts-sys/tests/manual.h
rename to gstreamer-mpegts/sys/tests/manual.h
diff --git a/sys/gstreamer-net-sys/CHANGELOG.md b/gstreamer-net/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-net-sys/CHANGELOG.md
rename to gstreamer-net/sys/CHANGELOG.md
diff --git a/sys/gstreamer-net-sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-net-sys/Cargo.toml
rename to gstreamer-net/sys/Cargo.toml
diff --git a/sys/Gir_GstNet.toml b/gstreamer-net/sys/Gir.toml
similarity index 84%
rename from sys/Gir_GstNet.toml
rename to gstreamer-net/sys/Gir.toml
index 553cded7a..d3925323d 100644
--- a/sys/Gir_GstNet.toml
+++ b/gstreamer-net/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstNet"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-net-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-net-sys/LICENSE b/gstreamer-net/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-net-sys/LICENSE
rename to gstreamer-net/sys/LICENSE
diff --git a/sys/gstreamer-net-sys/README.md b/gstreamer-net/sys/README.md
similarity index 100%
rename from sys/gstreamer-net-sys/README.md
rename to gstreamer-net/sys/README.md
diff --git a/sys/gstreamer-net-sys/build.rs b/gstreamer-net/sys/build.rs
similarity index 100%
rename from sys/gstreamer-net-sys/build.rs
rename to gstreamer-net/sys/build.rs
diff --git a/sys/gstreamer-net-sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-net-sys/src/lib.rs
rename to gstreamer-net/sys/src/lib.rs
diff --git a/sys/gstreamer-net-sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-net-sys/tests/abi.rs
rename to gstreamer-net/sys/tests/abi.rs
diff --git a/sys/gstreamer-net-sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-net-sys/tests/constant.c
rename to gstreamer-net/sys/tests/constant.c
diff --git a/sys/gstreamer-net-sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-net-sys/tests/layout.c
rename to gstreamer-net/sys/tests/layout.c
diff --git a/sys/gstreamer-net-sys/tests/manual.h b/gstreamer-net/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-net-sys/tests/manual.h
rename to gstreamer-net/sys/tests/manual.h
diff --git a/sys/gstreamer-pbutils-sys/CHANGELOG.md b/gstreamer-pbutils/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-pbutils-sys/CHANGELOG.md
rename to gstreamer-pbutils/sys/CHANGELOG.md
diff --git a/sys/gstreamer-pbutils-sys/Cargo.toml b/gstreamer-pbutils/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-pbutils-sys/Cargo.toml
rename to gstreamer-pbutils/sys/Cargo.toml
diff --git a/sys/Gir_GstPbutils.toml b/gstreamer-pbutils/sys/Gir.toml
similarity index 90%
rename from sys/Gir_GstPbutils.toml
rename to gstreamer-pbutils/sys/Gir.toml
index 46181b579..da295b029 100644
--- a/sys/Gir_GstPbutils.toml
+++ b/gstreamer-pbutils/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstPbutils"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-pbutils-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-pbutils-sys/LICENSE b/gstreamer-pbutils/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-pbutils-sys/LICENSE
rename to gstreamer-pbutils/sys/LICENSE
diff --git a/sys/gstreamer-pbutils-sys/README.md b/gstreamer-pbutils/sys/README.md
similarity index 100%
rename from sys/gstreamer-pbutils-sys/README.md
rename to gstreamer-pbutils/sys/README.md
diff --git a/sys/gstreamer-pbutils-sys/build.rs b/gstreamer-pbutils/sys/build.rs
similarity index 100%
rename from sys/gstreamer-pbutils-sys/build.rs
rename to gstreamer-pbutils/sys/build.rs
diff --git a/sys/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-pbutils-sys/src/lib.rs
rename to gstreamer-pbutils/sys/src/lib.rs
diff --git a/sys/gstreamer-pbutils-sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-pbutils-sys/tests/abi.rs
rename to gstreamer-pbutils/sys/tests/abi.rs
diff --git a/sys/gstreamer-pbutils-sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-pbutils-sys/tests/constant.c
rename to gstreamer-pbutils/sys/tests/constant.c
diff --git a/sys/gstreamer-pbutils-sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-pbutils-sys/tests/layout.c
rename to gstreamer-pbutils/sys/tests/layout.c
diff --git a/sys/gstreamer-pbutils-sys/tests/manual.h b/gstreamer-pbutils/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-pbutils-sys/tests/manual.h
rename to gstreamer-pbutils/sys/tests/manual.h
diff --git a/sys/gstreamer-player-sys/CHANGELOG.md b/gstreamer-player/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-player-sys/CHANGELOG.md
rename to gstreamer-player/sys/CHANGELOG.md
diff --git a/sys/gstreamer-player-sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-player-sys/Cargo.toml
rename to gstreamer-player/sys/Cargo.toml
diff --git a/sys/Gir_GstPlayer.toml b/gstreamer-player/sys/Gir.toml
similarity index 81%
rename from sys/Gir_GstPlayer.toml
rename to gstreamer-player/sys/Gir.toml
index 49f6dbd8d..9a39cb992 100644
--- a/sys/Gir_GstPlayer.toml
+++ b/gstreamer-player/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstPlayer"
 version = "1.0"
 min_cfg_version = "1.12"
-target_path = "gstreamer-player-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-player-sys/LICENSE b/gstreamer-player/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-player-sys/LICENSE
rename to gstreamer-player/sys/LICENSE
diff --git a/sys/gstreamer-player-sys/README.md b/gstreamer-player/sys/README.md
similarity index 100%
rename from sys/gstreamer-player-sys/README.md
rename to gstreamer-player/sys/README.md
diff --git a/sys/gstreamer-player-sys/build.rs b/gstreamer-player/sys/build.rs
similarity index 100%
rename from sys/gstreamer-player-sys/build.rs
rename to gstreamer-player/sys/build.rs
diff --git a/sys/gstreamer-player-sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-player-sys/src/lib.rs
rename to gstreamer-player/sys/src/lib.rs
diff --git a/sys/gstreamer-player-sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-player-sys/tests/abi.rs
rename to gstreamer-player/sys/tests/abi.rs
diff --git a/sys/gstreamer-player-sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-player-sys/tests/constant.c
rename to gstreamer-player/sys/tests/constant.c
diff --git a/sys/gstreamer-player-sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-player-sys/tests/layout.c
rename to gstreamer-player/sys/tests/layout.c
diff --git a/sys/gstreamer-player-sys/tests/manual.h b/gstreamer-player/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-player-sys/tests/manual.h
rename to gstreamer-player/sys/tests/manual.h
diff --git a/sys/gstreamer-rtp-sys/CHANGELOG.md b/gstreamer-rtp/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-rtp-sys/CHANGELOG.md
rename to gstreamer-rtp/sys/CHANGELOG.md
diff --git a/sys/gstreamer-rtp-sys/Cargo.toml b/gstreamer-rtp/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-rtp-sys/Cargo.toml
rename to gstreamer-rtp/sys/Cargo.toml
diff --git a/sys/Gir_GstRtp.toml b/gstreamer-rtp/sys/Gir.toml
similarity index 89%
rename from sys/Gir_GstRtp.toml
rename to gstreamer-rtp/sys/Gir.toml
index f7c0f28ff..0aa961724 100644
--- a/sys/Gir_GstRtp.toml
+++ b/gstreamer-rtp/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstRtp"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-rtp-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-rtp-sys/README.md b/gstreamer-rtp/sys/README.md
similarity index 100%
rename from sys/gstreamer-rtp-sys/README.md
rename to gstreamer-rtp/sys/README.md
diff --git a/sys/gstreamer-rtp-sys/build.rs b/gstreamer-rtp/sys/build.rs
similarity index 100%
rename from sys/gstreamer-rtp-sys/build.rs
rename to gstreamer-rtp/sys/build.rs
diff --git a/sys/gstreamer-rtp-sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-rtp-sys/src/lib.rs
rename to gstreamer-rtp/sys/src/lib.rs
diff --git a/sys/gstreamer-rtp-sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-rtp-sys/tests/abi.rs
rename to gstreamer-rtp/sys/tests/abi.rs
diff --git a/sys/gstreamer-rtp-sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-rtp-sys/tests/constant.c
rename to gstreamer-rtp/sys/tests/constant.c
diff --git a/sys/gstreamer-rtp-sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-rtp-sys/tests/layout.c
rename to gstreamer-rtp/sys/tests/layout.c
diff --git a/sys/gstreamer-rtp-sys/tests/manual.h b/gstreamer-rtp/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-rtp-sys/tests/manual.h
rename to gstreamer-rtp/sys/tests/manual.h
diff --git a/sys/gstreamer-rtsp-server-sys/CHANGELOG.md b/gstreamer-rtsp-server/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/CHANGELOG.md
rename to gstreamer-rtsp-server/sys/CHANGELOG.md
diff --git a/sys/gstreamer-rtsp-server-sys/Cargo.toml b/gstreamer-rtsp-server/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/Cargo.toml
rename to gstreamer-rtsp-server/sys/Cargo.toml
diff --git a/sys/Gir_GstRtspServer.toml b/gstreamer-rtsp-server/sys/Gir.toml
similarity index 85%
rename from sys/Gir_GstRtspServer.toml
rename to gstreamer-rtsp-server/sys/Gir.toml
index 7840cdd1f..6c8e8a60a 100644
--- a/sys/Gir_GstRtspServer.toml
+++ b/gstreamer-rtsp-server/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstRtspServer"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-rtsp-server-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-rtsp-server-sys/LICENSE b/gstreamer-rtsp-server/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/LICENSE
rename to gstreamer-rtsp-server/sys/LICENSE
diff --git a/sys/gstreamer-rtsp-server-sys/README.md b/gstreamer-rtsp-server/sys/README.md
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/README.md
rename to gstreamer-rtsp-server/sys/README.md
diff --git a/sys/gstreamer-rtsp-server-sys/build.rs b/gstreamer-rtsp-server/sys/build.rs
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/build.rs
rename to gstreamer-rtsp-server/sys/build.rs
diff --git a/sys/gstreamer-rtsp-server-sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/src/lib.rs
rename to gstreamer-rtsp-server/sys/src/lib.rs
diff --git a/sys/gstreamer-rtsp-server-sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/tests/abi.rs
rename to gstreamer-rtsp-server/sys/tests/abi.rs
diff --git a/sys/gstreamer-rtsp-server-sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/tests/constant.c
rename to gstreamer-rtsp-server/sys/tests/constant.c
diff --git a/sys/gstreamer-rtsp-server-sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/tests/layout.c
rename to gstreamer-rtsp-server/sys/tests/layout.c
diff --git a/sys/gstreamer-rtsp-server-sys/tests/manual.h b/gstreamer-rtsp-server/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-rtsp-server-sys/tests/manual.h
rename to gstreamer-rtsp-server/sys/tests/manual.h
diff --git a/sys/gstreamer-rtsp-sys/CHANGELOG.md b/gstreamer-rtsp/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-rtsp-sys/CHANGELOG.md
rename to gstreamer-rtsp/sys/CHANGELOG.md
diff --git a/sys/gstreamer-rtsp-sys/Cargo.toml b/gstreamer-rtsp/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-rtsp-sys/Cargo.toml
rename to gstreamer-rtsp/sys/Cargo.toml
diff --git a/sys/Gir_GstRtsp.toml b/gstreamer-rtsp/sys/Gir.toml
similarity index 88%
rename from sys/Gir_GstRtsp.toml
rename to gstreamer-rtsp/sys/Gir.toml
index dd72a5dd9..f9520615c 100644
--- a/sys/Gir_GstRtsp.toml
+++ b/gstreamer-rtsp/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstRtsp"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-rtsp-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-rtsp-sys/LICENSE b/gstreamer-rtsp/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-rtsp-sys/LICENSE
rename to gstreamer-rtsp/sys/LICENSE
diff --git a/sys/gstreamer-rtsp-sys/README.md b/gstreamer-rtsp/sys/README.md
similarity index 100%
rename from sys/gstreamer-rtsp-sys/README.md
rename to gstreamer-rtsp/sys/README.md
diff --git a/sys/gstreamer-rtsp-sys/build.rs b/gstreamer-rtsp/sys/build.rs
similarity index 100%
rename from sys/gstreamer-rtsp-sys/build.rs
rename to gstreamer-rtsp/sys/build.rs
diff --git a/sys/gstreamer-rtsp-sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-rtsp-sys/src/lib.rs
rename to gstreamer-rtsp/sys/src/lib.rs
diff --git a/sys/gstreamer-rtsp-sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-rtsp-sys/tests/abi.rs
rename to gstreamer-rtsp/sys/tests/abi.rs
diff --git a/sys/gstreamer-rtsp-sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-rtsp-sys/tests/constant.c
rename to gstreamer-rtsp/sys/tests/constant.c
diff --git a/sys/gstreamer-rtsp-sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-rtsp-sys/tests/layout.c
rename to gstreamer-rtsp/sys/tests/layout.c
diff --git a/sys/gstreamer-rtsp-sys/tests/manual.h b/gstreamer-rtsp/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-rtsp-sys/tests/manual.h
rename to gstreamer-rtsp/sys/tests/manual.h
diff --git a/sys/gstreamer-sdp-sys/CHANGELOG.md b/gstreamer-sdp/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-sdp-sys/CHANGELOG.md
rename to gstreamer-sdp/sys/CHANGELOG.md
diff --git a/sys/gstreamer-sdp-sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-sdp-sys/Cargo.toml
rename to gstreamer-sdp/sys/Cargo.toml
diff --git a/sys/Gir_GstSdp.toml b/gstreamer-sdp/sys/Gir.toml
similarity index 84%
rename from sys/Gir_GstSdp.toml
rename to gstreamer-sdp/sys/Gir.toml
index a4521b2b1..84e9ed79a 100644
--- a/sys/Gir_GstSdp.toml
+++ b/gstreamer-sdp/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstSdp"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-sdp-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-sdp-sys/LICENSE b/gstreamer-sdp/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-sdp-sys/LICENSE
rename to gstreamer-sdp/sys/LICENSE
diff --git a/sys/gstreamer-sdp-sys/README.md b/gstreamer-sdp/sys/README.md
similarity index 100%
rename from sys/gstreamer-sdp-sys/README.md
rename to gstreamer-sdp/sys/README.md
diff --git a/sys/gstreamer-sdp-sys/build.rs b/gstreamer-sdp/sys/build.rs
similarity index 100%
rename from sys/gstreamer-sdp-sys/build.rs
rename to gstreamer-sdp/sys/build.rs
diff --git a/sys/gstreamer-sdp-sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-sdp-sys/src/lib.rs
rename to gstreamer-sdp/sys/src/lib.rs
diff --git a/sys/gstreamer-sdp-sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-sdp-sys/tests/abi.rs
rename to gstreamer-sdp/sys/tests/abi.rs
diff --git a/sys/gstreamer-sdp-sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-sdp-sys/tests/constant.c
rename to gstreamer-sdp/sys/tests/constant.c
diff --git a/sys/gstreamer-sdp-sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-sdp-sys/tests/layout.c
rename to gstreamer-sdp/sys/tests/layout.c
diff --git a/sys/gstreamer-sdp-sys/tests/manual.h b/gstreamer-sdp/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-sdp-sys/tests/manual.h
rename to gstreamer-sdp/sys/tests/manual.h
diff --git a/sys/gstreamer-sys/CHANGELOG.md b/gstreamer-tag/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-sys/CHANGELOG.md
rename to gstreamer-tag/sys/CHANGELOG.md
diff --git a/sys/gstreamer-tag-sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-tag-sys/Cargo.toml
rename to gstreamer-tag/sys/Cargo.toml
diff --git a/sys/Gir_GstTag.toml b/gstreamer-tag/sys/Gir.toml
similarity index 85%
rename from sys/Gir_GstTag.toml
rename to gstreamer-tag/sys/Gir.toml
index 75844e385..ecf9166d2 100644
--- a/sys/Gir_GstTag.toml
+++ b/gstreamer-tag/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstTag"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-tag-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-sys/LICENSE b/gstreamer-tag/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-sys/LICENSE
rename to gstreamer-tag/sys/LICENSE
diff --git a/sys/gstreamer-tag-sys/README.md b/gstreamer-tag/sys/README.md
similarity index 100%
rename from sys/gstreamer-tag-sys/README.md
rename to gstreamer-tag/sys/README.md
diff --git a/sys/gstreamer-sys/build.rs b/gstreamer-tag/sys/build.rs
similarity index 100%
rename from sys/gstreamer-sys/build.rs
rename to gstreamer-tag/sys/build.rs
diff --git a/sys/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-tag-sys/src/lib.rs
rename to gstreamer-tag/sys/src/lib.rs
diff --git a/sys/gstreamer-tag-sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-tag-sys/tests/abi.rs
rename to gstreamer-tag/sys/tests/abi.rs
diff --git a/sys/gstreamer-sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-sys/tests/constant.c
rename to gstreamer-tag/sys/tests/constant.c
diff --git a/sys/gstreamer-sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-sys/tests/layout.c
rename to gstreamer-tag/sys/tests/layout.c
diff --git a/sys/gstreamer-tag-sys/tests/manual.h b/gstreamer-tag/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-tag-sys/tests/manual.h
rename to gstreamer-tag/sys/tests/manual.h
diff --git a/sys/gstreamer-tag-sys/CHANGELOG.md b/gstreamer-video/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-tag-sys/CHANGELOG.md
rename to gstreamer-video/sys/CHANGELOG.md
diff --git a/sys/gstreamer-video-sys/Cargo.toml b/gstreamer-video/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-video-sys/Cargo.toml
rename to gstreamer-video/sys/Cargo.toml
diff --git a/sys/Gir_GstVideo.toml b/gstreamer-video/sys/Gir.toml
similarity index 94%
rename from sys/Gir_GstVideo.toml
rename to gstreamer-video/sys/Gir.toml
index d23eae490..dbd68e266 100644
--- a/sys/Gir_GstVideo.toml
+++ b/gstreamer-video/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstVideo"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-video-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-tag-sys/LICENSE b/gstreamer-video/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-tag-sys/LICENSE
rename to gstreamer-video/sys/LICENSE
diff --git a/sys/gstreamer-video-sys/README.md b/gstreamer-video/sys/README.md
similarity index 100%
rename from sys/gstreamer-video-sys/README.md
rename to gstreamer-video/sys/README.md
diff --git a/sys/gstreamer-tag-sys/build.rs b/gstreamer-video/sys/build.rs
similarity index 100%
rename from sys/gstreamer-tag-sys/build.rs
rename to gstreamer-video/sys/build.rs
diff --git a/sys/gstreamer-video-sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-video-sys/src/lib.rs
rename to gstreamer-video/sys/src/lib.rs
diff --git a/sys/gstreamer-video-sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-video-sys/tests/abi.rs
rename to gstreamer-video/sys/tests/abi.rs
diff --git a/sys/gstreamer-tag-sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-tag-sys/tests/constant.c
rename to gstreamer-video/sys/tests/constant.c
diff --git a/sys/gstreamer-tag-sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-tag-sys/tests/layout.c
rename to gstreamer-video/sys/tests/layout.c
diff --git a/sys/gstreamer-video-sys/tests/manual.h b/gstreamer-video/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-video-sys/tests/manual.h
rename to gstreamer-video/sys/tests/manual.h
diff --git a/sys/gstreamer-video-sys/CHANGELOG.md b/gstreamer-webrtc/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-video-sys/CHANGELOG.md
rename to gstreamer-webrtc/sys/CHANGELOG.md
diff --git a/sys/gstreamer-webrtc-sys/Cargo.toml b/gstreamer-webrtc/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-webrtc-sys/Cargo.toml
rename to gstreamer-webrtc/sys/Cargo.toml
diff --git a/sys/Gir_GstWebRTC.toml b/gstreamer-webrtc/sys/Gir.toml
similarity index 80%
rename from sys/Gir_GstWebRTC.toml
rename to gstreamer-webrtc/sys/Gir.toml
index 9ba82fe0d..9b68f2f5a 100644
--- a/sys/Gir_GstWebRTC.toml
+++ b/gstreamer-webrtc/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "GstWebRTC"
 version = "1.0"
 min_cfg_version = "1.14"
-target_path = "gstreamer-webrtc-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-webrtc-sys/README.md b/gstreamer-webrtc/sys/README.md
similarity index 100%
rename from sys/gstreamer-webrtc-sys/README.md
rename to gstreamer-webrtc/sys/README.md
diff --git a/sys/gstreamer-video-sys/build.rs b/gstreamer-webrtc/sys/build.rs
similarity index 100%
rename from sys/gstreamer-video-sys/build.rs
rename to gstreamer-webrtc/sys/build.rs
diff --git a/sys/gstreamer-webrtc-sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-webrtc-sys/src/lib.rs
rename to gstreamer-webrtc/sys/src/lib.rs
diff --git a/sys/gstreamer-webrtc-sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-webrtc-sys/tests/abi.rs
rename to gstreamer-webrtc/sys/tests/abi.rs
diff --git a/sys/gstreamer-video-sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-video-sys/tests/constant.c
rename to gstreamer-webrtc/sys/tests/constant.c
diff --git a/sys/gstreamer-video-sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-video-sys/tests/layout.c
rename to gstreamer-webrtc/sys/tests/layout.c
diff --git a/sys/gstreamer-webrtc-sys/tests/manual.h b/gstreamer-webrtc/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-webrtc-sys/tests/manual.h
rename to gstreamer-webrtc/sys/tests/manual.h
diff --git a/sys/gstreamer-webrtc-sys/CHANGELOG.md b/gstreamer/sys/CHANGELOG.md
similarity index 100%
rename from sys/gstreamer-webrtc-sys/CHANGELOG.md
rename to gstreamer/sys/CHANGELOG.md
diff --git a/sys/gstreamer-sys/Cargo.lock b/gstreamer/sys/Cargo.lock
similarity index 100%
rename from sys/gstreamer-sys/Cargo.lock
rename to gstreamer/sys/Cargo.lock
diff --git a/sys/gstreamer-sys/Cargo.toml b/gstreamer/sys/Cargo.toml
similarity index 100%
rename from sys/gstreamer-sys/Cargo.toml
rename to gstreamer/sys/Cargo.toml
diff --git a/sys/Gir_Gst.toml b/gstreamer/sys/Gir.toml
similarity index 98%
rename from sys/Gir_Gst.toml
rename to gstreamer/sys/Gir.toml
index cbae1af79..00452ba53 100644
--- a/sys/Gir_Gst.toml
+++ b/gstreamer/sys/Gir.toml
@@ -1,9 +1,9 @@
 [options]
-girs_dir = "gir-files"
+girs_dir = "../../gir-files"
 library = "Gst"
 version = "1.0"
 min_cfg_version = "1.8"
-target_path = "gstreamer-sys"
+target_path = "."
 work_mode = "sys"
 
 extra_versions = [
diff --git a/sys/gstreamer-video-sys/LICENSE b/gstreamer/sys/LICENSE
similarity index 100%
rename from sys/gstreamer-video-sys/LICENSE
rename to gstreamer/sys/LICENSE
diff --git a/sys/gstreamer-sys/README.md b/gstreamer/sys/README.md
similarity index 100%
rename from sys/gstreamer-sys/README.md
rename to gstreamer/sys/README.md
diff --git a/sys/gstreamer-webrtc-sys/build.rs b/gstreamer/sys/build.rs
similarity index 100%
rename from sys/gstreamer-webrtc-sys/build.rs
rename to gstreamer/sys/build.rs
diff --git a/sys/gstreamer-sys/src/lib.rs b/gstreamer/sys/src/lib.rs
similarity index 100%
rename from sys/gstreamer-sys/src/lib.rs
rename to gstreamer/sys/src/lib.rs
diff --git a/sys/gstreamer-sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs
similarity index 100%
rename from sys/gstreamer-sys/tests/abi.rs
rename to gstreamer/sys/tests/abi.rs
diff --git a/sys/gstreamer-webrtc-sys/tests/constant.c b/gstreamer/sys/tests/constant.c
similarity index 100%
rename from sys/gstreamer-webrtc-sys/tests/constant.c
rename to gstreamer/sys/tests/constant.c
diff --git a/sys/gstreamer-webrtc-sys/tests/layout.c b/gstreamer/sys/tests/layout.c
similarity index 100%
rename from sys/gstreamer-webrtc-sys/tests/layout.c
rename to gstreamer/sys/tests/layout.c
diff --git a/sys/gstreamer-sys/tests/manual.h b/gstreamer/sys/tests/manual.h
similarity index 100%
rename from sys/gstreamer-sys/tests/manual.h
rename to gstreamer/sys/tests/manual.h