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



commit 0dd1f3f68ecebe7cc9b330a824c81cc7451bdc75
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
    
    - remove dependencies on systemd/udev
    - add patch to allow disabling graphviz dependency of vala

 elements/core-deps.bst                             |  48 -----
 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                       |  10 +-
 elements/core-deps/gsound.bst                      |   8 +-
 elements/core-deps/gspell.bst                      |   6 +-
 elements/core-deps/gssdp.bst                       |   6 +-
 elements/core-deps/gtk+.bst                        |  20 +-
 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                      |   4 +-
 elements/core-deps/poppler.bst                     |   4 +-
 elements/core-deps/pyatspi2.bst                    |   4 +-
 elements/core-deps/samba.bst                       |   2 +-
 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.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                           |  11 +-
 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                  |  12 +-
 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                           |  18 +-
 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                          |  52 +++++
 elements/sdk.bst                                   |   7 +
 elements/{core-deps => sdk}/WebKitGTK+.bst         |  34 ++--
 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            |  14 +-
 elements/{core-deps => sdk}/cogl.bst               |  12 +-
 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}/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             |  22 +--
 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}/mozjs60.bst            |   0
 elements/{core-deps => sdk}/pango.bst              |  14 +-
 elements/{core-deps => sdk}/pycairo.bst            |   0
 elements/{core-deps => sdk}/pygobject.bst          |   6 +-
 elements/{core-deps => sdk}/vala-tarball.bst       |   0
 elements/sdk/vala.bst                              |  15 ++
 elements/{core-deps => sdk}/vte.bst                |   6 +-
 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                      |  12 +-
 elements/world/amtk.bst                            |   6 +-
 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                           |   8 +-
 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                |   4 +-
 elements/world/gnome-dictionary.bst                |   6 +-
 elements/world/gnome-games.bst                     |  20 +-
 elements/world/gnome-internet-radio-locator.bst    |  22 +--
 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                    |   8 +-
 elements/world/libgit2-glib.bst                    |   8 +-
 elements/world/libgnome-games-support.bst          |   6 +-
 elements/world/libmanette.bst                      |   6 +-
 elements/world/lightsoff.bst                       |  14 +-
 elements/world/nautilus-sendto.bst                 |   2 +-
 elements/world/polari.bst                          |  10 +-
 elements/world/quadrapassel.bst                    |  14 +-
 elements/world/retro-gtk.bst                       |   8 +-
 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                   |   6 +-
 ...c-Allow-disabling-the-graphviz-dependency.patch | 214 +++++++++++++++++++++
 248 files changed, 1248 insertions(+), 1038 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 6088a59..103c4e5 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,22 +17,13 @@ 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
@@ -45,24 +31,16 @@ depends:
 - core-deps/folks.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
@@ -72,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
@@ -92,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
@@ -135,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 +124,6 @@ depends:
 - core-deps/mm-common.bst
 - core-deps/mobile-broadband-provider-info.bst
 - core-deps/mozjs52.bst
-- core-deps/mozjs60.bst
 - core-deps/mpc.bst
 - core-deps/mpfr.bst
 - core-deps/mtdev.bst
@@ -170,7 +131,6 @@ depends:
 - core-deps/openjpeg.bst
 - core-deps/openldap.bst
 - core-deps/osinfo-db-tools.bst
-- core-deps/pango.bst
 - core-deps/pangomm-1.4.bst
 - core-deps/pangomm.bst
 - core-deps/parted.bst
@@ -184,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
@@ -200,12 +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/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 d9e660d..c91d7ae 100644
--- a/elements/core-deps/ModemManager.bst
+++ b/elements/core-deps/ModemManager.bst
@@ -4,11 +4,11 @@ sources:
 - kind: tar
   url: https://www.freedesktop.org/software/ModemManager/ModemManager-1.8.0.tar.xz
 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 200e10e..c03d824 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 746fa7f..44b16ea 100644
--- a/elements/core-deps/atkmm.bst
+++ b/elements/core-deps/atkmm.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 89f8e1a..b5b52a4 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/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 21d2f21..293089b 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 62b5b3c..7b53d2d 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 17449ce..504685c 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2bb8996..4d33fe4 100644
--- a/elements/core-deps/glibmm-2.4.bst
+++ b/elements/core-deps/glibmm-2.4.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 e9dc338..a948432 100644
--- a/elements/core-deps/glibmm.bst
+++ b/elements/core-deps/glibmm.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 ff872c1..9fccf42 100644
--- a/elements/core-deps/gmime3.bst
+++ b/elements/core-deps/gmime3.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 458c726..f50dc9c 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 8f916f5..f239ad1 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 714d9c3..d0a8ebc 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 fd916ec..30efbf2 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 9646d31..9bf32d3 100644
--- a/elements/core-deps/gom.bst
+++ b/elements/core-deps/gom.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 89d0799..3276d9e 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 e1a7c4f..ac441e7 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/grilo
   track: master
 depends:
-- core-deps/glib.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/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 7216da1..497ada9 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 5067d99..47dc016 100644
--- a/elements/core-deps/gspell.bst
+++ b/elements/core-deps/gspell.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 5664ff0..aad9cf1 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 0e5e272..3deccc2 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/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
+- 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
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 800891d..f3fbcfe 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 9a815a7..6e9656e 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 c20a89e..608e63e 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 91f1246..c794ebf 100644
--- a/elements/core-deps/gtksourceview-3.bst
+++ b/elements/core-deps/gtksourceview-3.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 32b3c7a..7b2fabc 100644
--- a/elements/core-deps/gtksourceview.bst
+++ b/elements/core-deps/gtksourceview.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 d442497..396584c 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 d06db7c..75d1af1 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 8979c84..f3a47ed 100644
--- a/elements/core-deps/gupnp-igd.bst
+++ b/elements/core-deps/gupnp-igd.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 23ba3d4..ac0067d 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 5f0b179..ad4391b 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 1d11415..9ec5e46 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/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 27b5426..bf25f2d 100644
--- a/elements/core-deps/libgee.bst
+++ b/elements/core-deps/libgee.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 b69ec7c..d8421ea 100644
--- a/elements/core-deps/libgepub.bst
+++ b/elements/core-deps/libgepub.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 918b400..d272908 100644
--- a/elements/core-deps/libgfbgraph.bst
+++ b/elements/core-deps/libgfbgraph.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 8f4ef05..9d7bd87 100644
--- a/elements/core-deps/libgnomekbd.bst
+++ b/elements/core-deps/libgnomekbd.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 3c57e81..6bec6a2 100644
--- a/elements/core-deps/libgovirt.bst
+++ b/elements/core-deps/libgovirt.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 1e5c0ec..7228c27 100644
--- a/elements/core-deps/libgrss.bst
+++ b/elements/core-deps/libgrss.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 f5589d5..37a301d 100644
--- a/elements/core-deps/libgsf.bst
+++ b/elements/core-deps/libgsf.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 16ba6cc..3bd9b09 100644
--- a/elements/core-deps/libgtop.bst
+++ b/elements/core-deps/libgtop.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 4ccfe53..f9e2935 100644
--- a/elements/core-deps/libgudev.bst
+++ b/elements/core-deps/libgudev.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 a4bb4b4..8da9594 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 08f1764..f173317 100644
--- a/elements/core-deps/libgxps.bst
+++ b/elements/core-deps/libgxps.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 7a15b07..264f04d 100644
--- a/elements/core-deps/libmediaart.bst
+++ b/elements/core-deps/libmediaart.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 0e6b76c..df18c0c 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2ba7717..b98c648 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 b556c2d..327ca94 100644
--- a/elements/core-deps/libzapojit.bst
+++ b/elements/core-deps/libzapojit.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 852f30d..0af5616 100644
--- a/elements/core-deps/pangomm-1.4.bst
+++ b/elements/core-deps/pangomm-1.4.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 d2f790a..a723881 100644
--- a/elements/core-deps/pangomm.bst
+++ b/elements/core-deps/pangomm.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 c8aea8d..fc625f0 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 3373c39..d9f6902 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -7,9 +7,9 @@ sources:
   path: files/polkit/sysusers.conf
   directory: data
 depends:
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
 - core-deps/mozjs52.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.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 80811c1..0378d73 100644
--- a/elements/core-deps/pyatspi2.bst
+++ b/elements/core-deps/pyatspi2.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 b03ff1c..624142a 100644
--- a/elements/core-deps/samba.bst
+++ b/elements/core-deps/samba.bst
@@ -5,8 +5,8 @@ sources:
 - kind: patch
   path: files/samba/fix-root-build.patch
 depends:
-- core-deps/openldap.bst
 - core-deps/libtirpc.bst
+- core-deps/openldap.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 046926c..c075d06 100644
--- a/elements/core-deps/totem-pl-parser.bst
+++ b/elements/core-deps/totem-pl-parser.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 408a006..c764f7e 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 239c813..799afa6 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 4330d08..429367a 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 e7d4b1f..24ca9df 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -4,21 +4,21 @@ sources:
   url: gitlab_gnome_org:GNOME/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 6188622..c2f0817 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 6b05108..4865f7f 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -4,19 +4,19 @@ sources:
   url: gitlab_gnome_org:GNOME/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 7b6a0bc..8ea9e77 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -4,16 +4,15 @@ sources:
   url: gitlab_gnome_org:GNOME/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/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 0550ff9..5e65f9e 100644
--- a/elements/core/file-roller.bst
+++ b/elements/core/file-roller.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 b35dc72..02cce27 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 5e27897..9521233 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 aa319dc..4fad102 100644
--- a/elements/core/gnome-backgrounds.bst
+++ b/elements/core/gnome-backgrounds.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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 0eeb803..5fd402e 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -4,10 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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: vm/linux-vm-boot/systemd.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 57ad39a..002ada8 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -4,21 +4,21 @@ sources:
   url: gitlab_gnome_org:GNOME/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 865b940..633e990 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -4,14 +4,14 @@ sources:
   url: gitlab_gnome_org:GNOME/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 fb20b3a..27cbbe9 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/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 a14194d..9083dfb 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 83026fa..a095a6d 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -4,14 +4,14 @@ sources:
   url: gitlab_gnome_org:GNOME/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 c0ee00c..1c3f5c7 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -4,15 +4,15 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2529b1c..3ad2211 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 e1be93a..9328543 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 b42b022..c74fb4f 100644
--- a/elements/core/gnome-desktop.bst
+++ b/elements/core/gnome-desktop.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 1c4348e..ad35bde 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -4,15 +4,15 @@ sources:
   url: gitlab_gnome_org:GNOME/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 4e5f3e4..37fe759 100644
--- a/elements/core/gnome-documents.bst
+++ b/elements/core/gnome-documents.bst
@@ -4,21 +4,21 @@ sources:
   url: gitlab_gnome_org:GNOME/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 bff1257..ba42803 100644
--- a/elements/core/gnome-font-viewer.bst
+++ b/elements/core/gnome-font-viewer.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 d171113..41f21bf 100644
--- a/elements/core/gnome-getting-started-docs.bst
+++ b/elements/core/gnome-getting-started-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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 e11a781..812efc6 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 54442bf..3001f38 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 cea1bca..833c966 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 dd13ac7..b4226fe 100644
--- a/elements/core/gnome-menus.bst
+++ b/elements/core/gnome-menus.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 a6dd299..cb770b0 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -4,16 +4,16 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2ff7fd7..45a636d 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 33ff82c..4419d4b 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 051f29c..ebd2a7b 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 21f8308..7619043 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -11,20 +11,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 97ff168..5cb835b 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 f2294d6..a806a96 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 69dc430..a81b67b 100644
--- a/elements/core/gnome-system-monitor.bst
+++ b/elements/core/gnome-system-monitor.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 9538017..9507892 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/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 236a70f..b14f043 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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 1949d57..ae0ec4f 100644
--- a/elements/core/gnome-user-share.bst
+++ b/elements/core/gnome-user-share.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 fe5fcf1..1c92f0e 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -4,15 +4,15 @@ sources:
   url: gitlab_gnome_org:GNOME/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 7a60346..7776bc0 100644
--- a/elements/core/mousetweaks.bst
+++ b/elements/core/mousetweaks.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 3fb2759..8813691 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -4,19 +4,19 @@ sources:
   url: gitlab_gnome_org:GNOME/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/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/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 9722335..82b5354 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 95038cd..c2908bc 100644
--- a/elements/core/network-manager-applet.bst
+++ b/elements/core/network-manager-applet.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/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 1cf161d..1cda268 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 fbbb61d..8e3d14d 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 875afe1..09d75ab 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 d3ed77f..9bf4a37 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2fbf036..1d26d96 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -4,25 +4,25 @@ sources:
   url: gitlab_gnome_org:GNOME/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 093270d..bb75e53 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..946b4a5
--- /dev/null
+++ b/elements/sdk-platform.bst
@@ -0,0 +1,52 @@
+kind: stack
+depends:
+- sdk/WebKitGTK+.bst
+- sdk/adwaita-icon-theme.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/gcab.bst
+- sdk/gcr.bst
+- sdk/gdk-pixbuf.bst
+- sdk/geoclue.bst
+- sdk/gjs.bst
+- sdk/glib-networking.bst
+- sdk/glib.bst
+- sdk/gnome-themes-extra.bst
+- sdk/gobject-introspection.bst
+- sdk/gsettings-desktop-schemas.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/gvfs.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/mozjs60.bst
+- sdk/pango.bst
+- sdk/pycairo.bst
+- sdk/pygobject.bst
+- sdk/vte.bst
+- sdk/woff2.bst
+- sdk/yelp-xsl.bst
+- sdk/yelp.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/core-deps/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
similarity index 50%
rename from elements/core-deps/WebKitGTK+.bst
rename to elements/sdk/WebKitGTK+.bst
index 4d626fb..5073f16 100644
--- a/elements/core-deps/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -3,25 +3,25 @@ sources:
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.21.92.tar.xz
 depends:
-- core-deps/at-spi2-core.bst
-- core-deps/brotli.bst
-- core-deps/enchant-2.bst
-- core-deps/geoclue.bst
-- core-deps/gobject-introspection.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/gtk+-3.bst
-- core-deps/libnotify.bst
-- core-deps/libsecret.bst
-- core-deps/libsoup.bst
-- core-deps/pango.bst
-- core-deps/woff2.bst
-- filename: desktop/wayland.bst
-  junction: freedesktop-sdk.bst
+- 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/woff2.bst
 - filename: desktop/hyphen.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/wayland.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-xt.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/adwaita-icon-theme.bst b/elements/sdk/adwaita-icon-theme.bst
similarity index 68%
rename from elements/core/adwaita-icon-theme.bst
rename to elements/sdk/adwaita-icon-theme.bst
index 327a20c..8cf47ff 100644
--- a/elements/core/adwaita-icon-theme.bst
+++ b/elements/sdk/adwaita-icon-theme.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 68%
rename from elements/core-deps/at-spi2-atk.bst
rename to elements/sdk/at-spi2-atk.bst
index c870f3a..8de0cc0 100644
--- a/elements/core-deps/at-spi2-atk.bst
+++ b/elements/sdk/at-spi2-atk.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 78%
rename from elements/core-deps/at-spi2-core.bst
rename to elements/sdk/at-spi2-core.bst
index ff280fc..bb10365 100644
--- a/elements/core-deps/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 63%
rename from elements/core-deps/atk.bst
rename to elements/sdk/atk.bst
index ae3f20d..0516f19 100644
--- a/elements/core-deps/atk.bst
+++ b/elements/sdk/atk.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 53%
rename from elements/core-deps/clutter-gst.bst
rename to elements/sdk/clutter-gst.bst
index d8c60cf..7b21ffc 100644
--- a/elements/core-deps/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 76%
rename from elements/core-deps/clutter-gtk.bst
rename to elements/sdk/clutter-gtk.bst
index b5f13ab..41c007d 100644
--- a/elements/core-deps/clutter-gtk.bst
+++ b/elements/sdk/clutter-gtk.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 65%
rename from elements/core-deps/clutter.bst
rename to elements/sdk/clutter.bst
index fd53e74..95c1181 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/sdk/clutter.bst
@@ -4,14 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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
+- sdk/atk.bst
+- sdk/cogl.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/json-glib.bst
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/cogl.bst b/elements/sdk/cogl.bst
similarity index 71%
rename from elements/core-deps/cogl.bst
rename to elements/sdk/cogl.bst
index 55662d7..47fa8e3 100644
--- a/elements/core-deps/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gst-plugins-base.bst
+- sdk/gstreamer.bst
+- sdk/gtk-doc.bst
+- sdk/pango.bst
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
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 86%
rename from elements/core-deps/dconf.bst
rename to elements/sdk/dconf.bst
index 4815f9b..d2ab14a 100644
--- a/elements/core-deps/dconf.bst
+++ b/elements/sdk/dconf.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/dconf
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/vala.bst
 - filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
   type: build
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/gcab.bst b/elements/sdk/gcab.bst
similarity index 64%
rename from elements/core-deps/gcab.bst
rename to elements/sdk/gcab.bst
index 257d184..befabff 100644
--- a/elements/core-deps/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 61%
rename from elements/core-deps/gcr.bst
rename to elements/sdk/gcr.bst
index 6dcfbe9..9c970ba 100644
--- a/elements/core-deps/gcr.bst
+++ b/elements/sdk/gcr.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 82%
rename from elements/core-deps/gdk-pixbuf.bst
rename to elements/sdk/gdk-pixbuf.bst
index 312cdfb..af3bc32 100644
--- a/elements/core-deps/gdk-pixbuf.bst
+++ b/elements/sdk/gdk-pixbuf.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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: desktop/xorg-lib-x11.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 1244d50..8a14d28 100644
--- a/elements/core-deps/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/gjs
   track: master
 depends:
-- core-deps/gobject-introspection.bst
-- core-deps/mozjs60.bst
+- sdk/gobject-introspection.bst
+- sdk/mozjs60.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 82%
rename from elements/core/glib-networking.bst
rename to elements/sdk/glib-networking.bst
index 0317f6a..b10e659 100644
--- a/elements/core/glib-networking.bst
+++ b/elements/sdk/glib-networking.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 97198de..2f3efe0 100644
--- a/elements/core-deps/glib.bst
+++ b/elements/sdk/glib.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 91%
rename from elements/core-deps/gobject-introspection.bst
rename to elements/sdk/gobject-introspection.bst
index fb3c7d9..c6a7f97 100644
--- a/elements/core-deps/gobject-introspection.bst
+++ b/elements/sdk/gobject-introspection.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 71%
rename from elements/core/gsettings-desktop-schemas.bst
rename to elements/sdk/gsettings-desktop-schemas.bst
index 8fea0f0..fa372c2 100644
--- a/elements/core/gsettings-desktop-schemas.bst
+++ b/elements/sdk/gsettings-desktop-schemas.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 69%
rename from elements/core-deps/gst-plugins-base.bst
rename to elements/sdk/gst-plugins-base.bst
index 4152b54..c24aed1 100644
--- a/elements/core-deps/gst-plugins-base.bst
+++ b/elements/sdk/gst-plugins-base.bst
@@ -4,8 +4,7 @@ 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
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 72%
rename from elements/core-deps/gstreamer.bst
rename to elements/sdk/gstreamer.bst
index 122f5e3..05b32fd 100644
--- a/elements/core-deps/gstreamer.bst
+++ b/elements/sdk/gstreamer.bst
@@ -4,7 +4,7 @@ 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
diff --git a/elements/core-deps/gtk+-3.bst b/elements/sdk/gtk+-3.bst
similarity index 86%
rename from elements/core-deps/gtk+-3.bst
rename to elements/sdk/gtk+-3.bst
index c1b80bc..3eec340 100644
--- a/elements/core-deps/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/gtk
   track: gtk-3-24
 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
+- 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
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/cairo.bst
@@ -21,14 +21,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 85%
rename from elements/core-deps/gtk-doc.bst
rename to elements/sdk/gtk-doc.bst
index fc2603d..3fa4bc2 100644
--- a/elements/core-deps/gtk-doc.bst
+++ b/elements/sdk/gtk-doc.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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..370805f
--- /dev/null
+++ b/elements/sdk/gvfs.bst
@@ -0,0 +1,17 @@
+kind: meson
+sources:
+- kind: git
+  url: gitlab_gnome_org:GNOME/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 01980a5..a85db8e 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/libpulse.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 77%
rename from elements/core-deps/libcroco.bst
rename to elements/sdk/libcroco.bst
index 6dbe934..bf624cf 100644
--- a/elements/core-deps/libcroco.bst
+++ b/elements/sdk/libcroco.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/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 58%
rename from elements/core-deps/libnotify.bst
rename to elements/sdk/libnotify.bst
index 7df45dc..e77cf0d 100644
--- a/elements/core-deps/libnotify.bst
+++ b/elements/sdk/libnotify.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 98%
rename from elements/core-deps/librsvg.bst
rename to elements/sdk/librsvg.bst
index efefe32..a2ea173 100644
--- a/elements/core-deps/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -250,13 +250,13 @@ sources:
   url: https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate
 # end generated
 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: rust/cargo.bst
   junction: freedesktop-sdk.bst
 - filename: rust/rust.bst
diff --git a/elements/core-deps/libsecret.bst b/elements/sdk/libsecret.bst
similarity index 65%
rename from elements/core-deps/libsecret.bst
rename to elements/sdk/libsecret.bst
index 472ee8a..7d59924 100644
--- a/elements/core-deps/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 65%
rename from elements/core-deps/libsoup.bst
rename to elements/sdk/libsoup.bst
index 2abc3f2..48a3f62 100644
--- a/elements/core-deps/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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/mozjs60.bst b/elements/sdk/mozjs60.bst
similarity index 100%
rename from elements/core-deps/mozjs60.bst
rename to elements/sdk/mozjs60.bst
diff --git a/elements/core-deps/pango.bst b/elements/sdk/pango.bst
similarity index 82%
rename from elements/core-deps/pango.bst
rename to elements/sdk/pango.bst
index f4a0322..a03037c 100644
--- a/elements/core-deps/pango.bst
+++ b/elements/sdk/pango.bst
@@ -4,16 +4,16 @@ sources:
   url: gitlab_gnome_org:GNOME/pango
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/gtk-doc.bst
-- filename: desktop/fribidi.bst
-  junction: freedesktop-sdk.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/fribidi.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/core-deps/vala-tarball.bst b/elements/sdk/vala-tarball.bst
similarity index 100%
rename from elements/core-deps/vala-tarball.bst
rename to elements/sdk/vala-tarball.bst
diff --git a/elements/sdk/vala.bst b/elements/sdk/vala.bst
new file mode 100644
index 0000000..3616509
--- /dev/null
+++ b/elements/sdk/vala.bst
@@ -0,0 +1,15 @@
+kind: autotools
+sources:
+- kind: git
+  url: gitlab_gnome_org:GNOME/vala
+  track: master
+- kind: patch
+  path: files/vala/libvaladoc-Allow-disabling-the-graphviz-dependency.patch
+depends:
+- sdk/glib.bst
+- filename: sdk/vala-tarball.bst
+  type: build
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local: --enable-unversioned --disable-graphviz
diff --git a/elements/core-deps/vte.bst b/elements/sdk/vte.bst
similarity index 75%
rename from elements/core-deps/vte.bst
rename to elements/sdk/vte.bst
index d7d4418..35e0899 100644
--- a/elements/core-deps/vte.bst
+++ b/elements/sdk/vte.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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/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 86%
rename from elements/core-deps/yelp-tools.bst
rename to elements/sdk/yelp-tools.bst
index afe0753..8b162a9 100644
--- a/elements/core-deps/yelp-tools.bst
+++ b/elements/sdk/yelp-tools.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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..765968a
--- /dev/null
+++ b/elements/sdk/yelp.bst
@@ -0,0 +1,14 @@
+kind: autotools
+sources:
+- kind: git
+  url: gitlab_gnome_org:GNOME/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 65%
rename from elements/core-deps/zenity.bst
rename to elements/sdk/zenity.bst
index 936250d..d8813c5 100644
--- a/elements/core-deps/zenity.bst
+++ b/elements/sdk/zenity.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 fca0e2f..19de809 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/accerciser
   track: master
 depends:
-- core-deps/at-spi2-atk.bst
-- core-deps/gnome-common.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/gnome-common.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/amtk.bst b/elements/world/amtk.bst
index 1c8008b..cb1865c 100644
--- a/elements/world/amtk.bst
+++ b/elements/world/amtk.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/amtk.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/gobject-introspection.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index 439c0ea..9fb42f1 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 709d1f3..5c0690c 100644
--- a/elements/world/dconf-editor.bst
+++ b/elements/world/dconf-editor.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 20e039d..a858a53 100644
--- a/elements/world/devhelp.bst
+++ b/elements/world/devhelp.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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
 - world/amtk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 9b6418c..fa53fa4 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -4,25 +4,25 @@ sources:
   url: gitlab_gnome_org:GNOME/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 bdb7f53..ce0f6c6 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 068c84f..53b101b 100644
--- a/elements/world/ghex.bst
+++ b/elements/world/ghex.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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 8e851d0..7decc9f 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/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 e255464..16d4e68 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/glade
   track: master
 depends:
-- core-deps/gtk+-3.bst
-- core-deps/gnome-common.bst
-- filename: core/adwaita-icon-theme.bst
-  type: runtime
 - filename: core-deps/cantarell-fonts.bst
   type: runtime
+- 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 220f093..a1ef379 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.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 ecd2fc5..0029291 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 923e27e..a86922f 100644
--- a/elements/world/gnome-code-assistance.bst
+++ b/elements/world/gnome-code-assistance.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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 2267729..e283957 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-devel-docs
   track: master
 depends:
-- core-deps/gnome-common.bst
-- core-deps/yelp-tools.bst
+- sdk/gnome-common.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 2e816d1..74c0fa7 100644
--- a/elements/world/gnome-dictionary.bst
+++ b/elements/world/gnome-dictionary.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/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-games.bst b/elements/world/gnome-games.bst
index e566031..d7730c4 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-games.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/grilo.bst
 - core-deps/grilo-plugins.bst
-- core-deps/gtk+-3.bst
-- core-deps/librsvg.bst
-- core-deps/libsoup.bst
-- core-deps/tracker.bst
+- core-deps/grilo.bst
 - core-deps/tracker-miners.bst
-- core-deps/vala.bst
-- core/adwaita-icon-theme.bst
-- core/gnome-themes-extra.bst
-- core/gvfs.bst
+- core-deps/tracker.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/gnome-themes-extra.bst
+- sdk/gvfs.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/librsvg.bst
+- sdk/libsoup.bst
+- sdk/vala.bst
 - world/libmanette.bst
 - world/retro-gtk.bst
 - filename: desktop/hicolor-icon-theme.bst
diff --git a/elements/world/gnome-internet-radio-locator.bst b/elements/world/gnome-internet-radio-locator.bst
index 394a61b..83c75ac 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-internet-radio-locator.git
   track: master
 depends:
-- core/gnome-maps.bst
-- core-deps/cantarell-fonts.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
 - core-deps/geocode-glib.bst
 - core-deps/libchamplain.bst
-- core-deps/gstreamer.bst
-- core-deps/gst-plugins-base.bst
-- core-deps/gst-plugins-good.bst
-- core-deps/gst-plugins-bad.bst
-- core-deps/pango.bst
+- core/gnome-maps.bst
+- sdk/cantarell-fonts.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.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/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index b7e385b..d6cc179 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 ef595f2..7eea30d 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 049307d..025b78b 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 0f18912..8a15d33 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 c0c5018..b7f0c5b 100644
--- a/elements/world/gnome-nettool.bst
+++ b/elements/world/gnome-nettool.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 85f02c8..a8bf2a4 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -4,14 +4,14 @@ sources:
   url: gitlab_gnome_org:GNOME/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 416177a..679dc70 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 3ec5723..e2ed55d 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 9601b6e..7d92001 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 4b2450f..d668b5d 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 189ae65..b2789b6 100644
--- a/elements/world/gnome-tetravex.bst
+++ b/elements/world/gnome-tetravex.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 10c743d..327d23b 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 d148c1d..ccf523e 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 e8bd594..1cae3ab 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/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 4b82fb1..777ec99 100644
--- a/elements/world/jsonrpc-glib.bst
+++ b/elements/world/jsonrpc-glib.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/jsonrpc-glib.git
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/vala.bst
-- core-deps/json-glib.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/json-glib.bst
+- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgit2-glib.bst b/elements/world/libgit2-glib.bst
index 686fdd8..5db8881 100644
--- a/elements/world/libgit2-glib.bst
+++ b/elements/world/libgit2-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/libgit2-glib
   track: master
 depends:
-- core-deps/glib.bst
-- core-deps/gobject-introspection.bst
-- core-deps/pygobject.bst
-- core-deps/vala.bst
+- sdk/glib.bst
+- sdk/gobject-introspection.bst
+- sdk/pygobject.bst
+- sdk/vala.bst
 - world/libgit2.bst
 - world/libssh2.bst
 - filename: base.bst
diff --git a/elements/world/libgnome-games-support.bst b/elements/world/libgnome-games-support.bst
index 495eac6..21324e2 100644
--- a/elements/world/libgnome-games-support.bst
+++ b/elements/world/libgnome-games-support.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 f5e1d8c..51b4286 100644
--- a/elements/world/libmanette.bst
+++ b/elements/world/libmanette.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:aplazas/libmanette.git
   track: master
 depends:
-- core-deps/glib.bst
 - core-deps/libevdev.bst
 - core-deps/libgudev.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/world/lightsoff.bst b/elements/world/lightsoff.bst
index dc0c111..48f35fd 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/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 7b19138..7e6efe5 100644
--- a/elements/world/nautilus-sendto.bst
+++ b/elements/world/nautilus-sendto.bst
@@ -4,6 +4,6 @@ sources:
   url: gitlab_gnome_org:GNOME/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 62edbc4..33d6c1c 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/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/retro-gtk.bst b/elements/world/retro-gtk.bst
index 02e2206..86228b7 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/retro-gtk.git
   track: master
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/glib.bst
-- core-deps/gtk+-3.bst
-- core-deps/vala.bst
+- sdk/clutter-gtk.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/vala.bst
 - filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index a7f92bb..a28171e 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/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 aaf5d06..f165dd4 100644
--- a/elements/world/tali.bst
+++ b/elements/world/tali.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/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 8a5ff8b..8b5f2ff 100644
--- a/elements/world/template-glib.bst
+++ b/elements/world/template-glib.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/template-glib.git
   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/files/vala/libvaladoc-Allow-disabling-the-graphviz-dependency.patch 
b/files/vala/libvaladoc-Allow-disabling-the-graphviz-dependency.patch
new file mode 100644
index 0000000..177dbdc
--- /dev/null
+++ b/files/vala/libvaladoc-Allow-disabling-the-graphviz-dependency.patch
@@ -0,0 +1,214 @@
+From c4885385c5fa0372920d0afbbaa85842f2b14460 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz ubuntu com>
+Date: Wed, 6 Sep 2017 18:52:55 +0200
+Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
+ valadoc
+
+https://bugzilla.gnome.org/show_bug.cgi?id=787375
+---
+ configure.ac                          | 60 +++++++++++++++++++----------------
+ libvaladoc/Makefile.am                | 24 ++++++++++----
+ libvaladoc/html/basicdoclet.vala      |  8 +++++
+ libvaladoc/html/htmlmarkupwriter.vala |  5 ++-
+ 4 files changed, 62 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 24b3bcd79..bc7235fdf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+-AC_MSG_CHECKING([for CGRAPH])
+-cgraph_tmp_LIBADD="$LIBADD"
+-cgraph_tmp_CFLAGS="$CFLAGS"
+-LIBADD="$LIBADD $LIBGVC_LIBS"
+-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
+-AC_RUN_IFELSE(
+-      [AC_LANG_SOURCE([
+-              #include <gvc.h>
+-
+-              int main(void) {
+-                      #ifdef WITH_CGRAPH
+-                              return 0;
+-                      #else
+-                              return -1;
+-                      #endif
+-              }
+-      ])], [
+-              AC_MSG_RESULT([yes])
+-              VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
+-              have_cgraph=yes
+-      ], [
+-              AC_MSG_RESULT([no])
+-              have_cgraph=no
+-      ]
+-)
+-LIBADD="$cgraph_tmp_LIBADD"
+-CFLAGS="$cgraph_tmp_CFLAGS"
++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), 
enable_graphviz=$enableval, enable_graphviz=yes)
++if test x$enable_graphviz = xyes; then
++      PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
++      AC_MSG_CHECKING([for CGRAPH])
++      VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
++      cgraph_tmp_LIBADD="$LIBADD"
++      cgraph_tmp_CFLAGS="$CFLAGS"
++      LIBADD="$LIBADD $LIBGVC_LIBS"
++      CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
++      AC_RUN_IFELSE(
++              [AC_LANG_SOURCE([
++                      #include <gvc.h>
++                      int main(void) {
++                              #ifdef WITH_CGRAPH
++                                      return 0;
++                              #else
++                                      return -1;
++                              #endif
++                      }
++              ])], [
++                      AC_MSG_RESULT([yes])
++                      VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
++                      have_cgraph=yes
++              ], [
++                      AC_MSG_RESULT([no])
++                      have_cgraph=no
++              ]
++      )
++      LIBADD="$cgraph_tmp_LIBADD"
++      CFLAGS="$cgraph_tmp_CFLAGS"
++fi
++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
+ 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..a59e728ca 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -126,10 +126,6 @@ libvaladoc_la_VALASOURCES = \
+       content/tablerow.vala \
+       content/taglet.vala \
+       content/text.vala \
+-      charts/chart.vala \
+-      charts/chartfactory.vala \
+-      charts/hierarchychart.vala \
+-      charts/simplechartfactory.vala \
+       parser/manyrule.vala \
+       parser/oneofrule.vala \
+       parser/optionalrule.vala \
+@@ -156,18 +152,34 @@ libvaladoc_la_VALASOURCES = \
+       highlighter/codetoken.vala \
+       highlighter/highlighter.vala \
+       html/basicdoclet.vala \
+-      html/htmlchartfactory.vala \
+       html/linkhelper.vala \
+       html/cssclassresolver.vala \
+       html/htmlmarkupwriter.vala \
+       html/htmlrenderer.vala \
+       $(NULL)
+ 
++if ENABLE_GRAPHVIZ
++libvaladoc_la_VALASOURCES += \
++      charts/chart.vala \
++      charts/chartfactory.vala \
++      charts/hierarchychart.vala \
++      charts/simplechartfactory.vala \
++      html/htmlchartfactory.vala \
++      $(NULL)
++
++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
++endif
++
+ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
+       libvaladoc.vala.stamp \
+       $(libvaladoc_la_VALASOURCES:.vala=.c) \
++      $(NULL)
++
++if ENABLE_GRAPHVIZ
++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \
+       gvc-compat.c \
+       $(NULL)
++endif
+ 
+ valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp
+ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+@@ -182,9 +194,9 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+               --library valadoc \
+               --vapi valadoc@PACKAGE_SUFFIX@.vapi \
+               --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
+-              --vapidir $(top_srcdir)/vapi --pkg libgvc \
+               --vapidir $(top_srcdir)/gee --pkg gee \
+               --vapidir $(top_srcdir)/vala --pkg vala \
++              $(LIBGVC_PKG) \
+               --pkg config \
+               $(filter %.vala %.c,$^)
+       touch $@
+diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
+index cc9ea4ed7..432c3818f 100644
+--- a/libvaladoc/html/basicdoclet.vala
++++ b/libvaladoc/html/basicdoclet.vala
+@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+       protected HtmlRenderer _renderer;
+       protected Html.MarkupWriter writer;
+       protected Html.CssClassResolver cssresolver;
++#if HAVE_GRAPHVIZ
+       protected Charts.Factory image_factory;
++#else
++      protected void* image_factory;
++#endif
+       protected ErrorReporter reporter;
+       protected string package_list_link = "../index.html";
+ 
+@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+               this.linker = new LinkHelper ();
+ 
+               _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
++#if HAVE_GRAPHVIZ
+               this.image_factory = new SimpleChartFactory (settings, linker);
++#endif
+       }
+ 
+ 
+@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+       }
+ 
+       protected void write_image_block (Api.Node element) {
++#if HAVE_GRAPHVIZ
+               if (element is Class || element is Interface || element is Struct) {
+                       unowned string format = (settings.use_svg_images ? "svg" : "png");
+                       var chart = new Charts.Hierarchy (image_factory, element);
+@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+                                                                          this.get_img_path_html (element, 
format)});
+                       writer.add_usemap (chart);
+               }
++#endif
+       }
+ 
+       public void write_namespace_content (Namespace node, Api.Node? parent) {
+diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
+index 3a3be3de0..0969b7289 100644
+--- a/libvaladoc/html/htmlmarkupwriter.vala
++++ b/libvaladoc/html/htmlmarkupwriter.vala
+@@ -43,13 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
+               }, xml_declaration);
+       }
+ 
++#if HAVE_GRAPHVIZ
+       public unowned MarkupWriter add_usemap (Charts.Chart chart) {
+               string? buf = (string?) chart.write_buffer ("cmapx");
+               if (buf != null) {
+                       raw_text ("\n");
+                       raw_text ((!) buf);
+               }
+-
++#else
++      public unowned MarkupWriter add_usemap (void* chart) {
++#endif
+               return this;
+       }
+ 
+-- 
+2.11.0
+


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