diff --git a/app/misc/tracker/ympbuild b/app/misc/tracker/ympbuild
index cfcb230e..86852d03 100644
--- a/app/misc/tracker/ympbuild
+++ b/app/misc/tracker/ympbuild
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://gitlab.gnome.org/GNOME/tracker/-/archive/$version/tracker-$version.tar.gz")
-depends=(hotdoc asciidoc libsoup)
+depends=(asciidoc libsoup3)
 makedepends=()
 md5sums=('d996e40dde492da7ed2a33ea716ba235')
 group=(app.misc)
@@ -21,6 +21,7 @@ setup(){
     meson setup build --prefix=/usr \
         --libdir=/usr/lib64/ \
 	-Dstemmer=auto \
+        -Ddocs=false
 	-Dsystemd_user_services=false 
 }
 
diff --git a/python/asciidoc/ympbuild b/dev/python/asciidoc/ympbuild
similarity index 100%
rename from python/asciidoc/ympbuild
rename to dev/python/asciidoc/ympbuild
diff --git a/python/hotdoc/ympbuild b/dev/python/hotdoc/ympbuild
similarity index 100%
rename from python/hotdoc/ympbuild
rename to dev/python/hotdoc/ympbuild
diff --git a/python/smartypants/ympbuild b/dev/python/smartypants/ympbuild
similarity index 100%
rename from python/smartypants/ympbuild
rename to dev/python/smartypants/ympbuild
diff --git a/gnome/base/gsettings-desktop-schemas/ympbuild b/gnome/base/gsettings-desktop-schemas/ympbuild
index 0becc190..985d0170 100644
--- a/gnome/base/gsettings-desktop-schemas/ympbuild
+++ b/gnome/base/gsettings-desktop-schemas/ympbuild
@@ -18,6 +18,7 @@ arch=('x86_64')
 cd $name-$version
 
 setup(){
+    sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in
     meson setup build --prefix=/usr \
         --libdir=/usr/lib64/
 }
diff --git a/net/glib-networking/ympbuild b/net/libs/glib-networking/ympbuild
similarity index 100%
rename from net/glib-networking/ympbuild
rename to net/libs/glib-networking/ympbuild
diff --git a/net/libproxy/ympbuild b/net/libs/libproxy/ympbuild
similarity index 100%
rename from net/libproxy/ympbuild
rename to net/libs/libproxy/ympbuild
diff --git a/net/libsoup/ympbuild b/net/libs/libsoup3/ympbuild
similarity index 85%
rename from net/libsoup/ympbuild
rename to net/libs/libsoup3/ympbuild
index 1f875bca..b44fd1f2 100644
--- a/net/libsoup/ympbuild
+++ b/net/libs/libsoup3/ympbuild
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-name='libsoup'
+name='libsoup3'
 release='1'
 version='3.3.1'
 url='https://gitlab.gnome.org/GNOME/libsoup.git/'
@@ -15,11 +15,12 @@ group=(net.libs)
 uses=()
 arch=('x86_64')
 
-cd $name-$version
+cd libsoup-$version
 
 setup(){
     meson setup build --prefix=/usr \
-        --libdir=/usr/lib64/
+        --libdir=/usr/lib64/ \
+        -Dsysprof=disabled
 }
 
 build(){