[gnome-build-meta] revert previous push



commit 6e5f8af075fa8146a4440fa2a62f97dd595cd147
Author: Abderrahim Kitouni <a kitouni gmail com>
Date:   Mon May 21 16:47:19 2018 +0100

    revert previous push

 .gitlab-ci.yml                                     |  3 +-
 .gitmodules                                        |  3 -
 bst-external                                       |  1 -
 elements/core-deps.bst                             | 50 ++++++++++++
 elements/core-deps/ModemManager.bst                |  4 +-
 elements/core-deps/NetworkManager.bst              | 12 +--
 elements/core-deps/PackageKit.bst                  |  4 +-
 elements/core-deps/accountsservice.bst             |  4 +-
 elements/core-deps/appstream-glib.bst              | 18 +++++
 elements/{sdk => core-deps}/at-spi2-atk.bst        |  6 +-
 elements/{sdk => core-deps}/at-spi2-core.bst       |  4 +-
 elements/{sdk => core-deps}/atk.bst                |  8 +-
 elements/core-deps/atkmm-1.6.bst                   |  2 +-
 elements/core-deps/atkmm.bst                       |  2 +-
 elements/core-deps/avahi.bst                       |  2 +-
 elements/{sdk => core-deps}/brotli.bst             |  0
 elements/{sdk => core-deps}/cantarell-fonts.bst    |  2 +-
 elements/{sdk => core-deps}/clutter-gst.bst        | 10 +--
 elements/{sdk => core-deps}/clutter-gtk.bst        |  4 +-
 elements/{sdk => core-deps}/clutter.bst            | 16 ++--
 elements/{sdk => core-deps}/cogl.bst               | 15 ++--
 elements/core-deps/colord-gtk.bst                  |  6 +-
 elements/core-deps/colord.bst                      |  6 +-
 elements/{sdk => core-deps}/dbus-glib.bst          |  0
 elements/{sdk => core-deps}/dconf.bst              |  5 +-
 elements/{sdk => core-deps}/enchant-2.bst          |  2 +-
 elements/core-deps/evolution-data-server.bst       | 14 ++--
 elements/core-deps/folks.bst                       |  6 +-
 elements/{sdk => core-deps}/fribidi.bst            |  0
 elements/{sdk => core-deps}/gcab.bst               |  9 +--
 elements/{sdk => core-deps}/gcr.bst                | 10 +--
 elements/{sdk => core-deps}/gdk-pixbuf.bst         |  7 +-
 elements/core-deps/gegl.bst                        | 10 +--
 elements/core-deps/geoclue.bst                     | 14 ++++
 elements/core-deps/geocode-glib.bst                | 10 +--
 elements/{sdk => core-deps}/gjs.bst                |  4 +-
 elements/{sdk => core-deps}/glib.bst               |  3 +-
 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/{sdk => core-deps}/gnome-common.bst       |  0
 elements/core-deps/gnome-online-accounts.bst       | 10 +--
 elements/core-deps/gnome-online-miners.bst         |  2 +-
 elements/core-deps/gnome-video-effects.bst         |  4 +-
 .../{sdk => core-deps}/gobject-introspection.bst   |  2 +-
 elements/core-deps/gom.bst                         |  6 +-
 elements/core-deps/graphene.bst                    |  4 +-
 elements/core-deps/graphviz.bst                    |  4 +-
 elements/core-deps/grilo-plugins.bst               |  4 +-
 elements/core-deps/grilo.bst                       | 12 +--
 elements/core-deps/gsound.bst                      |  8 +-
 elements/core-deps/gspell.bst                      |  6 +-
 elements/core-deps/gssdp.bst                       |  6 +-
 elements/{sdk => core-deps}/gst-libav.bst          |  2 +-
 elements/{sdk => core-deps}/gst-plugins-bad.bst    |  3 +-
 elements/{sdk => core-deps}/gst-plugins-base.bst   |  5 +-
 elements/{sdk => core-deps}/gst-plugins-good.bst   |  5 +-
 elements/{sdk => core-deps}/gstreamer.bst          |  4 +-
 elements/{sdk => core-deps}/gtk+-3.bst             | 25 +++---
 elements/core-deps/gtk+.bst                        | 22 +++---
 elements/{sdk => core-deps}/gtk-doc.bst            |  2 +-
 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/{sdk => core-deps}/ibus.bst               | 12 +--
 elements/{sdk => core-deps}/json-glib.bst          |  4 +-
 elements/{sdk => core-deps}/libcanberra.bst        |  4 +-
 elements/core-deps/libchamplain.bst                | 10 +--
 elements/{sdk => core-deps}/libcroco.bst           |  5 +-
 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                      |  6 +-
 elements/core-deps/libgtop.bst                     |  6 +-
 elements/core-deps/libgudev.bst                    |  8 +-
 elements/core-deps/libgusb.bst                     |  8 +-
 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/{sdk => core-deps}/libnotify.bst          |  9 +--
 elements/core-deps/libosinfo.bst                   |  8 +-
 elements/core-deps/libpeas.bst                     | 10 +--
 elements/core-deps/libpinyin.bst                   |  4 +-
 elements/{sdk => core-deps}/libpsl.bst             |  0
 elements/core-deps/libqmi.bst                      |  4 +-
 elements/core-deps/librest.bst                     |  6 +-
 elements/{sdk => core-deps}/librsvg.bst            | 16 ++--
 elements/{sdk => core-deps}/libsecret.bst          |  9 +--
 elements/{sdk => core-deps}/libsoup.bst            | 11 +--
 elements/core-deps/libvirt-glib.bst                |  8 +-
 elements/core-deps/libwacom.bst                    |  2 +-
 elements/core-deps/libxklavier.bst                 |  6 +-
 elements/core-deps/libzapojit.bst                  |  6 +-
 elements/{sdk => core-deps}/mozjs52.bst            |  0
 elements/core-deps/osinfo-db-tools.bst             |  4 +-
 elements/{sdk => core-deps}/pango.bst              | 13 ++--
 elements/core-deps/pangomm-1.4.bst                 |  4 +-
 elements/core-deps/pangomm.bst                     |  4 +-
 elements/core-deps/phodav.bst                      |  6 +-
 elements/core-deps/polkit.bst                      |  6 +-
 elements/core-deps/poppler.bst                     |  4 +-
 elements/core-deps/pyatspi2.bst                    |  4 +-
 elements/{sdk => core-deps}/pycairo.bst            |  0
 elements/{sdk => core-deps}/pygobject.bst          |  6 +-
 elements/core-deps/samba.bst                       |  4 +-
 elements/core-deps/spice-gtk.bst                   |  8 +-
 elements/core-deps/totem-pl-parser.bst             |  4 +-
 elements/core-deps/tracker-miners.bst              | 12 +--
 elements/core-deps/tracker.bst                     | 10 +--
 elements/core-deps/uhttpmock.bst                   |  4 +-
 elements/core-deps/upower.bst                      |  4 +-
 elements/core-deps/vala-tarball.bst                | 10 +++
 elements/core-deps/vala.bst                        | 12 +++
 elements/{sdk => core-deps}/vte.bst                |  7 +-
 elements/{sdk => core-deps}/wayland.bst            |  0
 elements/{sdk => core-deps}/woff2.bst              |  2 +-
 elements/{sdk => core-deps}/yelp-tools.bst         |  2 +-
 elements/{sdk => core-deps}/yelp-xsl.bst           |  0
 elements/{sdk => core-deps}/zenity.bst             |  6 +-
 elements/{sdk => core}/adwaita-icon-theme.bst      |  7 +-
 elements/core/baobab.bst                           | 14 ++--
 elements/core/cheese.bst                           | 26 +++----
 elements/core/eog.bst                              | 16 ++--
 elements/core/epiphany.bst                         | 26 +++----
 elements/core/evince.bst                           | 12 +--
 elements/core/file-roller.bst                      |  8 +-
 elements/core/gdm.bst                              | 10 +--
 elements/core/gedit.bst                            |  6 +-
 elements/{sdk => core}/glib-networking.bst         |  4 +-
 elements/core/gnome-backgrounds.bst                |  2 +-
 elements/core/gnome-bluetooth.bst                  | 10 +--
 elements/core/gnome-boxes.bst                      | 14 ++--
 elements/core/gnome-calculator.bst                 | 14 ++--
 elements/core/gnome-calendar.bst                   | 10 +--
 elements/core/gnome-characters.bst                 |  8 +-
 elements/core/gnome-clocks.bst                     | 10 +--
 elements/core/gnome-color-manager.bst              | 14 ++--
 elements/core/gnome-contacts.bst                   | 10 +--
 elements/core/gnome-control-center.bst             | 14 ++--
 elements/core/gnome-desktop.bst                    | 12 ++-
 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                    |  8 +-
 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/{sdk => core}/gnome-themes-extra.bst      |  6 +-
 elements/core/gnome-user-docs.bst                  |  2 +-
 elements/core/gnome-user-share.bst                 |  4 +-
 elements/core/gnome-weather.bst                    | 16 ++--
 .../{sdk => core}/gsettings-desktop-schemas.bst    |  7 +-
 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                      |  6 +-
 elements/core/mutter.bst                           | 20 ++---
 elements/core/nautilus.bst                         | 10 +--
 elements/core/network-manager-applet.bst           | 14 ++--
 elements/core/orca.bst                             | 10 +--
 elements/core/rygel.bst                            |  2 +-
 elements/core/simple-scan.bst                      | 10 +--
 elements/core/sushi.bst                            | 18 ++---
 elements/core/totem.bst                            | 28 +++----
 elements/core/vino.bst                             | 10 +--
 elements/core/yelp.bst                             | 14 ++++
 elements/flatpak-runtimes.bst                      |  8 --
 elements/flatpak/platform-image.bst                | 17 ----
 elements/flatpak/platform-locale.bst               | 12 ---
 elements/flatpak/platform.bst                      | 68 ----------------
 elements/flatpak/sdk-debug.bst                     | 13 ----
 elements/flatpak/sdk-docs.bst                      | 13 ----
 elements/flatpak/sdk-image.bst                     | 18 -----
 elements/flatpak/sdk-locale.bst                    | 12 ---
 elements/flatpak/sdk.bst                           | 91 ----------------------
 elements/sdk-platform.bst                          | 48 ------------
 elements/sdk.bst                                   |  7 --
 elements/sdk/WebKitGTK+.bst                        | 29 -------
 elements/sdk/appstream-glib.bst                    | 17 ----
 elements/sdk/geoclue.bst                           | 15 ----
 elements/sdk/gvfs.bst                              | 17 ----
 elements/sdk/vala-bootstrap.bst                    | 10 ---
 elements/sdk/vala.bst                              | 15 ----
 elements/sdk/yelp.bst                              | 14 ----
 elements/world/accerciser.bst                      | 10 +--
 elements/world/bijiben.bst                         | 10 +--
 elements/world/dconf-editor.bst                    | 10 +--
 elements/world/devhelp.bst                         | 10 +--
 elements/world/evolution.bst                       | 24 +++---
 elements/world/five-or-more.bst                    |  8 +-
 elements/world/four-in-a-row.bst                   |  8 +-
 elements/world/ghex.bst                            |  6 +-
 elements/world/gitg.bst                            | 18 ++---
 elements/world/glade.bst                           |  6 +-
 elements/world/gnome-builder.bst                   | 16 ++--
 elements/world/gnome-chess.bst                     | 10 +--
 elements/world/gnome-code-assistance.bst           |  2 +-
 elements/world/gnome-devel-docs.bst                |  2 +-
 elements/world/gnome-dictionary.bst                |  6 +-
 elements/world/gnome-klotski.bst                   |  8 +-
 elements/world/gnome-mahjongg.bst                  | 10 +--
 elements/world/gnome-mines.bst                     | 10 +--
 elements/world/gnome-multi-writer.bst              |  6 +-
 elements/world/gnome-nettool.bst                   |  6 +-
 elements/world/gnome-nibbles.bst                   | 14 ++--
 elements/world/gnome-recipes.bst                   |  2 +-
 elements/world/gnome-robots.bst                    |  8 +-
 elements/world/gnome-sound-recorder.bst            | 14 ++--
 elements/world/gnome-sudoku.bst                    | 10 +--
 elements/world/gnome-taquin.bst                    | 10 +--
 elements/world/gnome-tetravex.bst                  | 10 +--
 elements/world/gnome-todo.bst                      |  6 +-
 elements/world/gnome-tweaks.bst                    |  4 +-
 elements/world/hitori.bst                          |  8 +-
 elements/world/iagno.bst                           | 10 +--
 elements/world/jsonrpc-glib.bst                    |  6 +-
 elements/world/libgit2-glib.bst                    |  4 +-
 elements/world/libgnome-games-support.bst          |  6 +-
 elements/world/libmanette.bst                      |  4 +-
 elements/world/lightsoff.bst                       | 14 ++--
 elements/world/nautilus-sendto.bst                 |  2 +-
 elements/world/polari.bst                          | 10 +--
 elements/world/quadrapassel.bst                    | 14 ++--
 elements/world/swell-foop.bst                      | 12 +--
 elements/world/tali.bst                            |  8 +-
 elements/world/telepathy-glib.bst                  |  8 +-
 elements/world/telepathy-logger.bst                |  6 +-
 elements/world/telepathy-mission-control.bst       |  4 +-
 elements/world/template-glib.bst                   |  4 +-
 files/vala/disable-valadoc.patch                   | 66 ----------------
 project.conf                                       | 33 --------
 260 files changed, 1005 insertions(+), 1425 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7ac40f..0a10cf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ variables:
   GET_SOURCES_ATTEMPTS: 3
   BST: 'bst'
   BST_SHA: '06ae434a7017edbf67bf46c3fe2e327466801787' #  1.1.3
-  GIT_SUBMODULE_STRATEGY: normal
 
 stages:
   - build
@@ -32,7 +31,7 @@ before_script:
   stage: build
   dependencies: []
   script:
-    - ${BST} --on-error continue build --track-all core.bst flatpak-runtimes.bst
+    - ${BST} build --track-all core.bst
   # Store all the downloaded git and ostree repos in the distributed cache.
   # This saves us fetching them from the different repos and further afield
   # on every build.
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 143df28..7c95e82 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -7,9 +7,14 @@ 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
@@ -17,30 +22,48 @@ depends:
 - core-deps/berkeleydb.bst
 - core-deps/blockdev.bst
 - core-deps/boost.bst
+- core-deps/brotli.bst
 - core-deps/cairomm-1.0.bst
 - core-deps/cairomm.bst
+- core-deps/cantarell-fonts.bst
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/cogl.bst
 - core-deps/colord-gtk.bst
 - core-deps/colord.bst
 - core-deps/cryptsetup.bst
+- core-deps/dbus-glib.bst
+- core-deps/dconf.bst
 - core-deps/dmraid.bst
 - core-deps/dotconf.bst
+- core-deps/enchant-2.bst
 - core-deps/espeak.bst
 - core-deps/evolution-data-server.bst
 - core-deps/exempi.bst
 - core-deps/exiv2.bst
 - core-deps/folks.bst
+- core-deps/fribidi.bst
 - core-deps/ftjam.bst
 - core-deps/fuse.bst
+- core-deps/gcab.bst
+- core-deps/gcr.bst
+- core-deps/gdk-pixbuf.bst
 - core-deps/gegl.bst
+- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
 - core-deps/gexiv2.bst
+- core-deps/gjs.bst
+- core-deps/glib.bst
 - core-deps/glibmm-2.4.bst
 - core-deps/glibmm.bst
 - core-deps/gmime3.bst
 - core-deps/gnome-autoar.bst
+- core-deps/gnome-common.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/gnome-video-effects.bst
+- core-deps/gobject-introspection.bst
 - core-deps/gom.bst
 - core-deps/gpgme.bst
 - core-deps/graphene.bst
@@ -50,7 +73,14 @@ 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
@@ -63,16 +93,20 @@ 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
@@ -102,15 +136,20 @@ 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
@@ -123,6 +162,7 @@ depends:
 - core-deps/lvm2.bst
 - core-deps/mm-common.bst
 - core-deps/mobile-broadband-provider-info.bst
+- core-deps/mozjs52.bst
 - core-deps/mpc.bst
 - core-deps/mpfr.bst
 - core-deps/mtdev.bst
@@ -131,6 +171,7 @@ depends:
 - core-deps/openldap.bst
 - core-deps/osinfo-db-tools.bst
 - core-deps/pam.bst
+- core-deps/pango.bst
 - core-deps/pangomm-1.4.bst
 - core-deps/pangomm.bst
 - core-deps/parted.bst
@@ -144,6 +185,8 @@ 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
@@ -158,6 +201,13 @@ depends:
 - core-deps/udisks2.bst
 - core-deps/uhttpmock.bst
 - core-deps/upower.bst
+- core-deps/vala.bst
 - core-deps/valgrind.bst
 - core-deps/volume-key.bst
+- core-deps/vte.bst
+- core-deps/wayland.bst
+- core-deps/woff2.bst
 - core-deps/xmlto.bst
+- core-deps/yelp-tools.bst
+- core-deps/yelp-xsl.bst
+- core-deps/zenity.bst
diff --git a/elements/core-deps/ModemManager.bst b/elements/core-deps/ModemManager.bst
index 8194f30..548820e 100644
--- a/elements/core-deps/ModemManager.bst
+++ b/elements/core-deps/ModemManager.bst
@@ -4,11 +4,11 @@ sources:
   url: git_freedesktop_org:ModemManager/ModemManager.git
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gtk-doc.bst
 - core-deps/libgudev.bst
 - core-deps/libmbim.bst
 - core-deps/libqmi.bst
-- sdk/glib.bst
-- sdk/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index f2f42c9..0de15fb 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
-- sdk/dbus-glib.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
-- sdk/pygobject.bst
-- sdk/vala.bst
+- core-deps/pygobject.bst
+- core-deps/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 a583165..34794a2 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 41420ea..741a16b 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/appstream-glib.bst b/elements/core-deps/appstream-glib.bst
new file mode 100644
index 0000000..02984e5
--- /dev/null
+++ b/elements/core-deps/appstream-glib.bst
@@ -0,0 +1,18 @@
+kind: meson
+sources:
+- kind: git
+  url: github_com:hughsie/appstream-glib.git
+  track: master
+depends:
+- core-deps/gcab.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/json-glib.bst
+- core-deps/libsoup.bst
+- core-deps/libyaml.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  meson-local: -Dstemmer=false -Drpm=false
diff --git a/elements/sdk/at-spi2-atk.bst b/elements/core-deps/at-spi2-atk.bst
similarity index 67%
rename from elements/sdk/at-spi2-atk.bst
rename to elements/core-deps/at-spi2-atk.bst
index fc423c1..1b9434f 100644
--- a/elements/sdk/at-spi2-atk.bst
+++ b/elements/core-deps/at-spi2-atk.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:at-spi2-atk
   track: master
 depends:
-- sdk/at-spi2-core.bst
-- sdk/atk.bst
-- sdk/glib.bst
+- core-deps/atk.bst
+- core-deps/at-spi2-core.bst
+- core-deps/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/at-spi2-core.bst b/elements/core-deps/at-spi2-core.bst
similarity index 77%
rename from elements/sdk/at-spi2-core.bst
rename to elements/core-deps/at-spi2-core.bst
index 04e475c..a616463 100644
--- a/elements/sdk/at-spi2-core.bst
+++ b/elements/core-deps/at-spi2-core.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:at-spi2-core
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/sdk/atk.bst b/elements/core-deps/atk.bst
similarity index 60%
rename from elements/sdk/atk.bst
rename to elements/core-deps/atk.bst
index ecea9ac..d1871f7 100644
--- a/elements/sdk/atk.bst
+++ b/elements/core-deps/atk.bst
@@ -4,10 +4,8 @@ sources:
   url: git_gnome_org:atk
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.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 a00f9f8..8c9e0aa 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:atkmm
   track: atkmm-2-24
 depends:
+- core-deps/atk.bst
 - core-deps/glibmm-2.4.bst
-- sdk/atk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/atkmm.bst b/elements/core-deps/atkmm.bst
index 690fe13..8b578d9 100644
--- a/elements/core-deps/atkmm.bst
+++ b/elements/core-deps/atkmm.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:atkmm
   track: master
 depends:
+- core-deps/atk.bst
 - core-deps/glibmm.bst
-- sdk/atk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/avahi.bst b/elements/core-deps/avahi.bst
index 29df885..6d056ba 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
-- sdk/gtk+-3.bst
+- core-deps/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/brotli.bst b/elements/core-deps/brotli.bst
similarity index 100%
rename from elements/sdk/brotli.bst
rename to elements/core-deps/brotli.bst
diff --git a/elements/sdk/cantarell-fonts.bst b/elements/core-deps/cantarell-fonts.bst
similarity index 84%
rename from elements/sdk/cantarell-fonts.bst
rename to elements/core-deps/cantarell-fonts.bst
index d19fcc3..79224fb 100644
--- a/elements/sdk/cantarell-fonts.bst
+++ b/elements/core-deps/cantarell-fonts.bst
@@ -3,6 +3,6 @@ sources:
 - kind: tar
   url: gnome_downloads:cantarell-fonts/0.100/cantarell-fonts-0.100.tar.xz
 depends:
-- sdk/appstream-glib.bst
+- core-deps/appstream-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter-gst.bst b/elements/core-deps/clutter-gst.bst
similarity index 52%
rename from elements/sdk/clutter-gst.bst
rename to elements/core-deps/clutter-gst.bst
index 18d2a62..a8ab8bc 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/core-deps/clutter-gst.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:clutter-gst
   track: clutter-gst-3.0
 depends:
-- sdk/clutter.bst
-- sdk/cogl.bst
-- sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
+- core-deps/clutter.bst
+- core-deps/cogl.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gstreamer.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter-gtk.bst b/elements/core-deps/clutter-gtk.bst
similarity index 75%
rename from elements/sdk/clutter-gtk.bst
rename to elements/core-deps/clutter-gtk.bst
index 1088b58..6392546 100644
--- a/elements/sdk/clutter-gtk.bst
+++ b/elements/core-deps/clutter-gtk.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:clutter-gtk
   track: master
 depends:
-- sdk/clutter.bst
-- sdk/gtk+-3.bst
+- core-deps/clutter.bst
+- core-deps/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter.bst b/elements/core-deps/clutter.bst
similarity index 58%
rename from elements/sdk/clutter.bst
rename to elements/core-deps/clutter.bst
index 8331b60..d305a11 100644
--- a/elements/sdk/clutter.bst
+++ b/elements/core-deps/clutter.bst
@@ -4,13 +4,15 @@ sources:
   url: git_gnome_org:clutter
   track: master
 depends:
-- sdk/atk.bst
-- sdk/cogl.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/json-glib.bst
-- sdk/wayland.bst
+- core-deps/atk.bst
+- core-deps/cogl.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/json-glib.bst
+- core-deps/libgudev.bst
+- core-deps/libinput.bst
+- core-deps/wayland.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/cogl.bst b/elements/core-deps/cogl.bst
similarity index 63%
rename from elements/sdk/cogl.bst
rename to elements/core-deps/cogl.bst
index 387468d..d8c7455 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/core-deps/cogl.bst
@@ -4,14 +4,13 @@ sources:
   url: git_gnome_org:cogl
   track: cogl-1.22
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/pango.bst
-- sdk/wayland.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk-doc.bst
+- core-deps/pango.bst
+- core-deps/wayland.bst
 - 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 fe2cdc5..c6220cd 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
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/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 50a473f..a0b54c5 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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 
diff --git a/elements/sdk/dbus-glib.bst b/elements/core-deps/dbus-glib.bst
similarity index 100%
rename from elements/sdk/dbus-glib.bst
rename to elements/core-deps/dbus-glib.bst
diff --git a/elements/sdk/dconf.bst b/elements/core-deps/dconf.bst
similarity index 71%
rename from elements/sdk/dconf.bst
rename to elements/core-deps/dconf.bst
index 38bc585..e261b36 100644
--- a/elements/sdk/dconf.bst
+++ b/elements/core-deps/dconf.bst
@@ -4,8 +4,7 @@ sources:
   url: git_gnome_org:dconf
   track: master
 depends:
-- sdk/glib.bst
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/enchant-2.bst b/elements/core-deps/enchant-2.bst
similarity index 93%
rename from elements/sdk/enchant-2.bst
rename to elements/core-deps/enchant-2.bst
index 4341cad..a4c012d 100644
--- a/elements/sdk/enchant-2.bst
+++ b/elements/core-deps/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:
-- sdk/glib.bst
+- core-deps/glib.bst
 - filename: desktop/hunspell.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 37157e9..7489f3c 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:evolution-data-server
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/gcr.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/gtk+-3.bst
+- core-deps/libcanberra.bst
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core-deps/libical.bst
+- core-deps/libsecret.bst
+- core-deps/libsoup.bst
 - core-deps/openldap.bst
-- sdk/WebKitGTK+.bst
-- sdk/gcr.bst
-- sdk/gtk+-3.bst
-- sdk/libcanberra.bst
-- sdk/libsecret.bst
-- sdk/libsoup.bst
-- sdk/vala.bst
+- core-deps/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 89879ac..a26f84d 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:folks
   track: master
 depends:
+- core-deps/dbus-glib.bst
 - core-deps/evolution-data-server.bst
+- core-deps/gobject-introspection.bst
 - core-deps/libgee.bst
-- sdk/dbus-glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/fribidi.bst b/elements/core-deps/fribidi.bst
similarity index 100%
rename from elements/sdk/fribidi.bst
rename to elements/core-deps/fribidi.bst
diff --git a/elements/sdk/gcab.bst b/elements/core-deps/gcab.bst
similarity index 51%
rename from elements/sdk/gcab.bst
rename to elements/core-deps/gcab.bst
index 3d1ebc1..dc9c920 100644
--- a/elements/sdk/gcab.bst
+++ b/elements/core-deps/gcab.bst
@@ -4,11 +4,8 @@ sources:
   url: git_gnome_org:gcab
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gcr.bst b/elements/core-deps/gcr.bst
similarity index 54%
rename from elements/sdk/gcr.bst
rename to elements/core-deps/gcr.bst
index 439b617..d80a41d 100644
--- a/elements/sdk/gcr.bst
+++ b/elements/core-deps/gcr.bst
@@ -4,11 +4,9 @@ sources:
   url: git_gnome_org:gcr
   track: master
 depends:
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gtk+-3.bst
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gdk-pixbuf.bst b/elements/core-deps/gdk-pixbuf.bst
similarity index 77%
rename from elements/sdk/gdk-pixbuf.bst
rename to elements/core-deps/gdk-pixbuf.bst
index 6863be8..47f73dd 100644
--- a/elements/sdk/gdk-pixbuf.bst
+++ b/elements/core-deps/gdk-pixbuf.bst
@@ -4,10 +4,9 @@ sources:
   url: git_gnome_org:gdk-pixbuf
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.bst
 - filename: desktop/shared-mime-info.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 594e159..55011cb 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
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/json-glib.bst
-- sdk/librsvg.bst
-- sdk/pango.bst
+- core-deps/json-glib.bst
+- core-deps/librsvg.bst
+- core-deps/pango.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/geoclue.bst b/elements/core-deps/geoclue.bst
new file mode 100644
index 0000000..4dd4a96
--- /dev/null
+++ b/elements/core-deps/geoclue.bst
@@ -0,0 +1,14 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_freedesktop_org:geoclue
+  track: master
+depends:
+- core-deps/ModemManager.bst
+- core-deps/avahi.bst
+- core-deps/glib.bst
+- core-deps/json-glib.bst
+- core-deps/libnotify.bst
+- core-deps/libsoup.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/geocode-glib.bst b/elements/core-deps/geocode-glib.bst
index 2c3fb51..aa6ad11 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:geocode-glib
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
-- sdk/json-glib.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.bst
+- core-deps/json-glib.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gjs.bst b/elements/core-deps/gjs.bst
similarity index 80%
rename from elements/sdk/gjs.bst
rename to elements/core-deps/gjs.bst
index a6899e7..a09dc36 100644
--- a/elements/sdk/gjs.bst
+++ b/elements/core-deps/gjs.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gjs
   track: master
 depends:
-- sdk/gobject-introspection.bst
-- sdk/mozjs52.bst
+- core-deps/gobject-introspection.bst
+- core-deps/mozjs52.bst
 - filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/sdk/glib.bst b/elements/core-deps/glib.bst
similarity index 88%
rename from elements/sdk/glib.bst
rename to elements/core-deps/glib.bst
index b4441ad..5f8b2e0 100644
--- a/elements/sdk/glib.bst
+++ b/elements/core-deps/glib.bst
@@ -4,8 +4,7 @@ sources:
   url: git_gnome_org:glib
   track: master
 depends:
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/glibmm-2.4.bst b/elements/core-deps/glibmm-2.4.bst
index cc1b1a7..d041bcb 100644
--- a/elements/core-deps/glibmm-2.4.bst
+++ b/elements/core-deps/glibmm-2.4.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glibmm
   track: glibmm-2-54
 depends:
+- core-deps/glib.bst
 - core-deps/libsigcplusplus-2.0.bst
-- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/glibmm.bst b/elements/core-deps/glibmm.bst
index f42346a..13bbf76 100644
--- a/elements/core-deps/glibmm.bst
+++ b/elements/core-deps/glibmm.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glibmm
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/libsigcplusplus.bst
-- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gmime3.bst b/elements/core-deps/gmime3.bst
index f9ee92f..5ed8398 100644
--- a/elements/core-deps/gmime3.bst
+++ b/elements/core-deps/gmime3.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gmime
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gtk-doc.bst
+- core-deps/glib.bst
+- core-deps/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 ebc9a35..8f4d06d 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-autoar
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gnome-common.bst b/elements/core-deps/gnome-common.bst
similarity index 100%
rename from elements/sdk/gnome-common.bst
rename to elements/core-deps/gnome-common.bst
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index fe5131a..30c3cf6 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-online-accounts
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/gtk+-3.bst
+- core-deps/json-glib.bst
 - core-deps/librest.bst
-- sdk/WebKitGTK+.bst
-- sdk/gtk+-3.bst
-- sdk/json-glib.bst
-- sdk/libsecret.bst
-- sdk/libsoup.bst
+- core-deps/libsecret.bst
+- core-deps/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 00e0d45..86c4768 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-online-miners
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/grilo.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph.bst
 - core-deps/libzapojit.bst
 - core-deps/tracker.bst
-- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index f7bff23..6d6f567 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gnome-video-effects
   track: master
 depends:
-- sdk/gnome-common.bst
-- sdk/gstreamer.bst
+- core-deps/gnome-common.bst
+- core-deps/gstreamer.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gobject-introspection.bst b/elements/core-deps/gobject-introspection.bst
similarity index 90%
rename from elements/sdk/gobject-introspection.bst
rename to elements/core-deps/gobject-introspection.bst
index 8477aef..8ebb326 100644
--- a/elements/sdk/gobject-introspection.bst
+++ b/elements/core-deps/gobject-introspection.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gobject-introspection
   track: master
 depends:
-- sdk/glib.bst
+- core-deps/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gom.bst b/elements/core-deps/gom.bst
index 8f18e44..33a8634 100644
--- a/elements/core-deps/gom.bst
+++ b/elements/core-deps/gom.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gom
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/pygobject.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/graphene.bst b/elements/core-deps/graphene.bst
index 392e4f8..ec0d8cf 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:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/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 2345be0..bb30a1a 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:
-- sdk/gdk-pixbuf.bst
-- sdk/pango.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/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 a0834e3..12b0b42 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 d5a9f9d..46bddf0 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:grilo
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/libsoup.bst
 - core-deps/totem-pl-parser.bst
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/libsoup.bst
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index bc9147c..f89ec9e 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gsound
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/libcanberra.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/libcanberra.bst
+- core-deps/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 b1f613b..60edb00 100644
--- a/elements/core-deps/gspell.bst
+++ b/elements/core-deps/gspell.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gspell
   track: master
 depends:
-- sdk/enchant-2.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/enchant-2.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gssdp.bst b/elements/core-deps/gssdp.bst
index 6067b2f..308202d 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gssdp
   track: gssdp_1.0
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 config:
diff --git a/elements/sdk/gst-libav.bst b/elements/core-deps/gst-libav.bst
similarity index 83%
rename from elements/sdk/gst-libav.bst
rename to elements/core-deps/gst-libav.bst
index e751c40..394e48d 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/core-deps/gst-libav.bst
@@ -4,6 +4,6 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-libav
   track: master
 depends:
-- sdk/gst-plugins-base.bst
+- core-deps/gst-plugins-base.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/core-deps/gst-plugins-bad.bst
similarity index 73%
rename from elements/sdk/gst-plugins-bad.bst
rename to elements/core-deps/gst-plugins-bad.bst
index d20f625..5bc2b16 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/core-deps/gst-plugins-bad.bst
@@ -4,6 +4,7 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-bad
   track: master
 depends:
-- sdk/gst-plugins-base.bst
+- core-deps/graphene.bst
+- core-deps/gst-plugins-base.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gst-plugins-base.bst b/elements/core-deps/gst-plugins-base.bst
similarity index 74%
rename from elements/sdk/gst-plugins-base.bst
rename to elements/core-deps/gst-plugins-base.bst
index d553be4..fdfb3d4 100644
--- a/elements/sdk/gst-plugins-base.bst
+++ b/elements/core-deps/gst-plugins-base.bst
@@ -4,8 +4,9 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-base
   track: master
 depends:
-- sdk/gstreamer.bst
-- sdk/gtk+-3.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk+-3.bst
+- core-deps/libgudev.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/gst-plugins-good.bst b/elements/core-deps/gst-plugins-good.bst
similarity index 66%
rename from elements/sdk/gst-plugins-good.bst
rename to elements/core-deps/gst-plugins-good.bst
index 14d8774..ff18fca 100644
--- a/elements/sdk/gst-plugins-good.bst
+++ b/elements/core-deps/gst-plugins-good.bst
@@ -4,7 +4,8 @@ sources:
   url: git_freedesktop_org:gstreamer/gst-plugins-good
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/gst-plugins-base.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/libgudev.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gstreamer.bst b/elements/core-deps/gstreamer.bst
similarity index 77%
rename from elements/sdk/gstreamer.bst
rename to elements/core-deps/gstreamer.bst
index 5b2f1c7..1fd1054 100644
--- a/elements/sdk/gstreamer.bst
+++ b/elements/core-deps/gstreamer.bst
@@ -4,8 +4,8 @@ sources:
   url: git_freedesktop_org:gstreamer/gstreamer
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/gtk+-3.bst b/elements/core-deps/gtk+-3.bst
similarity index 83%
rename from elements/sdk/gtk+-3.bst
rename to elements/core-deps/gtk+-3.bst
index 45b490a..09cefda 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/core-deps/gtk+-3.bst
@@ -4,15 +4,14 @@ sources:
   url: git_gnome_org:gtk+
   track: gtk-3-22
 depends:
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/pango.bst
-- sdk/wayland.bst
+- core-deps/atk.bst
+- core-deps/at-spi2-atk.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.bst
+- core-deps/pango.bst
+- core-deps/wayland.bst
 - filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/libepoxy.bst
@@ -21,13 +20,13 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-- filename: desktop/xorg-lib-xcomposite.bst
-  junction: freedesktop-sdk.bst
-- filename: desktop/xorg-lib-xdamage.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-xinerama.bst
+- filename: desktop/xorg-lib-xcomposite.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xdamage.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gtk+.bst b/elements/core-deps/gtk+.bst
index e459cd9..4e15ec8 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:gtk+
   track: master
 depends:
+- core-deps/atk.bst
+- core-deps/at-spi2-atk.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - core-deps/graphene.bst
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
-- sdk/gtk-doc.bst
-- sdk/pango.bst
-- sdk/wayland.bst
+- core-deps/gst-plugins-bad.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk-doc.bst
+- core-deps/pango.bst
+- core-deps/wayland.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/gtk-doc.bst b/elements/core-deps/gtk-doc.bst
similarity index 84%
rename from elements/sdk/gtk-doc.bst
rename to elements/core-deps/gtk-doc.bst
index ab5d16c..c6721e9 100644
--- a/elements/sdk/gtk-doc.bst
+++ b/elements/core-deps/gtk-doc.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gtk-doc
   track: master
 depends:
-- sdk/yelp-tools.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 8fc59d3..8315eea 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gtk-vnc
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gtk+-3.bst
+- core-deps/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 81c417d..abb30f2 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 0ec4b52..b9b41f2 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 c711abd..7d2f3e9 100644
--- a/elements/core-deps/gtksourceview-3.bst
+++ b/elements/core-deps/gtksourceview-3.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gtksourceview
   track: gnome-3-24
 depends:
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gtksourceview.bst b/elements/core-deps/gtksourceview.bst
index 573c89d..fca3f0c 100644
--- a/elements/core-deps/gtksourceview.bst
+++ b/elements/core-deps/gtksourceview.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:gtksourceview
   track: master
 depends:
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/gtk+-3.bst
+- core-deps/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 210eb10..aecd657 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gupnp-av
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - core-deps/gupnp.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index 9d801f5..4ccd6be 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gupnp-dlna
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gst-plugins-good.bst
+- core-deps/gstreamer.bst
+- core-deps/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 cc6342f..1427ccd 100644
--- a/elements/core-deps/gupnp-igd.bst
+++ b/elements/core-deps/gupnp-igd.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gupnp-igd
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gupnp.bst
-- sdk/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/gupnp.bst b/elements/core-deps/gupnp.bst
index 0ceacca..ba7e449 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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/libsoup.bst
+- core-deps/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 8b95275..5ca1882 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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/ibus.bst
-- sdk/pygobject.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/ibus.bst
+- core-deps/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 89fe6cc..bf2338e 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 403faae..346b91c 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/sdk/ibus.bst b/elements/core-deps/ibus.bst
similarity index 69%
rename from elements/sdk/ibus.bst
rename to elements/core-deps/ibus.bst
index 251568a..671a150 100644
--- a/elements/sdk/ibus.bst
+++ b/elements/core-deps/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:
-- sdk/dconf.bst
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/libnotify.bst
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/json-glib.bst b/elements/core-deps/json-glib.bst
similarity index 72%
rename from elements/sdk/json-glib.bst
rename to elements/core-deps/json-glib.bst
index 6d12991..a568b6e 100644
--- a/elements/sdk/json-glib.bst
+++ b/elements/core-deps/json-glib.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/json-glib.git
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libcanberra.bst b/elements/core-deps/libcanberra.bst
similarity index 74%
rename from elements/sdk/libcanberra.bst
rename to elements/core-deps/libcanberra.bst
index c0660dc..bde8cd1 100644
--- a/elements/sdk/libcanberra.bst
+++ b/elements/core-deps/libcanberra.bst
@@ -3,9 +3,11 @@ sources:
 - kind: tar
   url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
 depends:
-- sdk/gtk+-3.bst
+- core-deps/gtk+-3.bst
 - filename: desktop/pulseaudio.bst
   junction: freedesktop-sdk.bst
+- filename: vm/linux-vm-boot/systemd.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index 9879087..383701e 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:libchamplain
   track: master
 depends:
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libsoup.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/libcroco.bst b/elements/core-deps/libcroco.bst
similarity index 71%
rename from elements/sdk/libcroco.bst
rename to elements/core-deps/libcroco.bst
index 0232a5d..e35a789 100644
--- a/elements/sdk/libcroco.bst
+++ b/elements/core-deps/libcroco.bst
@@ -4,8 +4,7 @@ sources:
   url: git_gnome_org:libcroco
   track: master
 depends:
-- sdk/glib.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gtk-doc.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libdazzle.bst b/elements/core-deps/libdazzle.bst
index 82be654..72118af 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:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgdata.bst b/elements/core-deps/libgdata.bst
index db037c2..93dfa15 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:libgdata
   track: master
 depends:
+- core-deps/gcr.bst
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/gobject-introspection.bst
+- core-deps/json-glib.bst
 - core-deps/liboauth.bst
+- core-deps/libsoup.bst
 - core-deps/uhttpmock.bst
-- sdk/gcr.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/json-glib.bst
-- sdk/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgee.bst b/elements/core-deps/libgee.bst
index d36f1ca..9556245 100644
--- a/elements/core-deps/libgee.bst
+++ b/elements/core-deps/libgee.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgee
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgepub.bst b/elements/core-deps/libgepub.bst
index 0ae8baf..a3ebe3f 100644
--- a/elements/core-deps/libgepub.bst
+++ b/elements/core-deps/libgepub.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgepub
   track: master
 depends:
-- sdk/WebKitGTK+.bst
-- sdk/glib.bst
-- sdk/libsoup.bst
+- core-deps/WebKitGTK+.bst
+- core-deps/glib.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgfbgraph.bst b/elements/core-deps/libgfbgraph.bst
index 458a592..3a27b40 100644
--- a/elements/core-deps/libgfbgraph.bst
+++ b/elements/core-deps/libgfbgraph.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libgfbgraph
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/json-glib.bst
 - core-deps/librest.bst
-- sdk/glib.bst
-- sdk/json-glib.bst
-- sdk/libsoup.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgnomekbd.bst b/elements/core-deps/libgnomekbd.bst
index 86900f1..8cff3f0 100644
--- a/elements/core-deps/libgnomekbd.bst
+++ b/elements/core-deps/libgnomekbd.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:libgnomekbd
   track: master
 depends:
+- core-deps/gtk+-3.bst
 - core-deps/libxklavier.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgovirt.bst b/elements/core-deps/libgovirt.bst
index bbf482b..5835465 100644
--- a/elements/core-deps/libgovirt.bst
+++ b/elements/core-deps/libgovirt.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgovirt
   track: master
 depends:
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
 - core-deps/librest.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgrss.bst b/elements/core-deps/libgrss.bst
index a91e807..89e4d37 100644
--- a/elements/core-deps/libgrss.bst
+++ b/elements/core-deps/libgrss.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:libgrss
   track: master
 depends:
-- sdk/glib.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgsf.bst b/elements/core-deps/libgsf.bst
index ddcc039..7259765 100644
--- a/elements/core-deps/libgsf.bst
+++ b/elements/core-deps/libgsf.bst
@@ -4,10 +4,8 @@ sources:
   url: git_gnome_org:libgsf
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/gdk-pixbuf.bst
+- core-deps/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 f9d268f..e08e2ed 100644
--- a/elements/core-deps/libgtop.bst
+++ b/elements/core-deps/libgtop.bst
@@ -4,10 +4,8 @@ sources:
   url: git_gnome_org:libgtop
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/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 b6de5a9..d0bbd53 100644
--- a/elements/core-deps/libgudev.bst
+++ b/elements/core-deps/libgudev.bst
@@ -4,11 +4,9 @@ sources:
   url: git_gnome_org:libgudev
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/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 0bbe174..93a69a6 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -4,11 +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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgweather.bst b/elements/core-deps/libgweather.bst
index c77d40d..8424ad7 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
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgxps.bst b/elements/core-deps/libgxps.bst
index e7cf3ae..551073a 100644
--- a/elements/core-deps/libgxps.bst
+++ b/elements/core-deps/libgxps.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgxps
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/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 7712741..fcf889d 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 0124363..8607304 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 ecd8c17..f45ff32 100644
--- a/elements/core-deps/libmediaart.bst
+++ b/elements/core-deps/libmediaart.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libmediaart
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gtk-doc.bst
-- sdk/vala.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gtk-doc.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/libnotify.bst b/elements/core-deps/libnotify.bst
similarity index 56%
rename from elements/sdk/libnotify.bst
rename to elements/core-deps/libnotify.bst
index eded490..a75b51a 100644
--- a/elements/sdk/libnotify.bst
+++ b/elements/core-deps/libnotify.bst
@@ -4,10 +4,9 @@ sources:
   url: git_gnome_org:libnotify
   track: master
 depends:
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index e9109a2..063ce75 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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/libsoup.bst
-- sdk/vala.bst
+- core-deps/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 eccb7ab..206fe67 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:libpeas
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/pygobject.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/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 52efccc..fc74b2e 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/sdk/libpsl.bst b/elements/core-deps/libpsl.bst
similarity index 100%
rename from elements/sdk/libpsl.bst
rename to elements/core-deps/libpsl.bst
diff --git a/elements/core-deps/libqmi.bst b/elements/core-deps/libqmi.bst
index 4a1880e..6e07552 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 03ed540..188b15c 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -4,9 +4,7 @@ sources:
   url: git_gnome_org:librest
   track: librest-0-7
 depends:
-- sdk/glib.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/librsvg.bst b/elements/core-deps/librsvg.bst
similarity index 60%
rename from elements/sdk/librsvg.bst
rename to elements/core-deps/librsvg.bst
index a89322c..aee72ab 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/core-deps/librsvg.bst
@@ -4,15 +4,13 @@ sources:
 - url: https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz
   kind: tar
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gobject-introspection.bst
-- sdk/libcroco.bst
-- sdk/pango.bst
-- filename: sdk/vala.bst
-  type: build
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/libsecret.bst b/elements/core-deps/libsecret.bst
similarity index 53%
rename from elements/sdk/libsecret.bst
rename to elements/core-deps/libsecret.bst
index bbe6139..52c5009 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/core-deps/libsecret.bst
@@ -4,11 +4,8 @@ sources:
   url: git_gnome_org:libsecret
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libsoup.bst b/elements/core-deps/libsoup.bst
similarity index 56%
rename from elements/sdk/libsoup.bst
rename to elements/core-deps/libsoup.bst
index ab054c0..ef232ee 100644
--- a/elements/sdk/libsoup.bst
+++ b/elements/core-deps/libsoup.bst
@@ -4,13 +4,10 @@ sources:
   url: git_gnome_org:libsoup
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/libpsl.bst
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/libpsl.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index 69f20fb..2eeace8 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -4,12 +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
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
-- sdk/vala.bst
+- core-deps/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 8459977..f62add3 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 f5c9a37..c05eb02 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:
-- sdk/gobject-introspection.bst
-- filename: desktop/xorg-app-xkbcomp.bst
-  junction: freedesktop-sdk.bst
+- core-deps/gobject-introspection.bst
 - filename: desktop/xorg-lib-x11.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/xorg-app-xkbcomp.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 9c72aef..ec759b1 100644
--- a/elements/core-deps/libzapojit.bst
+++ b/elements/core-deps/libzapojit.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:libzapojit
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/json-glib.bst
 - core-deps/librest.bst
-- sdk/glib.bst
-- sdk/json-glib.bst
-- sdk/libsoup.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/mozjs52.bst b/elements/core-deps/mozjs52.bst
similarity index 100%
rename from elements/sdk/mozjs52.bst
rename to elements/core-deps/mozjs52.bst
diff --git a/elements/core-deps/osinfo-db-tools.bst b/elements/core-deps/osinfo-db-tools.bst
index 2c04a39..d1cc48b 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:
-- sdk/glib.bst
-- sdk/gnome-common.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/pango.bst b/elements/core-deps/pango.bst
similarity index 75%
rename from elements/sdk/pango.bst
rename to elements/core-deps/pango.bst
index 5e08355..2987394 100644
--- a/elements/sdk/pango.bst
+++ b/elements/core-deps/pango.bst
@@ -4,16 +4,15 @@ sources:
   url: git_gnome_org:pango
   track: master
 depends:
-- sdk/fribidi.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- filename: sdk/gtk-doc.bst
-  type: build
+- core-deps/fribidi.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.bst
 - filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: desktop/fontconfig.bst
-  junction: freedesktop-sdk.bst
 - filename: desktop/harfbuzz.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/fontconfig.bst
+  junction: freedesktop-sdk.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 aeb35d8..54877a0 100644
--- a/elements/core-deps/pangomm-1.4.bst
+++ b/elements/core-deps/pangomm-1.4.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:pangomm
   track: pangomm-2-40
 depends:
+- core-deps/atk.bst
 - core-deps/cairomm-1.0.bst
 - core-deps/glibmm-2.4.bst
-- sdk/atk.bst
-- sdk/pango.bst
+- core-deps/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 1271d1e..2f9126a 100644
--- a/elements/core-deps/pangomm.bst
+++ b/elements/core-deps/pangomm.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:pangomm
   track: master
 depends:
+- core-deps/atk.bst
 - core-deps/cairomm.bst
 - core-deps/glibmm.bst
-- sdk/atk.bst
-- sdk/pango.bst
+- core-deps/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 0cfefb4..45e785d 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:phodav
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/polkit.bst b/elements/core-deps/polkit.bst
index 68c879f..204ff61 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -7,10 +7,10 @@ sources:
   path: files/polkit/sysusers.conf
   directory: data
 depends:
+- core-deps/gobject-introspection.bst
+- core-deps/gtk-doc.bst
+- core-deps/mozjs52.bst
 - core-deps/pam.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
-- sdk/mozjs52.bst
 - filename: vm/linux-vm-boot/systemd.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/poppler.bst b/elements/core-deps/poppler.bst
index 3c5a46d..3f31bb8 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 a850c7f..236160a 100644
--- a/elements/core-deps/pyatspi2.bst
+++ b/elements/core-deps/pyatspi2.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:pyatspi2
   track: master
 depends:
-- sdk/at-spi2-core.bst
-- sdk/pygobject.bst
+- core-deps/at-spi2-core.bst
+- core-deps/pygobject.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/pycairo.bst b/elements/core-deps/pycairo.bst
similarity index 100%
rename from elements/sdk/pycairo.bst
rename to elements/core-deps/pycairo.bst
diff --git a/elements/sdk/pygobject.bst b/elements/core-deps/pygobject.bst
similarity index 65%
rename from elements/sdk/pygobject.bst
rename to elements/core-deps/pygobject.bst
index 3f4ee13..aaee066 100644
--- a/elements/sdk/pygobject.bst
+++ b/elements/core-deps/pygobject.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/pygobject.git
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/pycairo.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/pycairo.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/samba.bst b/elements/core-deps/samba.bst
index 4116dcd..5e80a4d 100644
--- a/elements/core-deps/samba.bst
+++ b/elements/core-deps/samba.bst
@@ -5,9 +5,9 @@ sources:
 - kind: patch
   path: files/samba/fix-root-build.patch
 depends:
-- core-deps/libtirpc.bst
-- core-deps/openldap.bst
 - core-deps/pam.bst
+- core-deps/openldap.bst
+- core-deps/libtirpc.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 9631b33..58120c1 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
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/gtk-doc.bst
-- sdk/vala.bst
+- core-deps/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 5165334..1b58048 100644
--- a/elements/core-deps/totem-pl-parser.bst
+++ b/elements/core-deps/totem-pl-parser.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:totem-pl-parser
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gmime3.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/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 4a9cced..1635087 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 3be9514..2ee68ba 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
-- sdk/dconf.bst
-- sdk/glib.bst
-- sdk/json-glib.bst
-- sdk/libsoup.bst
-- sdk/vala.bst
+- core-deps/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 f3d366c..4db862e 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:
-- sdk/glib.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/libsoup.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index 7f3359f..b73fca9 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -4,10 +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: sdk/gtk-doc.bst
-  type: build
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/vala-tarball.bst b/elements/core-deps/vala-tarball.bst
new file mode 100644
index 0000000..d5b4731
--- /dev/null
+++ b/elements/core-deps/vala-tarball.bst
@@ -0,0 +1,10 @@
+kind: autotools
+sources:
+- kind: tar
+  url: gnome_downloads:vala/0.38/vala-0.38.8.tar.xz
+depends:
+- core-deps/graphviz.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-aux: build-aux
diff --git a/elements/core-deps/vala.bst b/elements/core-deps/vala.bst
new file mode 100644
index 0000000..a184c96
--- /dev/null
+++ b/elements/core-deps/vala.bst
@@ -0,0 +1,12 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_gnome_org:vala
+  track: master
+depends:
+- core-deps/glib.bst
+- core-deps/graphviz.bst
+- filename: core-deps/vala-tarball.bst
+  type: build
+- filename: base.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/sdk/vte.bst b/elements/core-deps/vte.bst
similarity index 73%
rename from elements/sdk/vte.bst
rename to elements/core-deps/vte.bst
index f9332c7..4bd8034 100644
--- a/elements/sdk/vte.bst
+++ b/elements/core-deps/vte.bst
@@ -4,10 +4,9 @@ sources:
   url: git_gnome_org:vte
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- filename: sdk/vala.bst
-  type: build
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/wayland.bst b/elements/core-deps/wayland.bst
similarity index 100%
rename from elements/sdk/wayland.bst
rename to elements/core-deps/wayland.bst
diff --git a/elements/sdk/woff2.bst b/elements/core-deps/woff2.bst
similarity index 86%
rename from elements/sdk/woff2.bst
rename to elements/core-deps/woff2.bst
index 0182f98..861f152 100644
--- a/elements/sdk/woff2.bst
+++ b/elements/core-deps/woff2.bst
@@ -3,6 +3,6 @@ sources:
 - kind: tar
   url: github_com:google/woff2/archive/v1.0.2.tar.gz
 depends:
-- sdk/brotli.bst
+- core-deps/brotli.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/yelp-tools.bst b/elements/core-deps/yelp-tools.bst
similarity index 85%
rename from elements/sdk/yelp-tools.bst
rename to elements/core-deps/yelp-tools.bst
index b3aea7b..195c0f6 100644
--- a/elements/sdk/yelp-tools.bst
+++ b/elements/core-deps/yelp-tools.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:yelp-tools
   track: master
 depends:
-- sdk/yelp-xsl.bst
+- core-deps/yelp-xsl.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/yelp-xsl.bst b/elements/core-deps/yelp-xsl.bst
similarity index 100%
rename from elements/sdk/yelp-xsl.bst
rename to elements/core-deps/yelp-xsl.bst
diff --git a/elements/sdk/zenity.bst b/elements/core-deps/zenity.bst
similarity index 64%
rename from elements/sdk/zenity.bst
rename to elements/core-deps/zenity.bst
index a3605a1..6a3f74e 100644
--- a/elements/sdk/zenity.bst
+++ b/elements/core-deps/zenity.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:zenity
   track: master
 depends:
-- sdk/gnome-common.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/gtk+-3.bst
+- core-deps/gnome-common.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/adwaita-icon-theme.bst b/elements/core/adwaita-icon-theme.bst
similarity index 65%
rename from elements/sdk/adwaita-icon-theme.bst
rename to elements/core/adwaita-icon-theme.bst
index c73e4e1..10fab7f 100644
--- a/elements/sdk/adwaita-icon-theme.bst
+++ b/elements/core/adwaita-icon-theme.bst
@@ -4,9 +4,8 @@ sources:
   url: git_gnome_org:adwaita-icon-theme
   track: master
 depends:
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
+- core-deps/gnome-common.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/baobab.bst b/elements/core/baobab.bst
index 01ac257..5be1d8d 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:baobab
   track: master
 depends:
-- 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
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index bd80b14..8f9eaf1 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:cheese
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/glib.bst
 - core-deps/gnome-video-effects.bst
+- core-deps/gst-plugins-bad.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gst-plugins-good.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk+-3.bst
+- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/clutter-gst.bst
-- sdk/clutter-gtk.bst
-- sdk/glib.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
-- sdk/gtk+-3.bst
-- sdk/libcanberra.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/eog.bst b/elements/core/eog.bst
index ba36d71..cb3cfda 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
-- 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
+- core/gsettings-desktop-schemas.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 7a9d1aa..18185b2 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -4,19 +4,19 @@ sources:
   url: git_gnome_org:epiphany
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/appstream-glib.bst
+- core-deps/gcr.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/json-glib.bst
 - core-deps/libdazzle.bst
-- 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
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index 572fe43..6424aec 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -4,16 +4,16 @@ sources:
   url: git_gnome_org:evince
   track: master
 depends:
+- core-deps/glib.bst
 - core-deps/gspell.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgxps.bst
+- core-deps/libsecret.bst
+- core-deps/libsecret.bst
 - core-deps/poppler.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - core/nautilus.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libsecret.bst
-- sdk/libsecret.bst
-- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/file-roller.bst b/elements/core/file-roller.bst
index 7b28489..dfe7018 100644
--- a/elements/core/file-roller.bst
+++ b/elements/core/file-roller.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:file-roller
   track: master
 depends:
-- sdk/adwaita-icon-theme.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index 7b07a1b..90147c2 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
-- sdk/dconf.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libcanberra.bst
-- sdk/yelp-tools.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gedit.bst b/elements/core/gedit.bst
index c3f2f7d..f6fcebb 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
-- sdk/adwaita-icon-theme.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/yelp-tools.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
+- core/gsettings-desktop-schemas.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/glib-networking.bst b/elements/core/glib-networking.bst
similarity index 81%
rename from elements/sdk/glib-networking.bst
rename to elements/core/glib-networking.bst
index eb82fd0..40236f7 100644
--- a/elements/sdk/glib-networking.bst
+++ b/elements/core/glib-networking.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:glib-networking
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gsettings-desktop-schemas.bst
+- core-deps/glib.bst
+- core/gsettings-desktop-schemas.bst
 - filename: desktop/libproxy.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-backgrounds.bst b/elements/core/gnome-backgrounds.bst
index 23570e0..6ab2baa 100644
--- a/elements/core/gnome-backgrounds.bst
+++ b/elements/core/gnome-backgrounds.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-backgrounds
   track: master
 depends:
-- sdk/glib.bst
+- core-deps/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
index c274da3..639b1be 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-bluetooth
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/gtk-doc.bst
-- sdk/libcanberra.bst
-- sdk/libnotify.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/gtk-doc.bst
+- core-deps/libcanberra.bst
+- core-deps/libnotify.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 9ffe864..23c32e1 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:gnome-boxes
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtk-vnc.bst
+- core-deps/json-glib.bst
 - core-deps/libgovirt.bst
 - core-deps/libgudev.bst
 - core-deps/libosinfo.bst
+- core-deps/libsecret.bst
 - core-deps/libvirt-glib.bst
 - core-deps/spice-gtk.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- 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
+- core-deps/vala.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-calculator.bst b/elements/core/gnome-calculator.bst
index 0aced84..51be15c 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-calculator
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
+- core-deps/libsoup.bst
 - core-deps/mpc.bst
-- 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
+- core-deps/vala.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index b70e422..47d1783 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:gnome-calendar
   track: master
 depends:
+- core-deps/appstream-glib.bst
 - core-deps/evolution-data-server.bst
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/gtk+-3.bst
 - core-deps/libdazzle.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
+- core/adwaita-icon-theme.bst
+- core/gsettings-desktop-schemas.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-characters.bst b/elements/core/gnome-characters.bst
index 0938d6f..0f7dc7f 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-characters
   track: master
 depends:
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/gjs.bst
-- sdk/gtk+-3.bst
+- core-deps/appstream-glib.bst
+- core-deps/gjs.bst
+- core-deps/gtk+-3.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-clocks.bst b/elements/core/gnome-clocks.bst
index a6f24b5..b73e1c8 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-clocks
   track: master
 depends:
+- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
 - core-deps/gsound.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgweather.bst
+- core-deps/vala.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/geoclue.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index 1b7f5c9..fc37a28 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-color-manager
   track: master
 depends:
+- core-deps/appstream-glib.bst
 - core-deps/colord-gtk.bst
 - core-deps/exiv2.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/libcanberra.bst
+- core-deps/vte.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libcanberra.bst
-- sdk/vte.bst
-- sdk/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index 5bcee9b..396aeb4 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 886a8dc..a5330cc 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -7,10 +7,15 @@ 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
@@ -20,18 +25,13 @@ 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 8dd84f9..c83c0dc 100644
--- a/elements/core/gnome-desktop.bst
+++ b/elements/core/gnome-desktop.bst
@@ -4,13 +4,11 @@ sources:
   url: git_gnome_org:gnome-desktop
   track: master
 depends:
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-tools.bst
+- core/gsettings-desktop-schemas.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 1428029..39dbcf6 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-disk-utility
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/libdvdread.bst
+- core-deps/libnotify.bst
+- core-deps/libsecret.bst
 - core-deps/pwquality.bst
 - core-deps/udisks2.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-settings-daemon.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libnotify.bst
-- sdk/libsecret.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-documents.bst b/elements/core/gnome-documents.bst
index 10879c5..6bb9596 100644
--- a/elements/core/gnome-documents.bst
+++ b/elements/core/gnome-documents.bst
@@ -4,21 +4,21 @@ sources:
   url: git_gnome_org:gnome-documents
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/gjs.bst
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgdata.bst
 - core-deps/libgepub.bst
 - core-deps/libzapojit.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
+- core/adwaita-icon-theme.bst
 - core/evince.bst
 - core/gnome-desktop.bst
-- sdk/WebKitGTK+.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/gjs.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
 - filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/gnome-font-viewer.bst b/elements/core/gnome-font-viewer.bst
index b40acef..033cd63 100644
--- a/elements/core/gnome-font-viewer.bst
+++ b/elements/core/gnome-font-viewer.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-font-viewer
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-getting-started-docs.bst b/elements/core/gnome-getting-started-docs.bst
index b72d0ff..a445c2f 100644
--- a/elements/core/gnome-getting-started-docs.bst
+++ b/elements/core/gnome-getting-started-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-getting-started-docs
   track: master
 depends:
-- sdk/yelp-tools.bst
+- core-deps/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 7289ec5..1781243 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 b67110e..9b06ef6 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -4,10 +4,8 @@ sources:
   url: git_gnome_org:gnome-keyring
   track: master
 depends:
-- sdk/gcr.bst
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gtk+-3.bst
+- core-deps/gcr.bst
+- core-deps/glib.bst
+- core-deps/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 7dba374..a5bb726 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-logs
   track: master
 depends:
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- 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
 - 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 3b32308..a61a28a 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 50c7004..d182bb7 100644
--- a/elements/core/gnome-menus.bst
+++ b/elements/core/gnome-menus.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gnome-menus
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gnome-common.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/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 40c2ba2..565c225 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -4,16 +4,16 @@ sources:
   url: git_gnome_org:gnome-music
   track: master
 depends:
+- core-deps/gobject-introspection.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
+- core-deps/gtk+-3.bst
 - core-deps/libdazzle.bst
 - core-deps/libmediaart.bst
+- core-deps/pygobject.bst
 - core-deps/tracker-miners.bst
 - core-deps/tracker.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/gvfs.bst
-- sdk/pygobject.bst
+- core/adwaita-icon-theme.bst
+- core/gvfs.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 3389c19..a0b0453 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
-- sdk/adwaita-icon-theme.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
+- core/adwaita-icon-theme.bst
+- core/gsettings-desktop-schemas.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 29fbbf2..0b36647 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-screenshot
   track: master
 depends:
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libcanberra.bst
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/libcanberra.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-session.bst b/elements/core/gnome-session.bst
index e86df9e..35ef63f 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-session
   track: master
 depends:
+- core-deps/gtk+-3.bst
+- core-deps/json-glib.bst
 - core-deps/upower.bst
 - core-deps/xmlto.bst
 - core/gnome-desktop.bst
-- sdk/gtk+-3.bst
-- sdk/json-glib.bst
 - filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-sm.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index cc42ff3..90cadad 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -7,20 +7,20 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/PackageKit.bst
 - core-deps/colord.bst
+- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/ibus.bst
+- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
 - core-deps/libgweather.bst
+- core-deps/libnotify.bst
+- core-deps/librsvg.bst
 - core-deps/libwacom.bst
 - core-deps/upower.bst
 - core/gnome-desktop.bst
-- 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
+- core/gsettings-desktop-schemas.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 0f458cb..4275062 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 242c4f9..b9d561a 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 b34397b..b8c494b 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
-- 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
+- core/gsettings-desktop-schemas.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 238905d..39f3cf6 100644
--- a/elements/core/gnome-system-monitor.bst
+++ b/elements/core/gnome-system-monitor.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-system-monitor
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtkmm-3.bst
 - core-deps/libgtop.bst
+- core-deps/librsvg.bst
 - core-deps/polkit.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-terminal.bst b/elements/core/gnome-terminal.bst
index 9063bd4..ba92043 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:gnome-terminal
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/dconf.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vte.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-shell.bst
+- core/gsettings-desktop-schemas.bst
 - core/nautilus.bst
-- sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
-- sdk/dconf.bst
-- sdk/glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vte.bst
-- sdk/yelp-tools.bst
 - filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/sdk/gnome-themes-extra.bst b/elements/core/gnome-themes-extra.bst
similarity index 73%
rename from elements/sdk/gnome-themes-extra.bst
rename to elements/core/gnome-themes-extra.bst
index 6fdf116..ec5079b 100644
--- a/elements/sdk/gnome-themes-extra.bst
+++ b/elements/core/gnome-themes-extra.bst
@@ -4,9 +4,9 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-themes-extra.git
   track: master
 depends:
-- sdk/cantarell-fonts.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
+- core-deps/cantarell-fonts.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-user-docs.bst b/elements/core/gnome-user-docs.bst
index ea5f79f..e692f27 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-user-docs
   track: master
 depends:
-- sdk/yelp-tools.bst
+- core-deps/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 12c4242..75b1a11 100644
--- a/elements/core/gnome-user-share.bst
+++ b/elements/core/gnome-user-share.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-user-share
   track: master
 depends:
+- core-deps/gtk+-3.bst
+- core-deps/libnotify.bst
 - core/gnome-bluetooth.bst
 - core/nautilus.bst
-- sdk/gtk+-3.bst
-- sdk/libnotify.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-weather.bst b/elements/core/gnome-weather.bst
index f98a38e..e8d3128 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -4,15 +4,15 @@ sources:
   url: git_gnome_org:gnome-weather
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/geoclue.bst
+- core-deps/gjs.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgweather.bst
-- 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
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk/gsettings-desktop-schemas.bst b/elements/core/gsettings-desktop-schemas.bst
similarity index 69%
rename from elements/sdk/gsettings-desktop-schemas.bst
rename to elements/core/gsettings-desktop-schemas.bst
index 20a1b7d..d7cf9f8 100644
--- a/elements/sdk/gsettings-desktop-schemas.bst
+++ b/elements/core/gsettings-desktop-schemas.bst
@@ -4,10 +4,9 @@ sources:
   url: git_gnome_org:gsettings-desktop-schemas
   track: master
 depends:
-- sdk/glib.bst
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gnome-common.bst
+- core-deps/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gvfs.bst b/elements/core/gvfs.bst
new file mode 100644
index 0000000..6840acd
--- /dev/null
+++ b/elements/core/gvfs.bst
@@ -0,0 +1,29 @@
+kind: meson
+sources:
+- kind: git
+  url: git_gnome_org:gvfs
+  track: master
+depends:
+- core-deps/avahi.bst
+- core-deps/fuse.bst
+- core-deps/gcr.bst
+- core-deps/glib.bst
+- core-deps/gnome-online-accounts.bst
+- core-deps/libbluray.bst
+- core-deps/libcdio-paranoia.bst
+- core-deps/libgdata.bst
+- core-deps/libgphoto2.bst
+- core-deps/libgudev.bst
+- core-deps/libimobiledevice.bst
+- core-deps/libmtp.bst
+- core-deps/libnfs.bst
+- core-deps/libsecret.bst
+- core-deps/libsoup.bst
+- core-deps/libusb.bst
+- core-deps/polkit.bst
+- core-deps/samba.bst
+- core-deps/udisks2.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
diff --git a/elements/core/meta-gnome-core-shell.bst b/elements/core/meta-gnome-core-shell.bst
index 084e187..27253fc 100644
--- a/elements/core/meta-gnome-core-shell.bst
+++ b/elements/core/meta-gnome-core-shell.bst
@@ -3,7 +3,9 @@
 # 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
@@ -17,8 +19,11 @@ 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
@@ -26,10 +31,5 @@ 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 fcd5c67..aa35e65 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
-- sdk/yelp.bst
+- core/yelp.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/mousetweaks.bst b/elements/core/mousetweaks.bst
index 1860f96..44458c2 100644
--- a/elements/core/mousetweaks.bst
+++ b/elements/core/mousetweaks.bst
@@ -4,10 +4,8 @@ sources:
   url: git_gnome_org:mousetweaks
   track: master
 depends:
-- filename: sdk/gnome-common.bst
-  type: build
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
+- core-deps/gtk+-3.bst
+- core/gsettings-desktop-schemas.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 9b5effb..17814ad 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -4,20 +4,20 @@ sources:
   url: git_gnome_org:mutter
   track: master
 depends:
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
+- core-deps/gtk-doc.bst
+- core-deps/json-glib.bst
 - core-deps/libgudev.bst
 - core-deps/libinput.bst
+- core-deps/pango.bst
 - core-deps/upower.bst
+- core-deps/wayland.bst
+- core-deps/zenity.bst
 - core/gnome-desktop.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/gtk-doc.bst
-- sdk/json-glib.bst
-- sdk/pango.bst
-- sdk/wayland.bst
-- sdk/zenity.bst
+- core/gsettings-desktop-schemas.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 8c614d6..afd46a4 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
-- sdk/adwaita-icon-theme.bst
-- sdk/glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/pango.bst
+- core/gsettings-desktop-schemas.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 cff8648..df69332 100644
--- a/elements/core/network-manager-applet.bst
+++ b/elements/core/network-manager-applet.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:network-manager-applet
   track: master
 depends:
-- core-deps/ModemManager.bst
 - core-deps/NetworkManager.bst
+- core-deps/glib.bst
+- core-deps/ModemManager.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.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 f859ef0..9bed75d 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:orca
   track: master
 depends:
+- core-deps/at-spi2-atk.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - core-deps/pyatspi2.bst
+- core-deps/pygobject.bst
 - core-deps/speech-dispatcher.bst
-- sdk/at-spi2-atk.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
-- sdk/pygobject.bst
-- sdk/yelp-tools.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index a5250e1..8b4706a 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
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index d6df61b..78e7ee1 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
-- sdk/adwaita-icon-theme.bst
-- sdk/gdk-pixbuf.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core/adwaita-icon-theme.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 7a36c8b..cf92c0c 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -4,17 +4,17 @@ sources:
   url: git_gnome_org:sushi
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/gjs.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
 - core-deps/libmusicbrainz.bst
 - core/evince.bst
-- sdk/WebKitGTK+.bst
-- sdk/clutter-gst.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
-- sdk/gjs.bst
-- sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 0b2f37d..9a1079e 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -4,25 +4,25 @@ sources:
   url: git_gnome_org:totem
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/glib.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
+- core-deps/gst-plugins-bad.bst
+- core-deps/gst-plugins-base.bst
+- core-deps/gst-plugins-good.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk+-3.bst
 - core-deps/libpeas.bst
 - core-deps/totem-pl-parser.bst
+- core-deps/yelp-tools.bst
+- core/adwaita-icon-theme.bst
 - core/gnome-desktop.bst
-- 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
+- core/gsettings-desktop-schemas.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/vino.bst b/elements/core/vino.bst
index 85ecde7..c5731fa 100644
--- a/elements/core/vino.bst
+++ b/elements/core/vino.bst
@@ -5,11 +5,11 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/libnotify.bst
-- sdk/libsecret.bst
-- sdk/libsoup.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/libnotify.bst
+- core-deps/libsecret.bst
+- core-deps/libsoup.bst
 - filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/xorg-lib-sm.bst
diff --git a/elements/core/yelp.bst b/elements/core/yelp.bst
new file mode 100644
index 0000000..a507a8d
--- /dev/null
+++ b/elements/core/yelp.bst
@@ -0,0 +1,14 @@
+kind: autotools
+sources:
+- kind: git
+  url: git_gnome_org:yelp
+  track: master
+depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-xsl.bst
+- core/adwaita-icon-theme.bst
+- filename: base.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index 0c19267..db96fc7 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:accerciser
   track: master
 depends:
+- core-deps/at-spi2-atk.bst
+- core-deps/gtk+-3.bst
+- core-deps/pycairo.bst
 - core-deps/pyatspi2.bst
-- sdk/at-spi2-atk.bst
-- sdk/gtk+-3.bst
-- sdk/pycairo.bst
-- sdk/pygobject.bst
-- sdk/yelp-tools.bst
+- core-deps/pygobject.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index f319805..8b6b82f 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:bijiben
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/appstream-glib.bst
+- core-deps/clutter-gtk.bst
 - core-deps/evolution-data-server.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/tracker.bst
-- sdk/WebKitGTK+.bst
-- sdk/appstream-glib.bst
-- sdk/clutter-gtk.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/dconf-editor.bst b/elements/world/dconf-editor.bst
index ecc3a40..f9574a6 100644
--- a/elements/world/dconf-editor.bst
+++ b/elements/world/dconf-editor.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:dconf-editor
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/dconf.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/appstream-glib.bst
+- core-deps/dconf.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/devhelp.bst b/elements/world/devhelp.bst
index bf587df..9828564 100644
--- a/elements/world/devhelp.bst
+++ b/elements/world/devhelp.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:devhelp
   track: master
 depends:
-- sdk/WebKitGTK+.bst
-- sdk/appstream-glib.bst
-- sdk/gsettings-desktop-schemas.bst
-- sdk/gtk+-3.bst
-- sdk/gtk-doc.bst
+- core-deps/WebKitGTK+.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/gtk-doc.bst
+- core/gsettings-desktop-schemas.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 36cf695..96b0430 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -4,25 +4,25 @@ sources:
   url: git_gnome_org:evolution
   track: master
 depends:
+- core-deps/WebKitGTK+.bst
+- core-deps/atk.bst
 - core-deps/evolution-data-server.bst
+- core-deps/gcr.bst
+- core-deps/gdk-pixbuf.bst
+- core-deps/geoclue.bst
 - core-deps/geocode-glib.bst
+- core-deps/glib.bst
 - core-deps/gnome-autoar.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/gstreamer.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
+- core-deps/libnotify.bst
+- core-deps/libsoup.bst
+- core-deps/yelp-tools.bst
 - core/gnome-desktop.bst
-- 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
+- core/gsettings-desktop-schemas.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 9a314da..c48e46c 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:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/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 6000bd8..426393b 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:four-in-a-row
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/ghex.bst b/elements/world/ghex.bst
index d738b63..0637381 100644
--- a/elements/world/ghex.bst
+++ b/elements/world/ghex.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:ghex
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index 4c77f69..c8cbd92 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -4,18 +4,18 @@ sources:
   url: git_gnome_org:gitg
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
+- core-deps/json-glib.bst
 - core-deps/libgee.bst
 - core-deps/libpeas.bst
-- 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
+- core-deps/libsecret.bst
+- core-deps/libsoup.bst
+- core-deps/pygobject.bst
+- core-deps/vala.bst
+- core/gsettings-desktop-schemas.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 39466e2..97274c2 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -4,7 +4,7 @@ sources:
   url: git_gnome_org:glade
   track: master
 depends:
-- filename: sdk/adwaita-icon-theme.bst
+- core-deps/gtk+-3.bst
+- core-deps/gnome-common.bst
+- filename: core/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 905d616..37a1cb4 100644
--- a/elements/world/gnome-builder.bst
+++ b/elements/world/gnome-builder.bst
@@ -4,18 +4,18 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-builder.git
   track: master
 depends:
+- core-deps/gjs.bst
+- core-deps/glib.bst
 - core-deps/gspell.bst
+- core-deps/gtk+-3.bst
 - core-deps/gtksourceview-3.bst
 - core-deps/libdazzle.bst
 - core-deps/libpeas.bst
-- 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
+- core-deps/librsvg.bst
+- core-deps/pygobject.bst
+- core-deps/vala.bst
+- core-deps/vte.bst
+- core/gvfs.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 be12a80..a0268b3 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-chess
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 7156d29..dabbc75 100644
--- a/elements/world/gnome-code-assistance.bst
+++ b/elements/world/gnome-code-assistance.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-code-assistance
   track: master
 depends:
-- sdk/vala.bst
+- core-deps/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 60d45ca..0064e07 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:gnome-devel-docs
   track: master
 depends:
-- sdk/yelp-tools.bst
+- core-deps/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 f0958fb..9ef1b94 100644
--- a/elements/world/gnome-dictionary.bst
+++ b/elements/world/gnome-dictionary.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:gnome-dictionary
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index eee5e12..ca688ad 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-klotski
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/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 54eaeca..e7b7fc3 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-mahjongg
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 11269f2..56f8220 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-mines
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 c5ca60b..3a8888a 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-multi-writer
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgusb.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-nettool.bst b/elements/world/gnome-nettool.bst
index 1e088d2..9947d70 100644
--- a/elements/world/gnome-nettool.bst
+++ b/elements/world/gnome-nettool.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:gnome-nettool
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgtop.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/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 a2faec7..d978de6 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -4,14 +4,14 @@ sources:
   url: git_gnome_org:gnome-nibbles
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgee.bst
-- 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
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 49bef2b..9142db9 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
-- sdk/gtk+-3.bst
+- core-deps/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 8a9aed7..c0778eb 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-robots
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/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 68c3431..e4ed8f7 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-sound-recorder
   track: master
 depends:
-- 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
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-sudoku.bst b/elements/world/gnome-sudoku.bst
index 42113ca..fa005eb 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:gnome-sudoku
   track: master
 depends:
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/json-glib.bst
 - core-deps/libgee.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/json-glib.bst
-- sdk/yelp-tools.bst
+- core-deps/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 d71fcd9..2fd9f26 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-taquin
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 6b9a6f8..b4214aa 100644
--- a/elements/world/gnome-tetravex.bst
+++ b/elements/world/gnome-tetravex.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:gnome-tetravex
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 222a68f..1a5fe49 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:gnome-todo
   track: master
 depends:
+- core-deps/appstream-glib.bst
 - core-deps/evolution-data-server.bst
+- core-deps/glib.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/gtk+-3.bst
 - core-deps/libpeas.bst
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-tweaks.bst b/elements/world/gnome-tweaks.bst
index 21a4a33..17274d0 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 4f4b642..4e58a54 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:hitori
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/yelp-tools.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/iagno.bst b/elements/world/iagno.bst
index 6281290..c72888e 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -4,10 +4,10 @@ sources:
   url: git_gnome_org:iagno
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/vala.bst
+- core-deps/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 2576024..aa854ef 100644
--- a/elements/world/jsonrpc-glib.bst
+++ b/elements/world/jsonrpc-glib.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/jsonrpc-glib.git
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/json-glib.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/json-glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgit2-glib.bst b/elements/world/libgit2-glib.bst
index 6ad627f..ff44f3d 100644
--- a/elements/world/libgit2-glib.bst
+++ b/elements/world/libgit2-glib.bst
@@ -4,8 +4,8 @@ sources:
   url: git_gnome_org:libgit2-glib
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - world/libgit2.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgnome-games-support.bst b/elements/world/libgnome-games-support.bst
index 7582d76..2afe186 100644
--- a/elements/world/libgnome-games-support.bst
+++ b/elements/world/libgnome-games-support.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:libgnome-games-support
   track: master
 depends:
+- core-deps/glib.bst
+- core-deps/gtk+-3.bst
 - core-deps/libgee.bst
-- sdk/glib.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
+- core-deps/vala.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libmanette.bst b/elements/world/libmanette.bst
index 55b04b3..ed15995 100644
--- a/elements/world/libmanette.bst
+++ b/elements/world/libmanette.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:aplazas/libmanette.git
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index 9134401..1b987c7 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -4,12 +4,12 @@ sources:
   url: git_gnome_org:lightsoff
   track: master
 depends:
-- 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
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/nautilus-sendto.bst b/elements/world/nautilus-sendto.bst
index ccc052a..dc3ccdd 100644
--- a/elements/world/nautilus-sendto.bst
+++ b/elements/world/nautilus-sendto.bst
@@ -4,6 +4,6 @@ sources:
   url: git_gnome_org:nautilus-sendto
   track: master
 depends:
-- sdk/glib.bst
+- core-deps/glib.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/polari.bst b/elements/world/polari.bst
index edc7657..7b3c8ef 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
-- sdk/appstream-glib.bst
-- sdk/gjs.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk+-3.bst
+- core-deps/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 bea7231..d8fdf40 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -4,13 +4,13 @@ sources:
   url: git_gnome_org:quadrapassel
   track: master
 depends:
-- 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
+- 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
 - world/libmanette.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index 0dd3bf4..88cc4d5 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -4,11 +4,11 @@ sources:
   url: git_gnome_org:swell-foop
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
-- sdk/gtk+-3.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
+- 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
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/tali.bst b/elements/world/tali.bst
index beb0875..eb194e6 100644
--- a/elements/world/tali.bst
+++ b/elements/world/tali.bst
@@ -4,9 +4,9 @@ sources:
   url: git_gnome_org:tali
   track: master
 depends:
-- sdk/appstream-glib.bst
-- sdk/gtk+-3.bst
-- sdk/librsvg.bst
-- sdk/yelp-tools.bst
+- core-deps/appstream-glib.bst
+- core-deps/gtk+-3.bst
+- core-deps/librsvg.bst
+- core-deps/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 c3f0b83..8fdc253 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
-- sdk/dbus-glib.bst
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
+- core-deps/dbus-glib.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/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 9146f34..538d6fc 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:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
+- core-deps/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 04bf140..cb4c537 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
-- sdk/glib.bst
-- sdk/gtk-doc.bst
+- core-deps/glib.bst
+- core-deps/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 d27fb35..ffa8a5c 100644
--- a/elements/world/template-glib.bst
+++ b/elements/world/template-glib.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/template-glib.git
   track: master
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- core-deps/glib.bst
+- core-deps/gobject-introspection.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/project.conf b/project.conf
index 9a4de94..64e32e4 100644
--- a/project.conf
+++ b/project.conf
@@ -118,25 +118,6 @@ elements:
     variables:
       meson-extra: --buildtype=debugoptimized -Dgtk_doc=false
 
-split-rules:
-  devel:
-  - "%{includedir}"
-  - "%{includedir}/**"
-  - "%{libdir}/pkgconfig"
-  - "%{libdir}/pkgconfig/**"
-  - "%{datadir}/pkgconfig"
-  - "%{datadir}/pkgconfig/**"
-  - "%{datadir}/aclocal"
-  - "%{datadir}/aclocal/**"
-  - "%{prefix}/lib/cmake"
-  - "%{prefix}/lib/cmake/**"
-  - "%{libdir}/cmake"
-  - "%{libdir}/cmake/**"
-  - "%{prefix}/lib/*.a"
-  - "%{libdir}/*.a"
-  debug:
-  - "%{debugdir}/**"
-
 # Define some behavior for `bst shell`
 #
 shell:
@@ -194,23 +175,9 @@ variables:
   abi: "gnu"
   gcc_triplet: "%{gcc_arch}-linux-%{abi}"
   lib: "lib/%{gcc_triplet}"
-  sbindir: "%{bindir}"
-  sysconfdir: "%{prefix}/etc"
-  localstatedir: "%{prefix}/var"
-  indep-libdir: "%{prefix}/lib"
-  debugdir: "%{indep-libdir}/debug"
 
   (?):
     - arch == "i386":
         gcc_arch: "i386"
     - arch == "arm":
         abi: "gnueabihf"
-
-  branch: next
-
-plugins:
-# bst-external README recommends including them as a submodule
-- origin: local
-  path: bst-external/bst_external/elements
-  elements:
-    flatpak_image: 0


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