[gnome-build-meta] move elements in the flatpak runtime and sdk to sdk/



commit 9b06e5ab614ba986382ab893054a3d25895b4a37
Author: Abderrahim Kitouni <a kitouni gmail com>
Date:   Sat May 19 13:44:14 2018 +0100

    move elements in the flatpak runtime and sdk to sdk/
    
    this also adds two stack elements:
    - sdk-platform.bst contains the elements needed for the platform (everything except developer tools)
    - sdk.bst contains sdk-platform.bst and developer tools
    
    also remove dependencies on systemd/udev

 elements/core-deps.bst                             | 50 ----------------
 elements/core-deps/ModemManager.bst                |  4 +-
 elements/core-deps/NetworkManager.bst              | 12 ++--
 elements/core-deps/PackageKit.bst                  |  4 +-
 elements/core-deps/accountsservice.bst             |  4 +-
 elements/core-deps/appstream-glib.bst              | 18 ------
 elements/core-deps/atkmm-1.6.bst                   |  2 +-
 elements/core-deps/atkmm.bst                       |  2 +-
 elements/core-deps/avahi.bst                       |  2 +-
 elements/core-deps/colord-gtk.bst                  |  6 +-
 elements/core-deps/colord.bst                      |  6 +-
 elements/core-deps/evolution-data-server.bst       | 14 ++---
 elements/core-deps/folks.bst                       |  6 +-
 elements/core-deps/gegl.bst                        | 10 ++--
 elements/core-deps/geoclue.bst                     | 14 -----
 elements/core-deps/geocode-glib.bst                | 10 ++--
 elements/core-deps/glibmm-2.4.bst                  |  2 +-
 elements/core-deps/glibmm.bst                      |  2 +-
 elements/core-deps/gmime3.bst                      |  4 +-
 elements/core-deps/gnome-autoar.bst                | 10 ++--
 elements/core-deps/gnome-online-accounts.bst       | 10 ++--
 elements/core-deps/gnome-online-miners.bst         |  2 +-
 elements/core-deps/gnome-video-effects.bst         |  4 +-
 elements/core-deps/gom.bst                         |  6 +-
 elements/core-deps/graphene.bst                    |  4 +-
 elements/core-deps/graphviz.bst                    |  4 +-
 elements/core-deps/grilo-plugins.bst               |  4 +-
 elements/core-deps/grilo.bst                       | 12 ++--
 elements/core-deps/gsound.bst                      |  8 +--
 elements/core-deps/gspell.bst                      |  6 +-
 elements/core-deps/gssdp.bst                       |  6 +-
 elements/core-deps/gtk+.bst                        | 22 ++++----
 elements/core-deps/gtk-vnc.bst                     | 10 ++--
 elements/core-deps/gtkmm-3.bst                     |  4 +-
 elements/core-deps/gtkmm.bst                       |  2 +-
 elements/core-deps/gtksourceview-3.bst             |  4 +-
 elements/core-deps/gtksourceview.bst               |  4 +-
 elements/core-deps/gupnp-av.bst                    |  4 +-
 elements/core-deps/gupnp-dlna.bst                  | 10 ++--
 elements/core-deps/gupnp-igd.bst                   |  2 +-
 elements/core-deps/gupnp.bst                       |  6 +-
 elements/core-deps/ibus-anthy.bst                  |  8 +--
 elements/core-deps/ibus-hangul.bst                 |  2 +-
 elements/core-deps/ibus-libpinyin.bst              |  2 +-
 elements/core-deps/libchamplain.bst                | 10 ++--
 elements/core-deps/libdazzle.bst                   |  8 +--
 elements/core-deps/libgdata.bst                    | 10 ++--
 elements/core-deps/libgee.bst                      |  6 +-
 elements/core-deps/libgepub.bst                    |  6 +-
 elements/core-deps/libgfbgraph.bst                 |  6 +-
 elements/core-deps/libgnomekbd.bst                 |  2 +-
 elements/core-deps/libgovirt.bst                   |  4 +-
 elements/core-deps/libgrss.bst                     |  4 +-
 elements/core-deps/libgsf.bst                      |  4 +-
 elements/core-deps/libgtop.bst                     |  4 +-
 elements/core-deps/libgudev.bst                    |  6 +-
 elements/core-deps/libgusb.bst                     |  6 +-
 elements/core-deps/libgweather.bst                 |  6 +-
 elements/core-deps/libgxps.bst                     |  6 +-
 elements/core-deps/libinput.bst                    |  2 +-
 elements/core-deps/libmbim.bst                     |  4 +-
 elements/core-deps/libmediaart.bst                 |  8 +--
 elements/core-deps/libosinfo.bst                   |  8 +--
 elements/core-deps/libpeas.bst                     | 10 ++--
 elements/core-deps/libpinyin.bst                   |  4 +-
 elements/core-deps/libqmi.bst                      |  4 +-
 elements/core-deps/librest.bst                     |  4 +-
 elements/core-deps/libvirt-glib.bst                |  6 +-
 elements/core-deps/libwacom.bst                    |  2 +-
 elements/core-deps/libxklavier.bst                 |  6 +-
 elements/core-deps/libzapojit.bst                  |  6 +-
 elements/core-deps/osinfo-db-tools.bst             |  4 +-
 elements/core-deps/pangomm-1.4.bst                 |  4 +-
 elements/core-deps/pangomm.bst                     |  4 +-
 elements/core-deps/phodav.bst                      |  6 +-
 elements/core-deps/polkit.bst                      |  6 +-
 elements/core-deps/poppler.bst                     |  4 +-
 elements/core-deps/pyatspi2.bst                    |  4 +-
 elements/core-deps/samba.bst                       |  4 +-
 elements/core-deps/spice-gtk.bst                   |  8 +--
 elements/core-deps/totem-pl-parser.bst             |  4 +-
 elements/core-deps/tracker-miners.bst              | 12 ++--
 elements/core-deps/tracker.bst                     | 10 ++--
 elements/core-deps/uhttpmock.bst                   |  4 +-
 elements/core-deps/upower.bst                      |  2 +-
 elements/core-deps/vala-tarball.bst                | 10 ----
 elements/core-deps/vala.bst                        | 12 ----
 elements/core/baobab.bst                           | 14 ++---
 elements/core/cheese.bst                           | 26 ++++-----
 elements/core/eog.bst                              | 16 +++---
 elements/core/epiphany.bst                         | 26 ++++-----
 elements/core/evince.bst                           | 12 ++--
 elements/core/file-roller.bst                      |  8 +--
 elements/core/gdm.bst                              | 10 ++--
 elements/core/gedit.bst                            |  6 +-
 elements/core/gnome-backgrounds.bst                |  2 +-
 elements/core/gnome-bluetooth.bst                  | 10 ++--
 elements/core/gnome-boxes.bst                      | 14 ++---
 elements/core/gnome-calculator.bst                 | 14 ++---
 elements/core/gnome-calendar.bst                   | 10 ++--
 elements/core/gnome-characters.bst                 |  8 +--
 elements/core/gnome-clocks.bst                     | 10 ++--
 elements/core/gnome-color-manager.bst              | 14 ++---
 elements/core/gnome-contacts.bst                   | 10 ++--
 elements/core/gnome-control-center.bst             | 14 ++---
 elements/core/gnome-desktop.bst                    | 10 ++--
 elements/core/gnome-disk-utility.bst               | 12 ++--
 elements/core/gnome-documents.bst                  | 12 ++--
 elements/core/gnome-font-viewer.bst                |  6 +-
 elements/core/gnome-getting-started-docs.bst       |  2 +-
 elements/core/gnome-initial-setup.bst              | 12 ++--
 elements/core/gnome-keyring.bst                    |  6 +-
 elements/core/gnome-logs.bst                       | 10 ++--
 elements/core/gnome-maps.bst                       | 18 +++---
 elements/core/gnome-menus.bst                      |  6 +-
 elements/core/gnome-music.bst                      | 10 ++--
 elements/core/gnome-photos.bst                     | 10 ++--
 elements/core/gnome-screenshot.bst                 | 10 ++--
 elements/core/gnome-session.bst                    |  4 +-
 elements/core/gnome-settings-daemon.bst            | 16 +++---
 elements/core/gnome-shell-extensions.bst           |  2 +-
 elements/core/gnome-shell.bst                      | 22 ++++----
 elements/core/gnome-software.bst                   | 14 ++---
 elements/core/gnome-system-monitor.bst             |  8 +--
 elements/core/gnome-terminal.bst                   | 18 +++---
 elements/core/gnome-user-docs.bst                  |  2 +-
 elements/core/gnome-user-share.bst                 |  4 +-
 elements/core/gnome-weather.bst                    | 16 +++---
 elements/core/gvfs.bst                             | 29 ----------
 elements/core/meta-gnome-core-shell.bst            | 10 ++--
 elements/core/meta-gnome-core-utilities.bst        |  2 +-
 elements/core/mousetweaks.bst                      |  4 +-
 elements/core/mutter.bst                           | 20 +++----
 elements/core/nautilus.bst                         | 10 ++--
 elements/core/network-manager-applet.bst           | 14 ++---
 elements/core/orca.bst                             | 10 ++--
 elements/core/rygel.bst                            |  2 +-
 elements/core/simple-scan.bst                      | 10 ++--
 elements/core/sushi.bst                            | 18 +++---
 elements/core/totem.bst                            | 28 ++++-----
 elements/core/vino.bst                             | 10 ++--
 elements/core/yelp.bst                             | 14 -----
 elements/sdk-platform.bst                          | 48 ++++++++++++++++
 elements/sdk.bst                                   |  7 +++
 elements/sdk/WebKitGTK+.bst                        | 29 ++++++++++
 elements/{core => sdk}/adwaita-icon-theme.bst      |  6 +-
 elements/sdk/appstream-glib.bst                    | 17 ++++++
 elements/{core-deps => sdk}/at-spi2-atk.bst        |  6 +-
 elements/{core-deps => sdk}/at-spi2-core.bst       |  4 +-
 elements/{core-deps => sdk}/atk.bst                |  6 +-
 elements/{core-deps => sdk}/brotli.bst             |  0
 elements/{core-deps => sdk}/cantarell-fonts.bst    |  2 +-
 elements/{core-deps => sdk}/clutter-gst.bst        | 10 ++--
 elements/{core-deps => sdk}/clutter-gtk.bst        |  4 +-
 elements/{core-deps => sdk}/clutter.bst            | 16 +++---
 elements/{core-deps => sdk}/cogl.bst               | 14 ++---
 elements/{core-deps => sdk}/dbus-glib.bst          |  0
 elements/{core-deps => sdk}/dconf.bst              |  4 +-
 elements/{core-deps => sdk}/enchant-2.bst          |  2 +-
 elements/{core-deps => sdk}/fribidi.bst            |  0
 elements/{core-deps => sdk}/gcab.bst               |  6 +-
 elements/{core-deps => sdk}/gcr.bst                |  8 +--
 elements/{core-deps => sdk}/gdk-pixbuf.bst         |  6 +-
 elements/sdk/geoclue.bst                           | 15 +++++
 elements/{core-deps => sdk}/gjs.bst                |  4 +-
 elements/{core => sdk}/glib-networking.bst         |  4 +-
 elements/{core-deps => sdk}/glib.bst               |  2 +-
 elements/{core-deps => sdk}/gnome-common.bst       |  0
 elements/{core => sdk}/gnome-themes-extra.bst      |  6 +-
 .../{core-deps => sdk}/gobject-introspection.bst   |  2 +-
 .../{core => sdk}/gsettings-desktop-schemas.bst    |  6 +-
 elements/{core-deps => sdk}/gst-libav.bst          |  2 +-
 elements/{core-deps => sdk}/gst-plugins-bad.bst    |  3 +-
 elements/{core-deps => sdk}/gst-plugins-base.bst   |  5 +-
 elements/{core-deps => sdk}/gst-plugins-good.bst   |  5 +-
 elements/{core-deps => sdk}/gstreamer.bst          |  4 +-
 elements/{core-deps => sdk}/gtk+-3.bst             | 24 ++++----
 elements/{core-deps => sdk}/gtk-doc.bst            |  2 +-
 elements/sdk/gvfs.bst                              | 17 ++++++
 elements/{core-deps => sdk}/ibus.bst               | 12 ++--
 elements/{core-deps => sdk}/json-glib.bst          |  4 +-
 elements/{core-deps => sdk}/libcanberra.bst        |  4 +-
 elements/{core-deps => sdk}/libcroco.bst           |  4 +-
 elements/{core-deps => sdk}/libnotify.bst          |  8 +--
 elements/{core-deps => sdk}/libpsl.bst             |  0
 elements/{core-deps => sdk}/librsvg.bst            | 14 ++---
 elements/{core-deps => sdk}/libsecret.bst          |  6 +-
 elements/{core-deps => sdk}/libsoup.bst            |  8 +--
 elements/{core-deps => sdk}/mozjs52.bst            |  0
 elements/{core-deps => sdk}/pango.bst              | 12 ++--
 elements/{core-deps => sdk}/pycairo.bst            |  0
 elements/{core-deps => sdk}/pygobject.bst          |  6 +-
 elements/sdk/vala-bootstrap.bst                    | 10 ++++
 elements/sdk/vala.bst                              | 15 +++++
 elements/{core-deps => sdk}/vte.bst                |  6 +-
 elements/{core-deps => sdk}/wayland.bst            |  0
 elements/{core-deps => sdk}/woff2.bst              |  2 +-
 elements/{core-deps => sdk}/yelp-tools.bst         |  2 +-
 elements/{core-deps => sdk}/yelp-xsl.bst           |  0
 elements/sdk/yelp.bst                              | 14 +++++
 elements/{core-deps => sdk}/zenity.bst             |  6 +-
 elements/world/accerciser.bst                      | 10 ++--
 elements/world/bijiben.bst                         | 10 ++--
 elements/world/dconf-editor.bst                    | 10 ++--
 elements/world/devhelp.bst                         | 10 ++--
 elements/world/evolution.bst                       | 24 ++++----
 elements/world/five-or-more.bst                    |  8 +--
 elements/world/four-in-a-row.bst                   |  8 +--
 elements/world/ghex.bst                            |  6 +-
 elements/world/gitg.bst                            | 18 +++---
 elements/world/glade.bst                           |  6 +-
 elements/world/gnome-builder.bst                   | 16 +++---
 elements/world/gnome-chess.bst                     | 10 ++--
 elements/world/gnome-code-assistance.bst           |  2 +-
 elements/world/gnome-devel-docs.bst                |  2 +-
 elements/world/gnome-dictionary.bst                |  6 +-
 elements/world/gnome-klotski.bst                   |  8 +--
 elements/world/gnome-mahjongg.bst                  | 10 ++--
 elements/world/gnome-mines.bst                     | 10 ++--
 elements/world/gnome-multi-writer.bst              |  6 +-
 elements/world/gnome-nettool.bst                   |  6 +-
 elements/world/gnome-nibbles.bst                   | 14 ++---
 elements/world/gnome-recipes.bst                   |  2 +-
 elements/world/gnome-robots.bst                    |  8 +--
 elements/world/gnome-sound-recorder.bst            | 14 ++---
 elements/world/gnome-sudoku.bst                    | 10 ++--
 elements/world/gnome-taquin.bst                    | 10 ++--
 elements/world/gnome-tetravex.bst                  | 10 ++--
 elements/world/gnome-todo.bst                      |  6 +-
 elements/world/gnome-tweaks.bst                    |  4 +-
 elements/world/hitori.bst                          |  8 +--
 elements/world/iagno.bst                           | 10 ++--
 elements/world/jsonrpc-glib.bst                    |  6 +-
 elements/world/libgit2-glib.bst                    |  4 +-
 elements/world/libgnome-games-support.bst          |  6 +-
 elements/world/libmanette.bst                      |  4 +-
 elements/world/lightsoff.bst                       | 14 ++---
 elements/world/nautilus-sendto.bst                 |  2 +-
 elements/world/polari.bst                          | 10 ++--
 elements/world/quadrapassel.bst                    | 14 ++---
 elements/world/swell-foop.bst                      | 12 ++--
 elements/world/tali.bst                            |  8 +--
 elements/world/telepathy-glib.bst                  |  8 +--
 elements/world/telepathy-logger.bst                |  6 +-
 elements/world/telepathy-mission-control.bst       |  4 +-
 elements/world/template-glib.bst                   |  4 +-
 files/vala/disable-valadoc.patch                   | 66 ++++++++++++++++++++++
 247 files changed, 1088 insertions(+), 1004 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 7c95e82..143df28 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -7,14 +7,9 @@ depends:
 - core-deps/ModemManager.bst
 - core-deps/NetworkManager.bst
 - core-deps/PackageKit.bst
-- core-deps/WebKitGTK+.bst
 - core-deps/accountsservice.bst
 - core-deps/anthy.bst
-- core-deps/appstream-glib.bst
 - core-deps/argyll.bst
-- core-deps/at-spi2-atk.bst
-- core-deps/at-spi2-core.bst
-- core-deps/atk.bst
 - core-deps/atkmm-1.6.bst
 - core-deps/atkmm.bst
 - core-deps/avahi.bst
@@ -22,48 +17,30 @@ depends:
 - core-deps/berkeleydb.bst
 - core-deps/blockdev.bst
 - core-deps/boost.bst
-- core-deps/brotli.bst
 - core-deps/cairomm-1.0.bst
 - core-deps/cairomm.bst
-- core-deps/cantarell-fonts.bst
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/cogl.bst
 - core-deps/colord-gtk.bst
 - core-deps/colord.bst
 - core-deps/cryptsetup.bst
-- core-deps/dbus-glib.bst
-- core-deps/dconf.bst
 - core-deps/dmraid.bst
 - core-deps/dotconf.bst
-- core-deps/enchant-2.bst
 - core-deps/espeak.bst
 - core-deps/evolution-data-server.bst
 - core-deps/exempi.bst
 - core-deps/exiv2.bst
 - core-deps/folks.bst
-- core-deps/fribidi.bst
 - core-deps/ftjam.bst
 - core-deps/fuse.bst
-- core-deps/gcab.bst
-- core-deps/gcr.bst
-- core-deps/gdk-pixbuf.bst
 - core-deps/gegl.bst
-- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
 - core-deps/gexiv2.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
 - core-deps/glibmm-2.4.bst
 - core-deps/glibmm.bst
 - core-deps/gmime3.bst
 - core-deps/gnome-autoar.bst
-- core-deps/gnome-common.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/gnome-video-effects.bst
-- core-deps/gobject-introspection.bst
 - core-deps/gom.bst
 - core-deps/gpgme.bst
 - core-deps/graphene.bst
@@ -73,14 +50,7 @@ depends:
 - core-deps/gsound.bst
 - core-deps/gspell.bst
 - core-deps/gssdp.bst
-- core-deps/gst-libav.bst
-- core-deps/gst-plugins-bad.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtk+.bst
-- core-deps/gtk-doc.bst
 - core-deps/gtk-vnc.bst
 - core-deps/gtkmm-3.bst
 - core-deps/gtkmm.bst
@@ -93,20 +63,16 @@ depends:
 - core-deps/ibus-anthy.bst
 - core-deps/ibus-hangul.bst
 - core-deps/ibus-libpinyin.bst
-- core-deps/ibus.bst
 - core-deps/iptables.bst
 - core-deps/json-c.bst
-- core-deps/json-glib.bst
 - core-deps/kmod.bst
 - core-deps/kyotocabinet.bst
 - core-deps/libatasmart.bst
 - core-deps/libbluray.bst
 - core-deps/libbytesize.bst
-- core-deps/libcanberra.bst
 - core-deps/libcdio-paranoia.bst
 - core-deps/libcdio.bst
 - core-deps/libchamplain.bst
-- core-deps/libcroco.bst
 - core-deps/libdaemon.bst
 - core-deps/libdazzle.bst
 - core-deps/libdvdread.bst
@@ -136,20 +102,15 @@ depends:
 - core-deps/libndp.bst
 - core-deps/libnfs.bst
 - core-deps/libnl.bst
-- core-deps/libnotify.bst
 - core-deps/liboauth.bst
 - core-deps/libosinfo.bst
 - core-deps/libpeas.bst
 - core-deps/libpinyin.bst
-- core-deps/libpsl.bst
 - core-deps/libqmi.bst
 - core-deps/librest.bst
-- core-deps/librsvg.bst
 - core-deps/libsass.bst
-- core-deps/libsecret.bst
 - core-deps/libsigcplusplus-2.0.bst
 - core-deps/libsigcplusplus.bst
-- core-deps/libsoup.bst
 - core-deps/libtirpc.bst
 - core-deps/libusb.bst
 - core-deps/libusbmuxd.bst
@@ -162,7 +123,6 @@ depends:
 - core-deps/lvm2.bst
 - core-deps/mm-common.bst
 - core-deps/mobile-broadband-provider-info.bst
-- core-deps/mozjs52.bst
 - core-deps/mpc.bst
 - core-deps/mpfr.bst
 - core-deps/mtdev.bst
@@ -171,7 +131,6 @@ depends:
 - core-deps/openldap.bst
 - core-deps/osinfo-db-tools.bst
 - core-deps/pam.bst
-- core-deps/pango.bst
 - core-deps/pangomm-1.4.bst
 - core-deps/pangomm.bst
 - core-deps/parted.bst
@@ -185,8 +144,6 @@ depends:
 - core-deps/ppp.bst
 - core-deps/pwquality.bst
 - core-deps/pyatspi2.bst
-- core-deps/pycairo.bst
-- core-deps/pygobject.bst
 - core-deps/rpcsvc-proto.bst
 - core-deps/samba.bst
 - core-deps/sane-backends.bst
@@ -201,13 +158,6 @@ depends:
 - core-deps/udisks2.bst
 - core-deps/uhttpmock.bst
 - core-deps/upower.bst
-- core-deps/vala.bst
 - core-deps/valgrind.bst
 - core-deps/volume-key.bst
-- core-deps/vte.bst
-- core-deps/wayland.bst
-- core-deps/woff2.bst
 - core-deps/xmlto.bst
-- core-deps/yelp-tools.bst
-- core-deps/yelp-xsl.bst
-- core-deps/zenity.bst
diff --git a/elements/core-deps/ModemManager.bst b/elements/core-deps/ModemManager.bst
index 548820e..8194f30 100644
--- a/elements/core-deps/ModemManager.bst
+++ b/elements/core-deps/ModemManager.bst
@@ -4,11 +4,11 @@ sources:
   url: git_freedesktop_org:ModemManager/ModemManager.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
 - core-deps/libgudev.bst
 - core-deps/libmbim.bst
 - core-deps/libqmi.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index 0de15fb..f2f42c9 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -4,16 +4,16 @@ sources:
   url: git_freedesktop_org:NetworkManager/NetworkManager.git
   track: master
 depends:
-- core-deps/dbus-glib.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
 - core-deps/iptables.bst
 - core-deps/libgudev.bst
 - core-deps/libndp.bst
 - core-deps/ppp.bst
-- core-deps/pygobject.bst
-- core-deps/vala.bst
+- sdk/dbus-glib.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- sdk/pygobject.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/PackageKit.bst b/elements/core-deps/PackageKit.bst
index 34794a2..a583165 100644
--- a/elements/core-deps/PackageKit.bst
+++ b/elements/core-deps/PackageKit.bst
@@ -5,10 +5,10 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgudev.bst
 - core-deps/polkit.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/accountsservice.bst b/elements/core-deps/accountsservice.bst
index 741a16b..41420ea 100644
--- a/elements/core-deps/accountsservice.bst
+++ b/elements/core-deps/accountsservice.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:accountsservice
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/polkit.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/atkmm-1.6.bst b/elements/core-deps/atkmm-1.6.bst
index 8c9e0aa..a00f9f8 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:atkmm
   track: atkmm-2-24
 depends:
-- core-deps/atk.bst
 - core-deps/glibmm-2.4.bst
+- sdk/atk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/atkmm.bst b/elements/core-deps/atkmm.bst
index 8b578d9..690fe13 100644
--- a/elements/core-deps/atkmm.bst
+++ b/elements/core-deps/atkmm.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:atkmm
   track: master
 depends:
-- core-deps/atk.bst
 - core-deps/glibmm.bst
+- sdk/atk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/avahi.bst b/elements/core-deps/avahi.bst
index 6d056ba..29df885 100644
--- a/elements/core-deps/avahi.bst
+++ b/elements/core-deps/avahi.bst
@@ -4,7 +4,7 @@ sources:
   url: github_com:lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz
 depends:
 - core-deps/libdaemon.bst
-- core-deps/gtk+-3.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/colord-gtk.bst b/elements/core-deps/colord-gtk.bst
index c6220cd..fe2cdc5 100644
--- a/elements/core-deps/colord-gtk.bst
+++ b/elements/core-deps/colord-gtk.bst
@@ -5,9 +5,9 @@ sources:
   track: master
 depends:
 - core-deps/colord.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/colord.bst b/elements/core-deps/colord.bst
index a0b54c5..50a473f 100644
--- a/elements/core-deps/colord.bst
+++ b/elements/core-deps/colord.bst
@@ -8,12 +8,12 @@ sources:
 depends:
 - filename: core-deps/argyll.bst
   type: build
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/libgudev.bst
 - core-deps/libgusb.bst
 - core-deps/polkit.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 7489f3c..37157e9 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:evolution-data-server
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/gcr.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcanberra.bst
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core-deps/libical.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
 - core-deps/openldap.bst
-- core-deps/vala.bst
+- sdk/WebKitGTK+.bst
+- sdk/gcr.bst
+- sdk/gtk+-3.bst
+- sdk/libcanberra.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/folks.bst b/elements/core-deps/folks.bst
index a26f84d..89879ac 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:folks
   track: master
 depends:
-- core-deps/dbus-glib.bst
 - core-deps/evolution-data-server.bst
-- core-deps/gobject-introspection.bst
 - core-deps/libgee.bst
-- core-deps/vala.bst
+- sdk/dbus-glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 55011cb..594e159 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 depends:
 - core-deps/babl.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
 - core-deps/graphviz.bst
-- core-deps/json-glib.bst
-- core-deps/librsvg.bst
-- core-deps/pango.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/librsvg.bst
+- sdk/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/geocode-glib.bst b/elements/core-deps/geocode-glib.bst
index aa6ad11..2c3fb51 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:geocode-glib
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
-- core-deps/json-glib.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/glibmm-2.4.bst b/elements/core-deps/glibmm-2.4.bst
index d041bcb..cc1b1a7 100644
--- a/elements/core-deps/glibmm-2.4.bst
+++ b/elements/core-deps/glibmm-2.4.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glibmm
   track: glibmm-2-54
 depends:
-- core-deps/glib.bst
 - core-deps/libsigcplusplus-2.0.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/glibmm.bst b/elements/core-deps/glibmm.bst
index 13bbf76..f42346a 100644
--- a/elements/core-deps/glibmm.bst
+++ b/elements/core-deps/glibmm.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glibmm
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/libsigcplusplus.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gmime3.bst b/elements/core-deps/gmime3.bst
index 5ed8398..f9ee92f 100644
--- a/elements/core-deps/gmime3.bst
+++ b/elements/core-deps/gmime3.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gmime
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-autoar.bst b/elements/core-deps/gnome-autoar.bst
index 8f4d06d..ebc9a35 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-autoar
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index 30c3cf6..fe5131a 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-online-accounts
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/gtk+-3.bst
-- core-deps/json-glib.bst
 - core-deps/librest.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
+- sdk/WebKitGTK+.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gnome-online-miners.bst b/elements/core-deps/gnome-online-miners.bst
index 86c4768..00e0d45 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-online-miners
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/grilo.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph.bst
 - core-deps/libzapojit.bst
 - core-deps/tracker.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index 6d6f567..f7bff23 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gnome-video-effects
   track: master
 depends:
-- core-deps/gnome-common.bst
-- core-deps/gstreamer.bst
+- sdk/gnome-common.bst
+- sdk/gstreamer.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gom.bst b/elements/core-deps/gom.bst
index 33a8634..8f18e44 100644
--- a/elements/core-deps/gom.bst
+++ b/elements/core-deps/gom.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gom
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/pygobject.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/graphene.bst b/elements/core-deps/graphene.bst
index ec0d8cf..392e4f8 100644
--- a/elements/core-deps/graphene.bst
+++ b/elements/core-deps/graphene.bst
@@ -4,7 +4,7 @@ sources:
   url: github_com:ebassi/graphene.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst
index bb30a1a..2345be0 100644
--- a/elements/core-deps/graphviz.bst
+++ b/elements/core-deps/graphviz.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/pango.bst
+- sdk/gdk-pixbuf.bst
+- sdk/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/grilo-plugins.bst b/elements/core-deps/grilo-plugins.bst
index 12b0b42..a0834e3 100644
--- a/elements/core-deps/grilo-plugins.bst
+++ b/elements/core-deps/grilo-plugins.bst
@@ -11,12 +11,12 @@ depends:
 - core-deps/gssdp.bst
 - core-deps/gupnp-av.bst
 - core-deps/gupnp.bst
-- core-deps/json-glib.bst
 - core-deps/libgdata.bst
 - core-deps/libmediaart.bst
 - core-deps/librest.bst
-- core-deps/libsoup.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/grilo.bst b/elements/core-deps/grilo.bst
index 46bddf0..d5a9f9d 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:grilo
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/libsoup.bst
 - core-deps/totem-pl-parser.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index f89ec9e..bc9147c 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gsound
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/libcanberra.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/libcanberra.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gspell.bst b/elements/core-deps/gspell.bst
index 60edb00..b1f613b 100644
--- a/elements/core-deps/gspell.bst
+++ b/elements/core-deps/gspell.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gspell
   track: master
 depends:
-- core-deps/enchant-2.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/enchant-2.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gssdp.bst b/elements/core-deps/gssdp.bst
index 308202d..6067b2f 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gssdp
   track: gssdp_1.0
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 config:
diff --git a/elements/core-deps/gtk+.bst b/elements/core-deps/gtk+.bst
index 4e15ec8..e459cd9 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:gtk+
   track: master
 depends:
-- core-deps/atk.bst
-- core-deps/at-spi2-atk.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/graphene.bst
-- core-deps/gst-plugins-bad.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk-doc.bst
-- core-deps/pango.bst
-- core-deps/wayland.bst
+- sdk/at-spi2-atk.bst
+- sdk/atk.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/gtk-doc.bst
+- sdk/pango.bst
+- sdk/wayland.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 8315eea..8fc59d3 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gtk-vnc
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtkmm-3.bst b/elements/core-deps/gtkmm-3.bst
index abb30f2..81c417d 100644
--- a/elements/core-deps/gtkmm-3.bst
+++ b/elements/core-deps/gtkmm-3.bst
@@ -6,9 +6,9 @@ sources:
 depends:
 - core-deps/atkmm-1.6.bst
 - core-deps/cairomm-1.0.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/pangomm-1.4.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtkmm.bst b/elements/core-deps/gtkmm.bst
index b9b41f2..0ec4b52 100644
--- a/elements/core-deps/gtkmm.bst
+++ b/elements/core-deps/gtkmm.bst
@@ -6,9 +6,9 @@ sources:
 depends:
 - core-deps/atkmm.bst
 - core-deps/cairomm.bst
-- core-deps/glib.bst
 - core-deps/gtk+.bst
 - core-deps/pangomm.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtksourceview-3.bst b/elements/core-deps/gtksourceview-3.bst
index 7d2f3e9..c711abd 100644
--- a/elements/core-deps/gtksourceview-3.bst
+++ b/elements/core-deps/gtksourceview-3.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gtksourceview
   track: gnome-3-24
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gtksourceview.bst b/elements/core-deps/gtksourceview.bst
index fca3f0c..573c89d 100644
--- a/elements/core-deps/gtksourceview.bst
+++ b/elements/core-deps/gtksourceview.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gtksourceview
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp-av.bst b/elements/core-deps/gupnp-av.bst
index aecd657..210eb10 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gupnp-av
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/gupnp.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index 4ccd6be..9d801f5 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gupnp-dlna
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gstreamer.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gstreamer.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp-igd.bst b/elements/core-deps/gupnp-igd.bst
index 1427ccd..cc6342f 100644
--- a/elements/core-deps/gupnp-igd.bst
+++ b/elements/core-deps/gupnp-igd.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gupnp-igd
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gupnp.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gupnp.bst b/elements/core-deps/gupnp.bst
index ba7e449..0ceacca 100644
--- a/elements/core-deps/gupnp.bst
+++ b/elements/core-deps/gupnp.bst
@@ -5,10 +5,10 @@ sources:
   track: gupnp-1.0
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/gssdp.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/ibus-anthy.bst b/elements/core-deps/ibus-anthy.bst
index 5ca1882..8b95275 100644
--- a/elements/core-deps/ibus-anthy.bst
+++ b/elements/core-deps/ibus-anthy.bst
@@ -4,10 +4,10 @@ sources:
   url: github_com:ibus/ibus-anthy/releases/download/1.5.6/ibus-anthy-1.5.6.tar.gz
 depends:
 - core-deps/anthy.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/ibus.bst
-- core-deps/pygobject.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/ibus.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/ibus-hangul.bst b/elements/core-deps/ibus-hangul.bst
index bf2338e..89fe6cc 100644
--- a/elements/core-deps/ibus-hangul.bst
+++ b/elements/core-deps/ibus-hangul.bst
@@ -3,7 +3,7 @@ sources:
 - kind: tar
   url: github_com:choehwanjin/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz
 depends:
-- core-deps/ibus.bst
 - core-deps/libhangul.bst
+- sdk/ibus.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/ibus-libpinyin.bst b/elements/core-deps/ibus-libpinyin.bst
index 346b91c..403faae 100644
--- a/elements/core-deps/ibus-libpinyin.bst
+++ b/elements/core-deps/ibus-libpinyin.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:libpinyin/ibus-libpinyin/archive/1.9.0.tar.gz
 depends:
-- core-deps/ibus.bst
 - core-deps/libpinyin.bst
+- sdk/ibus.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index 383701e..9879087 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:libchamplain
   track: master
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libsoup.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libdazzle.bst b/elements/core-deps/libdazzle.bst
index 72118af..82be654 100644
--- a/elements/core-deps/libdazzle.bst
+++ b/elements/core-deps/libdazzle.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/libdazzle.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgdata.bst b/elements/core-deps/libgdata.bst
index 93dfa15..db037c2 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:libgdata
   track: master
 depends:
-- core-deps/gcr.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gobject-introspection.bst
-- core-deps/json-glib.bst
 - core-deps/liboauth.bst
-- core-deps/libsoup.bst
 - core-deps/uhttpmock.bst
+- sdk/gcr.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgee.bst b/elements/core-deps/libgee.bst
index 9556245..d36f1ca 100644
--- a/elements/core-deps/libgee.bst
+++ b/elements/core-deps/libgee.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgee
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgepub.bst b/elements/core-deps/libgepub.bst
index a3ebe3f..0ae8baf 100644
--- a/elements/core-deps/libgepub.bst
+++ b/elements/core-deps/libgepub.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgepub
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/glib.bst
-- core-deps/libsoup.bst
+- sdk/WebKitGTK+.bst
+- sdk/glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgfbgraph.bst b/elements/core-deps/libgfbgraph.bst
index 3a27b40..458a592 100644
--- a/elements/core-deps/libgfbgraph.bst
+++ b/elements/core-deps/libgfbgraph.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libgfbgraph
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/json-glib.bst
 - core-deps/librest.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgnomekbd.bst b/elements/core-deps/libgnomekbd.bst
index 8cff3f0..86900f1 100644
--- a/elements/core-deps/libgnomekbd.bst
+++ b/elements/core-deps/libgnomekbd.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:libgnomekbd
   track: master
 depends:
-- core-deps/gtk+-3.bst
 - core-deps/libxklavier.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgovirt.bst b/elements/core-deps/libgovirt.bst
index 5835465..bbf482b 100644
--- a/elements/core-deps/libgovirt.bst
+++ b/elements/core-deps/libgovirt.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgovirt
   track: master
 depends:
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
 - core-deps/librest.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgrss.bst b/elements/core-deps/libgrss.bst
index 89e4d37..a91e807 100644
--- a/elements/core-deps/libgrss.bst
+++ b/elements/core-deps/libgrss.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:libgrss
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgsf.bst b/elements/core-deps/libgsf.bst
index 7259765..d8f6eb5 100644
--- a/elements/core-deps/libgsf.bst
+++ b/elements/core-deps/libgsf.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgsf
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libgtop.bst b/elements/core-deps/libgtop.bst
index e08e2ed..364dca2 100644
--- a/elements/core-deps/libgtop.bst
+++ b/elements/core-deps/libgtop.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgtop
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 environment:
diff --git a/elements/core-deps/libgudev.bst b/elements/core-deps/libgudev.bst
index d0bbd53..6db0668 100644
--- a/elements/core-deps/libgudev.bst
+++ b/elements/core-deps/libgudev.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:libgudev
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
 - filename: vm/linux-vm-boot/systemd.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/libgusb.bst b/elements/core-deps/libgusb.bst
index 93a69a6..b6a2a44 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -4,9 +4,9 @@ sources:
   url: github_com:hughsie/libgusb.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/libusb.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgweather.bst b/elements/core-deps/libgweather.bst
index 8424ad7..c77d40d 100644
--- a/elements/core-deps/libgweather.bst
+++ b/elements/core-deps/libgweather.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/geocode-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgxps.bst b/elements/core-deps/libgxps.bst
index 551073a..e7cf3ae 100644
--- a/elements/core-deps/libgxps.bst
+++ b/elements/core-deps/libgxps.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgxps
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libinput.bst b/elements/core-deps/libinput.bst
index fcf889d..7712741 100644
--- a/elements/core-deps/libinput.bst
+++ b/elements/core-deps/libinput.bst
@@ -4,10 +4,10 @@ sources:
   url: git_freedesktop_org:wayland/libinput.git
   track: master
 depends:
-- core-deps/gtk+-3.bst
 - core-deps/libevdev.bst
 - core-deps/libwacom.bst
 - core-deps/mtdev.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libmbim.bst b/elements/core-deps/libmbim.bst
index 8607304..0124363 100644
--- a/elements/core-deps/libmbim.bst
+++ b/elements/core-deps/libmbim.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:libmbim/libmbim.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
 - core-deps/libgudev.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libmediaart.bst b/elements/core-deps/libmediaart.bst
index f45ff32..ecd8c17 100644
--- a/elements/core-deps/libmediaart.bst
+++ b/elements/core-deps/libmediaart.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libmediaart
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
-- core-deps/vala.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index 063ce75..e9109a2 100644
--- a/elements/core-deps/libosinfo.bst
+++ b/elements/core-deps/libosinfo.bst
@@ -8,11 +8,11 @@ sources:
 - kind: local
   path: files/libosinfo/usb.ids
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/libsoup.bst
 - core-deps/osinfo-db-tools.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libpeas.bst b/elements/core-deps/libpeas.bst
index 206fe67..eccb7ab 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:libpeas
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/pygobject.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libpinyin.bst b/elements/core-deps/libpinyin.bst
index fc74b2e..52efccc 100644
--- a/elements/core-deps/libpinyin.bst
+++ b/elements/core-deps/libpinyin.bst
@@ -7,9 +7,9 @@ sources:
   base-dir: ''
   directory: data
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
 - core-deps/kyotocabinet.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libqmi.bst b/elements/core-deps/libqmi.bst
index 6e07552..4a1880e 100644
--- a/elements/core-deps/libqmi.bst
+++ b/elements/core-deps/libqmi.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:libqmi.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
 - core-deps/libgudev.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/librest.bst b/elements/core-deps/librest.bst
index 188b15c..8affe92 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:librest
   track: librest-0-7
 depends:
-- core-deps/glib.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index 2eeace8..07d395c 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: github_com:libvirt/libvirt-glib.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/libvirt.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libwacom.bst b/elements/core-deps/libwacom.bst
index f62add3..8459977 100644
--- a/elements/core-deps/libwacom.bst
+++ b/elements/core-deps/libwacom.bst
@@ -3,7 +3,7 @@ sources:
 - kind: tar
   url: sourceforge_net:linuxwacom/files/libwacom/libwacom-0.23.tar.bz2
 depends:
-- core-deps/glib.bst
 - core-deps/libgudev.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libxklavier.bst b/elements/core-deps/libxklavier.bst
index c05eb02..f5c9a37 100644
--- a/elements/core-deps/libxklavier.bst
+++ b/elements/core-deps/libxklavier.bst
@@ -3,11 +3,11 @@ sources:
 - kind: tar
   url: people_freedesktop_org:~svu/libxklavier-5.4.tar.bz2
 depends:
-- core-deps/gobject-introspection.bst
-- filename: desktop/xorg-lib-x11.bst
-  junction: freedesktop-sdk.bst
+- sdk/gobject-introspection.bst
 - filename: desktop/xorg-app-xkbcomp.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-x11.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xi.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/libzapojit.bst b/elements/core-deps/libzapojit.bst
index ec759b1..9c72aef 100644
--- a/elements/core-deps/libzapojit.bst
+++ b/elements/core-deps/libzapojit.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libzapojit
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/json-glib.bst
 - core-deps/librest.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/osinfo-db-tools.bst b/elements/core-deps/osinfo-db-tools.bst
index d1cc48b..2c04a39 100644
--- a/elements/core-deps/osinfo-db-tools.bst
+++ b/elements/core-deps/osinfo-db-tools.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_com:libosinfo/osinfo-db-tools.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/pangomm-1.4.bst b/elements/core-deps/pangomm-1.4.bst
index 54877a0..aeb35d8 100644
--- a/elements/core-deps/pangomm-1.4.bst
+++ b/elements/core-deps/pangomm-1.4.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:pangomm
   track: pangomm-2-40
 depends:
-- core-deps/atk.bst
 - core-deps/cairomm-1.0.bst
 - core-deps/glibmm-2.4.bst
-- core-deps/pango.bst
+- sdk/atk.bst
+- sdk/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/pangomm.bst b/elements/core-deps/pangomm.bst
index 2f9126a..1271d1e 100644
--- a/elements/core-deps/pangomm.bst
+++ b/elements/core-deps/pangomm.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:pangomm
   track: master
 depends:
-- core-deps/atk.bst
 - core-deps/cairomm.bst
 - core-deps/glibmm.bst
-- core-deps/pango.bst
+- sdk/atk.bst
+- sdk/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index 45e785d..0cfefb4 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:phodav
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/polkit.bst b/elements/core-deps/polkit.bst
index 204ff61..68c879f 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -7,10 +7,10 @@ sources:
   path: files/polkit/sysusers.conf
   directory: data
 depends:
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
-- core-deps/mozjs52.bst
 - core-deps/pam.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- sdk/mozjs52.bst
 - filename: vm/linux-vm-boot/systemd.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/poppler.bst b/elements/core-deps/poppler.bst
index 3f31bb8..3c5a46d 100644
--- a/elements/core-deps/poppler.bst
+++ b/elements/core-deps/poppler.bst
@@ -3,9 +3,9 @@ sources:
 - kind: tar
   url: https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
 depends:
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
 - core-deps/openjpeg.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/fontconfig.bst
diff --git a/elements/core-deps/pyatspi2.bst b/elements/core-deps/pyatspi2.bst
index 236160a..a850c7f 100644
--- a/elements/core-deps/pyatspi2.bst
+++ b/elements/core-deps/pyatspi2.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:pyatspi2
   track: master
 depends:
-- core-deps/at-spi2-core.bst
-- core-deps/pygobject.bst
+- sdk/at-spi2-core.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/samba.bst b/elements/core-deps/samba.bst
index 5e80a4d..4116dcd 100644
--- a/elements/core-deps/samba.bst
+++ b/elements/core-deps/samba.bst
@@ -5,9 +5,9 @@ sources:
 - kind: patch
   path: files/samba/fix-root-build.patch
 depends:
-- core-deps/pam.bst
-- core-deps/openldap.bst
 - core-deps/libtirpc.bst
+- core-deps/openldap.bst
+- core-deps/pam.bst
 - core-deps/rpcsvc-proto.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index 58120c1..9631b33 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: spice:gtk/spice-gtk-0.34.tar.bz2
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/gtk-doc.bst
 - core-deps/phodav.bst
 - core-deps/spice-protocol.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/gtk-doc.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/totem-pl-parser.bst b/elements/core-deps/totem-pl-parser.bst
index 1b58048..5165334 100644
--- a/elements/core-deps/totem-pl-parser.bst
+++ b/elements/core-deps/totem-pl-parser.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:totem-pl-parser
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gmime3.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 1635087..4a9cced 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -5,16 +5,16 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/dconf.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
 - core-deps/libgrss.bst
 - core-deps/libgsf.bst
-- core-deps/libsecret.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker.bst
+- sdk/dconf.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/libsecret.bst
 - filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/tracker.bst b/elements/core-deps/tracker.bst
index 2ee68ba..3be9514 100644
--- a/elements/core-deps/tracker.bst
+++ b/elements/core-deps/tracker.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/dconf.bst
-- core-deps/glib.bst
-- core-deps/json-glib.bst
-- core-deps/libsoup.bst
 - core-deps/upower.bst
-- core-deps/vala.bst
+- sdk/dconf.bst
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/uhttpmock.bst b/elements/core-deps/uhttpmock.bst
index 4db862e..f3d366c 100644
--- a/elements/core-deps/uhttpmock.bst
+++ b/elements/core-deps/uhttpmock.bst
@@ -4,7 +4,7 @@ sources:
   url: github_com:pwithnall/uhttpmock.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index b73fca9..df7a1e3 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:upower
   track: master
 depends:
-- core-deps/gobject-introspection.bst
 - core-deps/libgudev.bst
 - core-deps/libusb.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/baobab.bst b/elements/core/baobab.bst
index 5be1d8d..01ac257 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:baobab
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 8f9eaf1..bd80b14 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:cheese
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/glib.bst
 - core-deps/gnome-video-effects.bst
-- core-deps/gst-plugins-bad.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/glib.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/libcanberra.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/eog.bst b/elements/core/eog.bst
index cb3cfda..ba36d71 100644
--- a/elements/core/eog.bst
+++ b/elements/core/eog.bst
@@ -5,15 +5,15 @@ sources:
   track: master
 depends:
 - core-deps/exempi.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/libpeas.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 18185b2..7a9d1aa 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -4,19 +4,19 @@ sources:
   url: git_gnome_org:epiphany
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/appstream-glib.bst
-- core-deps/gcr.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/json-glib.bst
 - core-deps/libdazzle.bst
-- core-deps/libnotify.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
-- core/glib-networking.bst
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/gcr.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib-networking.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/libnotify.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index 6424aec..572fe43 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -4,16 +4,16 @@ sources:
   url: git_gnome_org:evince
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/gspell.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgxps.bst
-- core-deps/libsecret.bst
-- core-deps/libsecret.bst
 - core-deps/poppler.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/nautilus.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libsecret.bst
+- sdk/libsecret.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/file-roller.bst b/elements/core/file-roller.bst
index dfe7018..7b28489 100644
--- a/elements/core/file-roller.bst
+++ b/elements/core/file-roller.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:file-roller
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index 90147c2..7b07a1b 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 depends:
 - core-deps/accountsservice.bst
-- core-deps/dconf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcanberra.bst
 - core-deps/upower.bst
-- core-deps/yelp-tools.bst
+- sdk/dconf.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libcanberra.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gedit.bst b/elements/core/gedit.bst
index f6fcebb..c3f2f7d 100644
--- a/elements/core/gedit.bst
+++ b/elements/core/gedit.bst
@@ -10,8 +10,8 @@ depends:
 - core-deps/gspell.bst
 - core-deps/gtksourceview-3.bst
 - core-deps/libpeas.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-backgrounds.bst b/elements/core/gnome-backgrounds.bst
index 6ab2baa..23570e0 100644
--- a/elements/core/gnome-backgrounds.bst
+++ b/elements/core/gnome-backgrounds.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-backgrounds
   track: master
 depends:
-- core-deps/glib.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
index 639b1be..c274da3 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-bluetooth
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/gtk-doc.bst
-- core-deps/libcanberra.bst
-- core-deps/libnotify.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/gtk-doc.bst
+- sdk/libcanberra.bst
+- sdk/libnotify.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 23c32e1..9ffe864 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:gnome-boxes
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtk-vnc.bst
-- core-deps/json-glib.bst
 - core-deps/libgovirt.bst
 - core-deps/libgudev.bst
 - core-deps/libosinfo.bst
-- core-deps/libsecret.bst
 - core-deps/libvirt-glib.bst
 - core-deps/spice-gtk.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- core-deps/vala.bst
-- core/adwaita-icon-theme.bst
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/libsecret.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-calculator.bst b/elements/core/gnome-calculator.bst
index 51be15c..0aced84 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-calculator
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
-- core-deps/libsoup.bst
 - core-deps/mpc.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index 47d1783..b70e422 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:gnome-calendar
   track: master
 depends:
-- core-deps/appstream-glib.bst
 - core-deps/evolution-data-server.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gtk+-3.bst
 - core-deps/libdazzle.bst
-- core/adwaita-icon-theme.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-characters.bst b/elements/core/gnome-characters.bst
index 0f7dc7f..0938d6f 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-characters
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gjs.bst
-- core-deps/gtk+-3.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/gjs.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-clocks.bst b/elements/core/gnome-clocks.bst
index b73e1c8..a6f24b5 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-clocks
   track: master
 depends:
-- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
 - core-deps/gsound.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgweather.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/geoclue.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index fc37a28..1b7f5c9 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-color-manager
   track: master
 depends:
-- core-deps/appstream-glib.bst
 - core-deps/colord-gtk.bst
 - core-deps/exiv2.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcanberra.bst
-- core-deps/vte.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libcanberra.bst
+- sdk/vte.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index 396aeb4..5bcee9b 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -5,16 +5,16 @@ sources:
   track: master
 depends:
 - core-deps/folks.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/libchamplain.bst
 - core-deps/libgee.bst
-- core-deps/vala.bst
-- core/adwaita-icon-theme.bst
 - core/cheese.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index a5330cc..886a8dc 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -7,15 +7,10 @@ depends:
 - core-deps/ModemManager.bst
 - core-deps/NetworkManager.bst
 - core-deps/accountsservice.bst
-- core-deps/clutter-gtk.bst
 - core-deps/colord-gtk.bst
 - core-deps/colord.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/grilo.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/ibus-anthy.bst
 - core-deps/ibus-hangul.bst
 - core-deps/ibus-libpinyin.bst
@@ -25,13 +20,18 @@ depends:
 - core-deps/pwquality.bst
 - core-deps/samba.bst
 - core-deps/upower.bst
-- core/adwaita-icon-theme.bst
 - core/cheese.bst
 - core/gnome-bluetooth.bst
 - core/gnome-color-manager.bst
 - core/gnome-desktop.bst
 - core/gnome-settings-daemon.bst
-- core/gsettings-desktop-schemas.bst
 - core/network-manager-applet.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/clutter-gtk.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-desktop.bst b/elements/core/gnome-desktop.bst
index c83c0dc..eff20ac 100644
--- a/elements/core/gnome-desktop.bst
+++ b/elements/core/gnome-desktop.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-desktop
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-disk-utility.bst b/elements/core/gnome-disk-utility.bst
index 39dbcf6..1428029 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-disk-utility
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/libdvdread.bst
-- core-deps/libnotify.bst
-- core-deps/libsecret.bst
 - core-deps/pwquality.bst
 - core-deps/udisks2.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-settings-daemon.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
+- sdk/libsecret.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-documents.bst b/elements/core/gnome-documents.bst
index 6bb9596..10879c5 100644
--- a/elements/core/gnome-documents.bst
+++ b/elements/core/gnome-documents.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:gnome-documents
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgdata.bst
 - core-deps/libgepub.bst
 - core-deps/libzapojit.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- core/adwaita-icon-theme.bst
 - core/evince.bst
 - core/gnome-desktop.bst
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-font-viewer.bst b/elements/core/gnome-font-viewer.bst
index 033cd63..b40acef 100644
--- a/elements/core/gnome-font-viewer.bst
+++ b/elements/core/gnome-font-viewer.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-font-viewer
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-getting-started-docs.bst b/elements/core/gnome-getting-started-docs.bst
index a445c2f..b72d0ff 100644
--- a/elements/core/gnome-getting-started-docs.bst
+++ b/elements/core/gnome-getting-started-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-getting-started-docs
   track: master
 depends:
-- core-deps/yelp-tools.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index 1781243..7289ec5 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -5,21 +5,21 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/WebKitGTK+.bst
 - core-deps/accountsservice.bst
-- core-deps/geoclue.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgweather.bst
 - core-deps/pwquality.bst
 - core-deps/upower.bst
-- core/adwaita-icon-theme.bst
 - core/gdm.bst
 - core/gnome-desktop.bst
 - core/gnome-getting-started-docs.bst
 - core/gnome-keyring.bst
 - core/network-manager-applet.bst
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/geoclue.bst
+- sdk/glib.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-keyring.bst b/elements/core/gnome-keyring.bst
index 9b06ef6..6e0df21 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gnome-keyring
   track: master
 depends:
-- core-deps/gcr.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
+- sdk/gcr.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-logs.bst b/elements/core/gnome-logs.bst
index a5bb726..7dba374 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-logs
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: vm/linux-vm-boot/systemd.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index a61a28a..3b32308 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -4,21 +4,21 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-maps
   track: master
 depends:
-- core-deps/clutter-gtk.bst
 - core-deps/folks.bst
-- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/libchamplain.bst
 - core-deps/libgee.bst
 - core-deps/libgfbgraph.bst
-- core-deps/librsvg.bst
-- core/adwaita-icon-theme.bst
-- core/glib-networking.bst
 - core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/clutter-gtk.bst
+- sdk/geoclue.bst
+- sdk/gjs.bst
+- sdk/glib-networking.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-menus.bst b/elements/core/gnome-menus.bst
index d182bb7..50c7004 100644
--- a/elements/core/gnome-menus.bst
+++ b/elements/core/gnome-menus.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gnome-menus
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index 565c225..40c2ba2 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -4,16 +4,16 @@ sources:
   url: git_gnome_org:gnome-music
   track: master
 depends:
-- core-deps/gobject-introspection.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
-- core-deps/gtk+-3.bst
 - core-deps/libdazzle.bst
 - core-deps/libmediaart.bst
-- core-deps/pygobject.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- core/adwaita-icon-theme.bst
-- core/gvfs.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/gvfs.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index a0b0453..3389c19 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -5,23 +5,23 @@ sources:
   track: master
 depends:
 - core-deps/babl.bst
-- core-deps/gdk-pixbuf.bst
 - core-deps/gegl.bst
 - core-deps/geocode-glib.bst
 - core-deps/gexiv2.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
-- core-deps/gtk+-3.bst
 - core-deps/libdazzle.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- core/adwaita-icon-theme.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
 - filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-screenshot.bst b/elements/core/gnome-screenshot.bst
index 0b36647..29fbbf2 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-screenshot
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcanberra.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libcanberra.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-session.bst b/elements/core/gnome-session.bst
index 35ef63f..e86df9e 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-session
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/json-glib.bst
 - core-deps/upower.bst
 - core-deps/xmlto.bst
 - core/gnome-desktop.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
 - filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-sm.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 90cadad..cc42ff3 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -7,20 +7,20 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/PackageKit.bst
 - core-deps/colord.bst
-- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/ibus.bst
-- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
 - core-deps/libgweather.bst
-- core-deps/libnotify.bst
-- core-deps/librsvg.bst
 - core-deps/libwacom.bst
 - core-deps/upower.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/geoclue.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/ibus.bst
+- sdk/libcanberra.bst
+- sdk/libnotify.bst
+- sdk/librsvg.bst
 - filename: desktop/alsa-lib.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/cups.bst
diff --git a/elements/core/gnome-shell-extensions.bst b/elements/core/gnome-shell-extensions.bst
index 4275062..0f458cb 100644
--- a/elements/core/gnome-shell-extensions.bst
+++ b/elements/core/gnome-shell-extensions.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-shell-extensions.git
   track: master
 depends:
-- core-deps/librsvg.bst
 - core/gnome-menus.bst
 - core/gnome-shell.bst
+- sdk/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index b9d561a..242c4f9 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -6,26 +6,26 @@ sources:
 depends:
 - core-deps/NetworkManager.bst
 - core-deps/accountsservice.bst
-- core-deps/dconf.bst
 - core-deps/evolution-data-server.bst
-- core-deps/gcr.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
-- core-deps/libcroco.bst
 - core-deps/libgnomekbd.bst
-- core-deps/libsoup.bst
 - core-deps/sassc.bst
 - core-deps/startup-notification.bst
 - core-deps/upower.bst
-- core/adwaita-icon-theme.bst
 - core/gdm.bst
 - core/gnome-bluetooth.bst
 - core/gnome-desktop.bst
 - core/gnome-settings-daemon.bst
 - core/mutter.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/dconf.bst
+- sdk/gcr.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/libcroco.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index b8c494b..b34397b 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -5,18 +5,18 @@ sources:
   track: master
 depends:
 - core-deps/PackageKit.bst
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
 - core-deps/gspell.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgudev.bst
 - core-deps/liboauth.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
 - core-deps/valgrind.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-system-monitor.bst b/elements/core/gnome-system-monitor.bst
index 39f3cf6..238905d 100644
--- a/elements/core/gnome-system-monitor.bst
+++ b/elements/core/gnome-system-monitor.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-system-monitor
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtkmm-3.bst
 - core-deps/libgtop.bst
-- core-deps/librsvg.bst
 - core-deps/polkit.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-terminal.bst b/elements/core/gnome-terminal.bst
index ba92043..9063bd4 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:gnome-terminal
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/dconf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vte.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-shell.bst
-- core/gsettings-desktop-schemas.bst
 - core/nautilus.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/dconf.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vte.bst
+- sdk/yelp-tools.bst
 - filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-user-docs.bst b/elements/core/gnome-user-docs.bst
index e692f27..ea5f79f 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-user-docs
   track: master
 depends:
-- core-deps/yelp-tools.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-user-share.bst b/elements/core/gnome-user-share.bst
index 75b1a11..12c4242 100644
--- a/elements/core/gnome-user-share.bst
+++ b/elements/core/gnome-user-share.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-user-share
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/libnotify.bst
 - core/gnome-bluetooth.bst
 - core/nautilus.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-weather.bst b/elements/core/gnome-weather.bst
index e8d3128..f98a38e 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-weather
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/geoclue.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgweather.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/gdk-pixbuf.bst
+- sdk/geoclue.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/meta-gnome-core-shell.bst b/elements/core/meta-gnome-core-shell.bst
index 27253fc..084e187 100644
--- a/elements/core/meta-gnome-core-shell.bst
+++ b/elements/core/meta-gnome-core-shell.bst
@@ -3,9 +3,7 @@
 # release team. Current contacts: Michael Catanzaro or Javier Jardon.
 kind: stack
 depends:
-- core/adwaita-icon-theme.bst
 - core/gdm.bst
-- core/glib-networking.bst
 - core/gnome-backgrounds.bst
 - core/gnome-bluetooth.bst
 - core/gnome-color-manager.bst
@@ -19,11 +17,8 @@ depends:
 - core/gnome-settings-daemon.bst
 - core/gnome-shell-extensions.bst
 - core/gnome-shell.bst
-- core/gnome-themes-extra.bst
 - core/gnome-user-docs.bst
 - core/gnome-user-share.bst
-- core/gsettings-desktop-schemas.bst
-- core/gvfs.bst
 - core/mousetweaks.bst
 - core/mutter.bst
 - core/network-manager-applet.bst
@@ -31,5 +26,10 @@ depends:
 - core/rygel.bst
 - core/sushi.bst
 - core/vino.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib-networking.bst
+- sdk/gnome-themes-extra.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gvfs.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/meta-gnome-core-utilities.bst b/elements/core/meta-gnome-core-utilities.bst
index aa35e65..fcd5c67 100644
--- a/elements/core/meta-gnome-core-utilities.bst
+++ b/elements/core/meta-gnome-core-utilities.bst
@@ -34,6 +34,6 @@ depends:
 - core/nautilus.bst
 - core/simple-scan.bst
 - core/totem.bst
-- core/yelp.bst
+- sdk/yelp.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/mousetweaks.bst b/elements/core/mousetweaks.bst
index 44458c2..1cb3c0f 100644
--- a/elements/core/mousetweaks.bst
+++ b/elements/core/mousetweaks.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:mousetweaks
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
 - filename: desktop/xorg-lib-xcursor.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xtst.bst
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 17814ad..9b5effb 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -4,20 +4,20 @@ sources:
   url: git_gnome_org:mutter
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/gtk-doc.bst
-- core-deps/json-glib.bst
 - core-deps/libgudev.bst
 - core-deps/libinput.bst
-- core-deps/pango.bst
 - core-deps/upower.bst
-- core-deps/wayland.bst
-- core-deps/zenity.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/gtk-doc.bst
+- sdk/json-glib.bst
+- sdk/pango.bst
+- sdk/wayland.bst
+- sdk/zenity.bst
 - filename: desktop/xorg-lib-xcursor.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xtst.bst
diff --git a/elements/core/nautilus.bst b/elements/core/nautilus.bst
index afd46a4..8c614d6 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -5,15 +5,15 @@ sources:
   track: master
 depends:
 - core-deps/gexiv2.bst
-- core-deps/glib.bst
 - core-deps/gnome-autoar.bst
-- core-deps/gtk+-3.bst
-- core-deps/pango.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/network-manager-applet.bst b/elements/core/network-manager-applet.bst
index df69332..cff8648 100644
--- a/elements/core/network-manager-applet.bst
+++ b/elements/core/network-manager-applet.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:network-manager-applet
   track: master
 depends:
-- core-deps/NetworkManager.bst
-- core-deps/glib.bst
 - core-deps/ModemManager.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
+- core-deps/NetworkManager.bst
 - core-deps/libgudev.bst
-- core-deps/libnotify.bst
-- core-deps/libsecret.bst
 - core-deps/mobile-broadband-provider-info.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-bluetooth.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
+- sdk/libsecret.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/orca.bst b/elements/core/orca.bst
index 9bed75d..f859ef0 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:orca
   track: master
 depends:
-- core-deps/at-spi2-atk.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/pyatspi2.bst
-- core-deps/pygobject.bst
 - core-deps/speech-dispatcher.bst
-- core-deps/yelp-tools.bst
+- sdk/at-spi2-atk.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/pygobject.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index 8b4706a..a5250e1 100644
--- a/elements/core/rygel.bst
+++ b/elements/core/rygel.bst
@@ -10,6 +10,6 @@ depends:
 - core-deps/libgee.bst
 - core-deps/libmediaart.bst
 - core-deps/tracker.bst
-- core-deps/vala.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index 78e7ee1..d6df61b 100644
--- a/elements/core/simple-scan.bst
+++ b/elements/core/simple-scan.bst
@@ -6,12 +6,12 @@ sources:
 depends:
 - core-deps/PackageKit.bst
 - core-deps/colord-gtk.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgusb.bst
-- core-deps/vala.bst
 - core-deps/sane-backends.bst
-- core/adwaita-icon-theme.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index cf92c0c..7a36c8b 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:sushi
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gjs.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
 - core-deps/libmusicbrainz.bst
 - core/evince.bst
+- sdk/WebKitGTK+.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gjs.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 9a1079e..0b2f37d 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -4,25 +4,25 @@ sources:
   url: git_gnome_org:totem
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
-- core-deps/gst-plugins-bad.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/libpeas.bst
 - core-deps/totem-pl-parser.bst
-- core-deps/yelp-tools.bst
-- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/vino.bst b/elements/core/vino.bst
index c5731fa..85ecde7 100644
--- a/elements/core/vino.bst
+++ b/elements/core/vino.bst
@@ -5,11 +5,11 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/libnotify.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
 - filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-sm.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
new file mode 100644
index 0000000..1c5f9b8
--- /dev/null
+++ b/elements/sdk-platform.bst
@@ -0,0 +1,48 @@
+kind: stack
+depends:
+- sdk/WebKitGTK+.bst
+- sdk/appstream-glib.bst
+- sdk/at-spi2-atk.bst
+- sdk/at-spi2-core.bst
+- sdk/atk.bst
+- sdk/brotli.bst
+- sdk/cantarell-fonts.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/cogl.bst
+- sdk/dbus-glib.bst
+- sdk/dconf.bst
+- sdk/enchant-2.bst
+- sdk/fribidi.bst
+- sdk/gcab.bst
+- sdk/gcr.bst
+- sdk/gdk-pixbuf.bst
+- sdk/geoclue.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-libav.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/ibus.bst
+- sdk/json-glib.bst
+- sdk/libcanberra.bst
+- sdk/libcroco.bst
+- sdk/libnotify.bst
+- sdk/libpsl.bst
+- sdk/librsvg.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- sdk/mozjs52.bst
+- sdk/pango.bst
+- sdk/pycairo.bst
+- sdk/pygobject.bst
+- sdk/vte.bst
+- sdk/wayland.bst
+- sdk/woff2.bst
+- sdk/yelp-xsl.bst
+- sdk/zenity.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
new file mode 100644
index 0000000..7b3c122
--- /dev/null
+++ b/elements/sdk.bst
@@ -0,0 +1,7 @@
+kind: stack
+depends:
+- sdk-platform.bst
+- sdk/gnome-common.bst
+- sdk/gtk-doc.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
new file mode 100644
index 0000000..ddd85d5
--- /dev/null
+++ b/elements/sdk/WebKitGTK+.bst
@@ -0,0 +1,29 @@
+kind: cmake
+sources:
+- kind: tar
+  url: webkitgtk_org:webkitgtk-2.21.2.tar.xz
+depends:
+- sdk/at-spi2-core.bst
+- sdk/brotli.bst
+- sdk/enchant-2.bst
+- sdk/geoclue.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-libav.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- sdk/pango.bst
+- sdk/wayland.bst
+- sdk/woff2.bst
+- filename: desktop/hyphen.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xt.bst
+  junction: freedesktop-sdk.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  cmake-local: -DPORT=GTK -DENABLE_PLUGIN_PROCESS_GTK2=OFF
diff --git a/elements/core/adwaita-icon-theme.bst b/elements/sdk/adwaita-icon-theme.bst
similarity index 67%
rename from elements/core/adwaita-icon-theme.bst
rename to elements/sdk/adwaita-icon-theme.bst
index 10fab7f..cf3dc1e 100644
--- a/elements/core/adwaita-icon-theme.bst
+++ b/elements/sdk/adwaita-icon-theme.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:adwaita-icon-theme
   track: master
 depends:
-- core-deps/gnome-common.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
+- sdk/gnome-common.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/appstream-glib.bst b/elements/sdk/appstream-glib.bst
new file mode 100644
index 0000000..c46e8d5
--- /dev/null
+++ b/elements/sdk/appstream-glib.bst
@@ -0,0 +1,17 @@
+kind: meson
+sources:
+- kind: git
+  url: github_com:hughsie/appstream-glib.git
+  track: master
+depends:
+- sdk/gcab.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  meson-local: -Dstemmer=false -Drpm=false -Dfonts=false -Ddep11=false
diff --git a/elements/core-deps/at-spi2-atk.bst b/elements/sdk/at-spi2-atk.bst
similarity index 67%
rename from elements/core-deps/at-spi2-atk.bst
rename to elements/sdk/at-spi2-atk.bst
index 1b9434f..fc423c1 100644
--- a/elements/core-deps/at-spi2-atk.bst
+++ b/elements/sdk/at-spi2-atk.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:at-spi2-atk
   track: master
 depends:
-- core-deps/atk.bst
-- core-deps/at-spi2-core.bst
-- core-deps/glib.bst
+- sdk/at-spi2-core.bst
+- sdk/atk.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/at-spi2-core.bst b/elements/sdk/at-spi2-core.bst
similarity index 77%
rename from elements/core-deps/at-spi2-core.bst
rename to elements/sdk/at-spi2-core.bst
index a616463..04e475c 100644
--- a/elements/core-deps/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:at-spi2-core
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/atk.bst b/elements/sdk/atk.bst
similarity index 62%
rename from elements/core-deps/atk.bst
rename to elements/sdk/atk.bst
index d1871f7..31a10e8 100644
--- a/elements/core-deps/atk.bst
+++ b/elements/sdk/atk.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:atk
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/brotli.bst b/elements/sdk/brotli.bst
similarity index 100%
rename from elements/core-deps/brotli.bst
rename to elements/sdk/brotli.bst
diff --git a/elements/core-deps/cantarell-fonts.bst b/elements/sdk/cantarell-fonts.bst
similarity index 84%
rename from elements/core-deps/cantarell-fonts.bst
rename to elements/sdk/cantarell-fonts.bst
index 79224fb..d19fcc3 100644
--- a/elements/core-deps/cantarell-fonts.bst
+++ b/elements/sdk/cantarell-fonts.bst
@@ -3,6 +3,6 @@ sources:
 - kind: tar
   url: gnome_downloads:cantarell-fonts/0.100/cantarell-fonts-0.100.tar.xz
 depends:
-- core-deps/appstream-glib.bst
+- sdk/appstream-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/clutter-gst.bst b/elements/sdk/clutter-gst.bst
similarity index 52%
rename from elements/core-deps/clutter-gst.bst
rename to elements/sdk/clutter-gst.bst
index a8ab8bc..18d2a62 100644
--- a/elements/core-deps/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:clutter-gst
   track: clutter-gst-3.0
 depends:
-- core-deps/clutter.bst
-- core-deps/cogl.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
+- sdk/clutter.bst
+- sdk/cogl.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/clutter-gtk.bst b/elements/sdk/clutter-gtk.bst
similarity index 75%
rename from elements/core-deps/clutter-gtk.bst
rename to elements/sdk/clutter-gtk.bst
index 6392546..1088b58 100644
--- a/elements/core-deps/clutter-gtk.bst
+++ b/elements/sdk/clutter-gtk.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:clutter-gtk
   track: master
 depends:
-- core-deps/clutter.bst
-- core-deps/gtk+-3.bst
+- sdk/clutter.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/clutter.bst b/elements/sdk/clutter.bst
similarity index 58%
rename from elements/core-deps/clutter.bst
rename to elements/sdk/clutter.bst
index d305a11..8331b60 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/sdk/clutter.bst
@@ -4,15 +4,13 @@ sources:
   url: git_gnome_org:clutter
   track: master
 depends:
-- core-deps/atk.bst
-- core-deps/cogl.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/json-glib.bst
-- core-deps/libgudev.bst
-- core-deps/libinput.bst
-- core-deps/wayland.bst
+- sdk/atk.bst
+- sdk/cogl.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/json-glib.bst
+- sdk/wayland.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/cogl.bst b/elements/sdk/cogl.bst
similarity index 63%
rename from elements/core-deps/cogl.bst
rename to elements/sdk/cogl.bst
index d8c7455..71a267f 100644
--- a/elements/core-deps/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:cogl
   track: cogl-1.22
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk-doc.bst
-- core-deps/pango.bst
-- core-deps/wayland.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/gtk-doc.bst
+- sdk/pango.bst
+- sdk/wayland.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/dbus-glib.bst b/elements/sdk/dbus-glib.bst
similarity index 100%
rename from elements/core-deps/dbus-glib.bst
rename to elements/sdk/dbus-glib.bst
diff --git a/elements/core-deps/dconf.bst b/elements/sdk/dconf.bst
similarity index 76%
rename from elements/core-deps/dconf.bst
rename to elements/sdk/dconf.bst
index e261b36..fdeec39 100644
--- a/elements/core-deps/dconf.bst
+++ b/elements/sdk/dconf.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:dconf
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/enchant-2.bst b/elements/sdk/enchant-2.bst
similarity index 93%
rename from elements/core-deps/enchant-2.bst
rename to elements/sdk/enchant-2.bst
index a4c012d..4341cad 100644
--- a/elements/core-deps/enchant-2.bst
+++ b/elements/sdk/enchant-2.bst
@@ -3,7 +3,7 @@ sources:
 - kind: tar
   url: github_com:AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
 depends:
-- core-deps/glib.bst
+- sdk/glib.bst
 - filename: desktop/hunspell.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/fribidi.bst b/elements/sdk/fribidi.bst
similarity index 100%
rename from elements/core-deps/fribidi.bst
rename to elements/sdk/fribidi.bst
diff --git a/elements/core-deps/gcab.bst b/elements/sdk/gcab.bst
similarity index 63%
rename from elements/core-deps/gcab.bst
rename to elements/sdk/gcab.bst
index dc9c920..368580e 100644
--- a/elements/core-deps/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gcab
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gcr.bst b/elements/sdk/gcr.bst
similarity index 59%
rename from elements/core-deps/gcr.bst
rename to elements/sdk/gcr.bst
index d80a41d..a8fda82 100644
--- a/elements/core-deps/gcr.bst
+++ b/elements/sdk/gcr.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gcr
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gdk-pixbuf.bst b/elements/sdk/gdk-pixbuf.bst
similarity index 78%
rename from elements/core-deps/gdk-pixbuf.bst
rename to elements/sdk/gdk-pixbuf.bst
index 47f73dd..357ec5c 100644
--- a/elements/core-deps/gdk-pixbuf.bst
+++ b/elements/sdk/gdk-pixbuf.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gdk-pixbuf
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - filename: desktop/shared-mime-info.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/sdk/geoclue.bst b/elements/sdk/geoclue.bst
new file mode 100644
index 0000000..82385f0
--- /dev/null
+++ b/elements/sdk/geoclue.bst
@@ -0,0 +1,15 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_freedesktop_org:geoclue
+  track: master
+depends:
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libnotify.bst
+- sdk/libsoup.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local: --disable-3g-source --disable-cdma-source --disable-modem-gps-source
+    --disable-nmea-source
diff --git a/elements/core-deps/gjs.bst b/elements/sdk/gjs.bst
similarity index 80%
rename from elements/core-deps/gjs.bst
rename to elements/sdk/gjs.bst
index a09dc36..a6899e7 100644
--- a/elements/core-deps/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gjs
   track: master
 depends:
-- core-deps/gobject-introspection.bst
-- core-deps/mozjs52.bst
+- sdk/gobject-introspection.bst
+- sdk/mozjs52.bst
 - filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/glib-networking.bst b/elements/sdk/glib-networking.bst
similarity index 81%
rename from elements/core/glib-networking.bst
rename to elements/sdk/glib-networking.bst
index 40236f7..eb82fd0 100644
--- a/elements/core/glib-networking.bst
+++ b/elements/sdk/glib-networking.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glib-networking
   track: master
 depends:
-- core-deps/glib.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
 - filename: desktop/libproxy.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/glib.bst b/elements/sdk/glib.bst
similarity index 92%
rename from elements/core-deps/glib.bst
rename to elements/sdk/glib.bst
index 5f8b2e0..8a0a41f 100644
--- a/elements/core-deps/glib.bst
+++ b/elements/sdk/glib.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:glib
   track: master
 depends:
-- core-deps/gtk-doc.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gnome-common.bst b/elements/sdk/gnome-common.bst
similarity index 100%
rename from elements/core-deps/gnome-common.bst
rename to elements/sdk/gnome-common.bst
diff --git a/elements/core/gnome-themes-extra.bst b/elements/sdk/gnome-themes-extra.bst
similarity index 73%
rename from elements/core/gnome-themes-extra.bst
rename to elements/sdk/gnome-themes-extra.bst
index ec5079b..6fdf116 100644
--- a/elements/core/gnome-themes-extra.bst
+++ b/elements/sdk/gnome-themes-extra.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-themes-extra.git
   track: master
 depends:
-- core-deps/cantarell-fonts.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
+- sdk/cantarell-fonts.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gobject-introspection.bst b/elements/sdk/gobject-introspection.bst
similarity index 90%
rename from elements/core-deps/gobject-introspection.bst
rename to elements/sdk/gobject-introspection.bst
index 8ebb326..8477aef 100644
--- a/elements/core-deps/gobject-introspection.bst
+++ b/elements/sdk/gobject-introspection.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gobject-introspection
   track: master
 depends:
-- core-deps/glib.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gsettings-desktop-schemas.bst b/elements/sdk/gsettings-desktop-schemas.bst
similarity index 70%
rename from elements/core/gsettings-desktop-schemas.bst
rename to elements/sdk/gsettings-desktop-schemas.bst
index d7cf9f8..93b9073 100644
--- a/elements/core/gsettings-desktop-schemas.bst
+++ b/elements/sdk/gsettings-desktop-schemas.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gsettings-desktop-schemas
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gst-libav.bst b/elements/sdk/gst-libav.bst
similarity index 83%
rename from elements/core-deps/gst-libav.bst
rename to elements/sdk/gst-libav.bst
index 394e48d..e751c40 100644
--- a/elements/core-deps/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -4,6 +4,6 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-libav
   track: master
 depends:
-- core-deps/gst-plugins-base.bst
+- sdk/gst-plugins-base.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
similarity index 73%
rename from elements/core-deps/gst-plugins-bad.bst
rename to elements/sdk/gst-plugins-bad.bst
index 5bc2b16..d20f625 100644
--- a/elements/core-deps/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -4,7 +4,6 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-bad
   track: master
 depends:
-- core-deps/graphene.bst
-- core-deps/gst-plugins-base.bst
+- sdk/gst-plugins-base.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gst-plugins-base.bst b/elements/sdk/gst-plugins-base.bst
similarity index 74%
rename from elements/core-deps/gst-plugins-base.bst
rename to elements/sdk/gst-plugins-base.bst
index fdfb3d4..d553be4 100644
--- a/elements/core-deps/gst-plugins-base.bst
+++ b/elements/sdk/gst-plugins-base.bst
@@ -4,9 +4,8 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-base
   track: master
 depends:
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
-- core-deps/libgudev.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gst-plugins-good.bst b/elements/sdk/gst-plugins-good.bst
similarity index 66%
rename from elements/core-deps/gst-plugins-good.bst
rename to elements/sdk/gst-plugins-good.bst
index ff18fca..14d8774 100644
--- a/elements/core-deps/gst-plugins-good.bst
+++ b/elements/sdk/gst-plugins-good.bst
@@ -4,8 +4,7 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-good
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/libgudev.bst
+- sdk/gdk-pixbuf.bst
+- sdk/gst-plugins-base.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gstreamer.bst b/elements/sdk/gstreamer.bst
similarity index 77%
rename from elements/core-deps/gstreamer.bst
rename to elements/sdk/gstreamer.bst
index 1fd1054..5b2f1c7 100644
--- a/elements/core-deps/gstreamer.bst
+++ b/elements/sdk/gstreamer.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:gstreamer/gstreamer
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtk+-3.bst b/elements/sdk/gtk+-3.bst
similarity index 83%
rename from elements/core-deps/gtk+-3.bst
rename to elements/sdk/gtk+-3.bst
index 09cefda..72cbea8 100644
--- a/elements/core-deps/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gtk+
   track: gtk-3-22
 depends:
-- core-deps/atk.bst
-- core-deps/at-spi2-atk.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
-- core-deps/pango.bst
-- core-deps/wayland.bst
+- sdk/at-spi2-atk.bst
+- sdk/atk.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- sdk/pango.bst
+- sdk/wayland.bst
 - filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/libepoxy.bst
@@ -20,14 +20,14 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-- filename: desktop/xorg-lib-xinerama.bst
-  junction: freedesktop-sdk.bst
-- filename: desktop/xorg-lib-xi.bst
-  junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xcomposite.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xdamage.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xi.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xinerama.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gtk-doc.bst b/elements/sdk/gtk-doc.bst
similarity index 84%
rename from elements/core-deps/gtk-doc.bst
rename to elements/sdk/gtk-doc.bst
index c6721e9..ab5d16c 100644
--- a/elements/core-deps/gtk-doc.bst
+++ b/elements/sdk/gtk-doc.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gtk-doc
   track: master
 depends:
-- core-deps/yelp-tools.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gvfs.bst b/elements/sdk/gvfs.bst
new file mode 100644
index 0000000..8566a33
--- /dev/null
+++ b/elements/sdk/gvfs.bst
@@ -0,0 +1,17 @@
+kind: meson
+sources:
+- kind: git
+  url: git_gnome_org:gvfs
+  track: master
+depends:
+- sdk/glib.bst
+- filename: desktop/dbus.bst
+  junction: freedesktop-sdk.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  meson-local: -Dsystemduserunitdir=no -Dtmpfilesdir=no -Dinstalled_tests=true 
-Ddbus_service_dir=/usr/share/dbus-1/services
+    -Dadmin=false -Dafc=false -Dafp=false -Darchive=false -Dcdda=false -Ddnssd=false
+    -Dgoa=false -Dgoogle=false -Dgphoto2=false -Dhttp=false -Dmtp=false -Dnfs=false
+    -Dsftp=false -Dsmb=false -Dudisks2=false -Dbluray=false -Dfuse=false -Dgcr=false
+    -Dgcrypt=false -Dgudev=false -Dkeyring=false -Dlogind=false -Dlibusb=false
diff --git a/elements/core-deps/ibus.bst b/elements/sdk/ibus.bst
similarity index 69%
rename from elements/core-deps/ibus.bst
rename to elements/sdk/ibus.bst
index 671a150..251568a 100644
--- a/elements/core-deps/ibus.bst
+++ b/elements/sdk/ibus.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: github_com:ibus/ibus/releases/download/1.5.17/ibus-1.5.17.tar.gz
 depends:
-- core-deps/dconf.bst
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
-- core-deps/libnotify.bst
+- sdk/dconf.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/json-glib.bst b/elements/sdk/json-glib.bst
similarity index 72%
rename from elements/core-deps/json-glib.bst
rename to elements/sdk/json-glib.bst
index a568b6e..6d12991 100644
--- a/elements/core-deps/json-glib.bst
+++ b/elements/sdk/json-glib.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/json-glib.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libcanberra.bst b/elements/sdk/libcanberra.bst
similarity index 74%
rename from elements/core-deps/libcanberra.bst
rename to elements/sdk/libcanberra.bst
index bde8cd1..c0660dc 100644
--- a/elements/core-deps/libcanberra.bst
+++ b/elements/sdk/libcanberra.bst
@@ -3,11 +3,9 @@ sources:
 - kind: tar
   url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
 depends:
-- core-deps/gtk+-3.bst
+- sdk/gtk+-3.bst
 - filename: desktop/pulseaudio.bst
   junction: freedesktop-sdk.bst
-- filename: vm/linux-vm-boot/systemd.bst
-  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libcroco.bst b/elements/sdk/libcroco.bst
similarity index 76%
rename from elements/core-deps/libcroco.bst
rename to elements/sdk/libcroco.bst
index e35a789..e2aa3ed 100644
--- a/elements/core-deps/libcroco.bst
+++ b/elements/sdk/libcroco.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:libcroco
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libnotify.bst b/elements/sdk/libnotify.bst
similarity index 56%
rename from elements/core-deps/libnotify.bst
rename to elements/sdk/libnotify.bst
index a75b51a..0eadb5d 100644
--- a/elements/core-deps/libnotify.bst
+++ b/elements/sdk/libnotify.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:libnotify
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libpsl.bst b/elements/sdk/libpsl.bst
similarity index 100%
rename from elements/core-deps/libpsl.bst
rename to elements/sdk/libpsl.bst
diff --git a/elements/core-deps/librsvg.bst b/elements/sdk/librsvg.bst
similarity index 61%
rename from elements/core-deps/librsvg.bst
rename to elements/sdk/librsvg.bst
index aee72ab..993f035 100644
--- a/elements/core-deps/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -4,13 +4,13 @@ sources:
 - url: https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz
   kind: tar
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/glib.bst
-- core-deps/gnome-common.bst
-- core-deps/gobject-introspection.bst
-- core-deps/libcroco.bst
-- core-deps/pango.bst
-- core-deps/vala.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gnome-common.bst
+- sdk/gobject-introspection.bst
+- sdk/libcroco.bst
+- sdk/pango.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libsecret.bst b/elements/sdk/libsecret.bst
similarity index 64%
rename from elements/core-deps/libsecret.bst
rename to elements/sdk/libsecret.bst
index 52c5009..cd007f3 100644
--- a/elements/core-deps/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libsecret
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libsoup.bst b/elements/sdk/libsoup.bst
similarity index 64%
rename from elements/core-deps/libsoup.bst
rename to elements/sdk/libsoup.bst
index ef232ee..fdef664 100644
--- a/elements/core-deps/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libsoup
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/libpsl.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/libpsl.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/mozjs52.bst b/elements/sdk/mozjs52.bst
similarity index 100%
rename from elements/core-deps/mozjs52.bst
rename to elements/sdk/mozjs52.bst
diff --git a/elements/core-deps/pango.bst b/elements/sdk/pango.bst
similarity index 75%
rename from elements/core-deps/pango.bst
rename to elements/sdk/pango.bst
index 2987394..3687ecb 100644
--- a/elements/core-deps/pango.bst
+++ b/elements/sdk/pango.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:pango
   track: master
 depends:
-- core-deps/fribidi.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
+- sdk/fribidi.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: desktop/harfbuzz.bst
-  junction: freedesktop-sdk.bst
 - filename: desktop/fontconfig.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/harfbuzz.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/pycairo.bst b/elements/sdk/pycairo.bst
similarity index 100%
rename from elements/core-deps/pycairo.bst
rename to elements/sdk/pycairo.bst
diff --git a/elements/core-deps/pygobject.bst b/elements/sdk/pygobject.bst
similarity index 65%
rename from elements/core-deps/pygobject.bst
rename to elements/sdk/pygobject.bst
index aaee066..3f4ee13 100644
--- a/elements/core-deps/pygobject.bst
+++ b/elements/sdk/pygobject.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/pygobject.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/pycairo.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/pycairo.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/vala-bootstrap.bst b/elements/sdk/vala-bootstrap.bst
new file mode 100644
index 0000000..5e62b50
--- /dev/null
+++ b/elements/sdk/vala-bootstrap.bst
@@ -0,0 +1,10 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_gnome_org:vala-bootstrap
+  track: master
+depends:
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local: --disable-build-from-vala --disable-vapigen
diff --git a/elements/sdk/vala.bst b/elements/sdk/vala.bst
new file mode 100644
index 0000000..44b87e0
--- /dev/null
+++ b/elements/sdk/vala.bst
@@ -0,0 +1,15 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_gnome_org:vala
+  track: master
+- kind: patch
+  path: files/vala/disable-valadoc.patch
+depends:
+- sdk/glib.bst
+- filename: sdk/vala-bootstrap.bst
+  type: build
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local: --enable-unversioned --disable-valadoc
diff --git a/elements/core-deps/vte.bst b/elements/sdk/vte.bst
similarity index 74%
rename from elements/core-deps/vte.bst
rename to elements/sdk/vte.bst
index 4bd8034..d1ebec3 100644
--- a/elements/core-deps/vte.bst
+++ b/elements/sdk/vte.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:vte
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/wayland.bst b/elements/sdk/wayland.bst
similarity index 100%
rename from elements/core-deps/wayland.bst
rename to elements/sdk/wayland.bst
diff --git a/elements/core-deps/woff2.bst b/elements/sdk/woff2.bst
similarity index 86%
rename from elements/core-deps/woff2.bst
rename to elements/sdk/woff2.bst
index 861f152..0182f98 100644
--- a/elements/core-deps/woff2.bst
+++ b/elements/sdk/woff2.bst
@@ -3,6 +3,6 @@ sources:
 - kind: tar
   url: github_com:google/woff2/archive/v1.0.2.tar.gz
 depends:
-- core-deps/brotli.bst
+- sdk/brotli.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/yelp-tools.bst b/elements/sdk/yelp-tools.bst
similarity index 85%
rename from elements/core-deps/yelp-tools.bst
rename to elements/sdk/yelp-tools.bst
index 195c0f6..b3aea7b 100644
--- a/elements/core-deps/yelp-tools.bst
+++ b/elements/sdk/yelp-tools.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:yelp-tools
   track: master
 depends:
-- core-deps/yelp-xsl.bst
+- sdk/yelp-xsl.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/yelp-xsl.bst b/elements/sdk/yelp-xsl.bst
similarity index 100%
rename from elements/core-deps/yelp-xsl.bst
rename to elements/sdk/yelp-xsl.bst
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
new file mode 100644
index 0000000..ad17496
--- /dev/null
+++ b/elements/sdk/yelp.bst
@@ -0,0 +1,14 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_gnome_org:yelp
+  track: master
+depends:
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-xsl.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/zenity.bst b/elements/sdk/zenity.bst
similarity index 64%
rename from elements/core-deps/zenity.bst
rename to elements/sdk/zenity.bst
index 6a3f74e..a3605a1 100644
--- a/elements/core-deps/zenity.bst
+++ b/elements/sdk/zenity.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:zenity
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/gnome-common.bst
-- core-deps/yelp-tools.bst
+- sdk/gnome-common.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index db96fc7..0c19267 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:accerciser
   track: master
 depends:
-- core-deps/at-spi2-atk.bst
-- core-deps/gtk+-3.bst
-- core-deps/pycairo.bst
 - core-deps/pyatspi2.bst
-- core-deps/pygobject.bst
-- core-deps/yelp-tools.bst
+- sdk/at-spi2-atk.bst
+- sdk/gtk+-3.bst
+- sdk/pycairo.bst
+- sdk/pygobject.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index 8b6b82f..f319805 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:bijiben
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gtk.bst
 - core-deps/evolution-data-server.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/tracker.bst
+- sdk/WebKitGTK+.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gtk.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/dconf-editor.bst b/elements/world/dconf-editor.bst
index f9574a6..ecc3a40 100644
--- a/elements/world/dconf-editor.bst
+++ b/elements/world/dconf-editor.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:dconf-editor
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/dconf.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/appstream-glib.bst
+- sdk/dconf.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/devhelp.bst b/elements/world/devhelp.bst
index 9828564..bf587df 100644
--- a/elements/world/devhelp.bst
+++ b/elements/world/devhelp.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:devhelp
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/gtk-doc.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/WebKitGTK+.bst
+- sdk/appstream-glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 96b0430..36cf695 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -4,25 +4,25 @@ sources:
   url: git_gnome_org:evolution
   track: master
 depends:
-- core-deps/WebKitGTK+.bst
-- core-deps/atk.bst
 - core-deps/evolution-data-server.bst
-- core-deps/gcr.bst
-- core-deps/gdk-pixbuf.bst
-- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
-- core-deps/glib.bst
 - core-deps/gnome-autoar.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
-- core-deps/libnotify.bst
-- core-deps/libsoup.bst
-- core-deps/yelp-tools.bst
 - core/gnome-desktop.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/WebKitGTK+.bst
+- sdk/atk.bst
+- sdk/gcr.bst
+- sdk/gdk-pixbuf.bst
+- sdk/geoclue.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
+- sdk/libnotify.bst
+- sdk/libsoup.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/world/five-or-more.bst b/elements/world/five-or-more.bst
index c48e46c..9a314da 100644
--- a/elements/world/five-or-more.bst
+++ b/elements/world/five-or-more.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/five-or-more.git
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/four-in-a-row.bst b/elements/world/four-in-a-row.bst
index 426393b..6000bd8 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:four-in-a-row
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/ghex.bst b/elements/world/ghex.bst
index 0637381..d738b63 100644
--- a/elements/world/ghex.bst
+++ b/elements/world/ghex.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:ghex
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index c8cbd92..4c77f69 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:gitg
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
-- core-deps/json-glib.bst
 - core-deps/libgee.bst
 - core-deps/libpeas.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
-- core-deps/pygobject.bst
-- core-deps/vala.bst
-- core/gsettings-desktop-schemas.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- sdk/pygobject.bst
+- sdk/vala.bst
 - world/libgit2-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/glade.bst b/elements/world/glade.bst
index 97274c2..39466e2 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:glade
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/gnome-common.bst
-- filename: core/adwaita-icon-theme.bst
+- filename: sdk/adwaita-icon-theme.bst
   type: runtime
+- sdk/gnome-common.bst
+- sdk/gtk+-3.bst
diff --git a/elements/world/gnome-builder.bst b/elements/world/gnome-builder.bst
index 37a1cb4..905d616 100644
--- a/elements/world/gnome-builder.bst
+++ b/elements/world/gnome-builder.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-builder.git
   track: master
 depends:
-- core-deps/gjs.bst
-- core-deps/glib.bst
 - core-deps/gspell.bst
-- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
 - core-deps/libdazzle.bst
 - core-deps/libpeas.bst
-- core-deps/librsvg.bst
-- core-deps/pygobject.bst
-- core-deps/vala.bst
-- core-deps/vte.bst
-- core/gvfs.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/gvfs.bst
+- sdk/librsvg.bst
+- sdk/pygobject.bst
+- sdk/vala.bst
+- sdk/vte.bst
 - world/devhelp.bst
 - world/gnome-code-assistance.bst
 - world/jsonrpc-glib.bst
diff --git a/elements/world/gnome-chess.bst b/elements/world/gnome-chess.bst
index a0268b3..be12a80 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-chess
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-code-assistance.bst b/elements/world/gnome-code-assistance.bst
index dabbc75..7156d29 100644
--- a/elements/world/gnome-code-assistance.bst
+++ b/elements/world/gnome-code-assistance.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-code-assistance
   track: master
 depends:
-- core-deps/vala.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-devel-docs.bst b/elements/world/gnome-devel-docs.bst
index 0064e07..60d45ca 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-devel-docs
   track: master
 depends:
-- core-deps/yelp-tools.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-dictionary.bst b/elements/world/gnome-dictionary.bst
index 9ef1b94..f0958fb 100644
--- a/elements/world/gnome-dictionary.bst
+++ b/elements/world/gnome-dictionary.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gnome-dictionary
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index ca688ad..eee5e12 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-klotski
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-mahjongg.bst b/elements/world/gnome-mahjongg.bst
index e7b7fc3..54eaeca 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-mahjongg
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-mines.bst b/elements/world/gnome-mines.bst
index 56f8220..11269f2 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-mines
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-multi-writer.bst b/elements/world/gnome-multi-writer.bst
index 3a8888a..c5ca60b 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-multi-writer
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgusb.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-nettool.bst b/elements/world/gnome-nettool.bst
index 9947d70..1e088d2 100644
--- a/elements/world/gnome-nettool.bst
+++ b/elements/world/gnome-nettool.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-nettool
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgtop.bst
-- core-deps/yelp-tools.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index d978de6..a2faec7 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-nibbles
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgee.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-recipes.bst b/elements/world/gnome-recipes.bst
index 9142db9..49bef2b 100644
--- a/elements/world/gnome-recipes.bst
+++ b/elements/world/gnome-recipes.bst
@@ -7,6 +7,6 @@ depends:
 - core-deps/gnome-autoar.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gspell.bst
-- core-deps/gtk+-3.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-robots.bst b/elements/world/gnome-robots.bst
index c0778eb..8a9aed7 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-robots
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-sound-recorder.bst b/elements/world/gnome-sound-recorder.bst
index e4ed8f7..68c3431 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-sound-recorder
   track: master
 depends:
-- core-deps/gdk-pixbuf.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gstreamer.bst
-- core-deps/gtk+-3.bst
+- sdk/gdk-pixbuf.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gst-plugins-base.bst
+- sdk/gst-plugins-good.bst
+- sdk/gstreamer.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-sudoku.bst b/elements/world/gnome-sudoku.bst
index fa005eb..42113ca 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-sudoku
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/json-glib.bst
 - core-deps/libgee.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/json-glib.bst
+- sdk/yelp-tools.bst
 - world/qqwing.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-taquin.bst b/elements/world/gnome-taquin.bst
index 2fd9f26..d71fcd9 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-taquin
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-tetravex.bst b/elements/world/gnome-tetravex.bst
index b4214aa..6b9a6f8 100644
--- a/elements/world/gnome-tetravex.bst
+++ b/elements/world/gnome-tetravex.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-tetravex
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-todo.bst b/elements/world/gnome-todo.bst
index 1a5fe49..222a68f 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-todo
   track: master
 depends:
-- core-deps/appstream-glib.bst
 - core-deps/evolution-data-server.bst
-- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
-- core-deps/gtk+-3.bst
 - core-deps/libpeas.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-tweaks.bst b/elements/world/gnome-tweaks.bst
index 17274d0..21a4a33 100644
--- a/elements/world/gnome-tweaks.bst
+++ b/elements/world/gnome-tweaks.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-tweaks.git
   track: master
 depends:
-- core-deps/librsvg.bst
-- core-deps/pygobject.bst
 - core/gnome-shell.bst
 - core/nautilus.bst
+- sdk/librsvg.bst
+- sdk/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/hitori.bst b/elements/world/hitori.bst
index 4e58a54..4f4b642 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:hitori
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/iagno.bst b/elements/world/iagno.bst
index c72888e..6281290 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:iagno
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/jsonrpc-glib.bst b/elements/world/jsonrpc-glib.bst
index aa854ef..2576024 100644
--- a/elements/world/jsonrpc-glib.bst
+++ b/elements/world/jsonrpc-glib.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/jsonrpc-glib.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/json-glib.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/json-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgit2-glib.bst b/elements/world/libgit2-glib.bst
index ff44f3d..6ad627f 100644
--- a/elements/world/libgit2-glib.bst
+++ b/elements/world/libgit2-glib.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgit2-glib
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - world/libgit2.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgnome-games-support.bst b/elements/world/libgnome-games-support.bst
index 2afe186..7582d76 100644
--- a/elements/world/libgnome-games-support.bst
+++ b/elements/world/libgnome-games-support.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:libgnome-games-support
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/libgee.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libmanette.bst b/elements/world/libmanette.bst
index ed15995..55b04b3 100644
--- a/elements/world/libmanette.bst
+++ b/elements/world/libmanette.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:aplazas/libmanette.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index 1b987c7..9134401 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:lightsoff
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/nautilus-sendto.bst b/elements/world/nautilus-sendto.bst
index dc3ccdd..ccc052a 100644
--- a/elements/world/nautilus-sendto.bst
+++ b/elements/world/nautilus-sendto.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:nautilus-sendto
   track: master
 depends:
-- core-deps/glib.bst
+- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/polari.bst b/elements/world/polari.bst
index 7b3c8ef..edc7657 100644
--- a/elements/world/polari.bst
+++ b/elements/world/polari.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/polari.git
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gjs.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
 - core-deps/gspell.bst
-- core-deps/gtk+-3.bst
+- sdk/appstream-glib.bst
+- sdk/gjs.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - world/telepathy-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index d8fdf40..bea7231 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:quadrapassel
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - world/libmanette.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index 88cc4d5..0dd3bf4 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:swell-foop
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/tali.bst b/elements/world/tali.bst
index eb194e6..beb0875 100644
--- a/elements/world/tali.bst
+++ b/elements/world/tali.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:tali
   track: master
 depends:
-- core-deps/appstream-glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/yelp-tools.bst
+- sdk/appstream-glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/telepathy-glib.bst b/elements/world/telepathy-glib.bst
index 8fdc253..c3f0b83 100644
--- a/elements/world/telepathy-glib.bst
+++ b/elements/world/telepathy-glib.bst
@@ -5,10 +5,10 @@ sources:
   track: master
 depends:
 - core-deps/avahi.bst
-- core-deps/dbus-glib.bst
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/vala.bst
+- sdk/dbus-glib.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/world/telepathy-logger.bst b/elements/world/telepathy-logger.bst
index 538d6fc..9146f34 100644
--- a/elements/world/telepathy-logger.bst
+++ b/elements/world/telepathy-logger.bst
@@ -4,9 +4,9 @@ sources:
   url: git_freedesktop_org:telepathy/telepathy-logger
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - world/telepathy-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/telepathy-mission-control.bst b/elements/world/telepathy-mission-control.bst
index cb4c537..04bf140 100644
--- a/elements/world/telepathy-mission-control.bst
+++ b/elements/world/telepathy-mission-control.bst
@@ -5,8 +5,8 @@ sources:
   track: telepathy-mission-control-5.16
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/glib.bst
-- core-deps/gtk-doc.bst
+- sdk/glib.bst
+- sdk/gtk-doc.bst
 - world/telepathy-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/template-glib.bst b/elements/world/template-glib.bst
index ffa8a5c..d27fb35 100644
--- a/elements/world/template-glib.bst
+++ b/elements/world/template-glib.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/template-glib.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/files/vala/disable-valadoc.patch b/files/vala/disable-valadoc.patch
new file mode 100644
index 0000000..cdef88a
--- /dev/null
+++ b/files/vala/disable-valadoc.patch
@@ -0,0 +1,66 @@
+commit 6657814f7746bdb06a9c48c2bd3b92bebb940a8a
+Author: Abderrahim Kitouni <a kitouni gmail com>
+Date:   Fri May 18 19:27:53 2018 +0100
+
+    allow disabling valadoc
+
+diff --git a/configure.ac b/configure.ac
+index fcfdd40d5..b2bfdf5bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,6 +112,10 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ 
++AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable building valadoc]), 
enable_valadoc=$enableval, enable_valadoc=yes)
++AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
++
++if test x$enable_valadoc = xyes; then
+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+ AC_MSG_CHECKING([for CGRAPH])
+ cgraph_tmp_LIBADD="$LIBADD"
+@@ -140,6 +144,8 @@ AC_RUN_IFELSE(
+ )
+ LIBADD="$cgraph_tmp_LIBADD"
+ CFLAGS="$cgraph_tmp_CFLAGS"
++fi
++
+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
+ 
+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
+index 384292f57..b9a6fa30f 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -2,6 +2,8 @@ include $(top_srcdir)/Makefile.common
+ 
+ NULL =
+ 
++if ENABLE_VALADOC
++
+ AM_CFLAGS = \
+       -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+@@ -239,3 +241,4 @@ MAINTAINERCLEANFILES = \
+       $(libvaladoc_la_VALASOURCES:.vala=.c) \
+       $(NULL)
+ 
++endif
+diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
+index 33f3a9375..d6ffb3fd4 100644
+--- a/valadoc/Makefile.am
++++ b/valadoc/Makefile.am
+@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.common
+ 
+ NULL =
+ 
++if ENABLE_VALADOC
+ SUBDIRS = \
+       doclets \
+       icons \
+@@ -80,3 +81,5 @@ endif
+ MAINTAINERCLEANFILES = \
+       $(valadoc_VALASOURCES:.vala=.c) \
+       $(NULL)
++
++endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]