[gnome-build-meta] Revert "use a master snapshot of freedesktop-sdk"



commit 396b525bca72e752be59e45fd8b0d890476418df
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Jun 22 12:45:53 2019 -0500

    Revert "use a master snapshot of freedesktop-sdk"
    
    This reverts commit 0178eb1b319881a5d34cba34ff92a0a9aee98859.

 elements/core-deps/ModemManager.bst                |   4 +-
 elements/core-deps/NetworkManager.bst              |   8 +-
 elements/core-deps/PackageKit.bst                  |   8 +-
 elements/core-deps/accountsservice.bst             |   6 +-
 elements/core-deps/atkmm-1.6.bst                   |   6 +-
 elements/core-deps/atkmm.bst                       |   6 +-
 elements/core-deps/avahi.bst                       |   6 +-
 elements/core-deps/babl.bst                        |   6 +-
 elements/core-deps/berkeleydb.bst                  |   4 +-
 elements/core-deps/blockdev.bst                    |   6 +-
 elements/core-deps/boost.bst                       |   2 +-
 elements/core-deps/cairomm-1.0.bst                 |   6 +-
 elements/core-deps/cairomm.bst                     |   6 +-
 elements/core-deps/colord-gtk.bst                  |   8 +-
 elements/core-deps/colord.bst                      |   4 +-
 elements/core-deps/cryptsetup.bst                  |   4 +-
 elements/core-deps/dmraid.bst                      |   4 +-
 elements/core-deps/dotconf.bst                     |   4 +-
 elements/core-deps/espeak.bst                      |   2 +-
 elements/core-deps/evolution-data-server.bst       |   8 +-
 elements/core-deps/exempi.bst                      |   4 +-
 elements/core-deps/exiv2.bst                       |   4 +-
 elements/core-deps/folks.bst                       |   4 +-
 elements/core-deps/font-util.bst                   |   6 +-
 elements/core-deps/fontenc.bst                     |   6 +-
 elements/core-deps/gegl.bst                        |   4 +-
 elements/core-deps/geocode-glib.bst                |   4 +-
 elements/core-deps/gexiv2.bst                      |   4 +-
 elements/core-deps/glibmm-2.4.bst                  |   6 +-
 elements/core-deps/glibmm.bst                      |   6 +-
 elements/core-deps/gmime3.bst                      |   4 +-
 elements/core-deps/gnome-autoar.bst                |   4 +-
 elements/core-deps/gnome-online-accounts.bst       |   4 +-
 elements/core-deps/gnome-online-miners.bst         |   4 +-
 elements/core-deps/gnome-video-effects.bst         |  10 +-
 elements/core-deps/gom.bst                         |   4 +-
 elements/core-deps/graphviz.bst                    |   4 +-
 elements/core-deps/grilo-plugins.bst               |   6 +-
 elements/core-deps/grilo.bst                       |   4 +-
 elements/core-deps/gsound.bst                      |   4 +-
 elements/core-deps/gspell.bst                      |   4 +-
 elements/core-deps/gssdp.bst                       |   4 +-
 elements/core-deps/gtk-vnc.bst                     |   8 +-
 elements/core-deps/gtkmm-3.bst                     |   6 +-
 elements/core-deps/gtkmm.bst                       |   5 +-
 elements/core-deps/gtksourceview.bst               |   4 +-
 elements/core-deps/gupnp-av.bst                    |   4 +-
 elements/core-deps/gupnp-dlna.bst                  |   6 +-
 elements/core-deps/gupnp.bst                       |   4 +-
 elements/core-deps/iptables.bst                    |   4 +-
 elements/core-deps/json-c.bst                      |   4 +-
 elements/core-deps/kmod.bst                        |   4 +-
 elements/core-deps/libatasmart.bst                 |   6 +-
 elements/core-deps/libbytesize.bst                 |   4 +-
 elements/core-deps/libchamplain.bst                |   4 +-
 elements/core-deps/libcue.bst                      |   6 +-
 elements/core-deps/libdaemon.bst                   |   4 +-
 elements/core-deps/libdazzle.bst                   |   4 +-
 elements/core-deps/libdvdread.bst                  |   4 +-
 elements/core-deps/libevdev.bst                    |   4 +-
 elements/core-deps/libgdata.bst                    |   4 +-
 elements/core-deps/libgepub.bst                    |   4 +-
 elements/core-deps/libgfbgraph.bst                 |   6 +-
 elements/core-deps/libgnomekbd.bst                 |   4 +-
 elements/core-deps/libgovirt.bst                   |   4 +-
 elements/core-deps/libgsf.bst                      |   6 +-
 elements/core-deps/libgtop.bst                     |   6 +-
 elements/core-deps/libgudev.bst                    |   6 +-
 elements/core-deps/libgusb.bst                     |   4 +-
 elements/core-deps/libgweather.bst                 |   4 +-
 elements/core-deps/libgxps.bst                     |   4 +-
 elements/core-deps/libhandy.bst                    |   6 +-
 elements/core-deps/libical.bst                     |   9 +-
 elements/core-deps/libinput.bst                    |   4 +-
 elements/core-deps/libmbim.bst                     |   4 +-
 elements/core-deps/libmediaart.bst                 |   4 +-
 elements/core-deps/libmusicbrainz.bst              |   4 +-
 elements/core-deps/libndp.bst                      |   4 +-
 elements/core-deps/libnl.bst                       |   6 +-
 elements/core-deps/liboauth.bst                    |   4 +-
 elements/core-deps/libosinfo.bst                   |   6 +-
 elements/core-deps/libpeas.bst                     |   8 +-
 elements/core-deps/libqmi.bst                      |   4 +-
 elements/core-deps/librest.bst                     |   4 +-
 elements/core-deps/libsass.bst                     |   4 +-
 elements/core-deps/libsigcplusplus-2.0.bst         |   4 +-
 elements/core-deps/libsigcplusplus.bst             |   4 +-
 elements/core-deps/libusb.bst                      |   6 +-
 elements/core-deps/libvirt-glib.bst                |   6 +-
 elements/core-deps/libvirt.bst                     |   4 +-
 elements/core-deps/libwacom.bst                    |   4 +-
 elements/core-deps/libxklavier.bst                 |  10 +-
 elements/core-deps/libyaml.bst                     |   4 +-
 elements/core-deps/libzapojit.bst                  |   8 +-
 elements/core-deps/lvm2.bst                        |   4 +-
 elements/core-deps/mm-common.bst                   |   4 +-
 .../core-deps/mobile-broadband-provider-info.bst   |   4 +-
 elements/core-deps/mpc.bst                         |   4 +-
 elements/core-deps/mpfr.bst                        |   4 +-
 elements/core-deps/mtdev.bst                       |   4 +-
 elements/core-deps/ndctl.bst                       |   6 +-
 elements/core-deps/neon.bst                        |   4 +-
 elements/core-deps/openldap.bst                    |   6 +-
 elements/core-deps/osinfo-db-tools.bst             |   6 +-
 elements/core-deps/pangomm-1.4.bst                 |   6 +-
 elements/core-deps/pangomm.bst                     |   6 +-
 elements/core-deps/parted.bst                      |   4 +-
 elements/core-deps/phodav.bst                      |  10 +-
 elements/core-deps/polkit.bst                      |  10 +-
 elements/core-deps/poppler.bst                     |  10 +-
 elements/core-deps/portablexdr.bst                 |   4 +-
 elements/core-deps/portaudio.bst                   |   4 +-
 elements/core-deps/ppp.bst                         |   7 +-
 elements/core-deps/pwquality.bst                   |   4 +-
 elements/core-deps/pyatspi2.bst                    |   4 +-
 elements/core-deps/rpcsvc-proto.bst                |   4 +-
 elements/core-deps/samba.bst                       |   8 +-
 elements/core-deps/sane-backends.bst               |   4 +-
 elements/core-deps/sassc.bst                       |   4 +-
 elements/core-deps/speech-dispatcher.bst           |   6 +-
 elements/core-deps/spice-gtk.bst                   |   4 +-
 elements/core-deps/spice-protocol.bst              |   4 +-
 elements/core-deps/startup-notification.bst        |   8 +-
 elements/core-deps/totem-pl-parser.bst             |   4 +-
 elements/core-deps/tracker-miners.bst              |  10 +-
 elements/core-deps/tracker.bst                     |   4 +-
 elements/core-deps/udisks2.bst                     |   6 +-
 elements/core-deps/uhttpmock.bst                   |   4 +-
 elements/core-deps/upower.bst                      |   6 +-
 elements/core-deps/volume-key.bst                  |   4 +-
 elements/core-deps/xfont2.bst                      |   6 +-
 elements/core-deps/xmlb.bst                        |   4 +-
 elements/core-deps/xmlto.bst                       |   4 +-
 elements/core-deps/xorg-server.bst                 |  24 +-
 elements/core/baobab.bst                           |   6 +-
 elements/core/cheese.bst                           |   8 +-
 elements/core/eog.bst                              |   6 +-
 elements/core/epiphany.bst                         |   6 +-
 elements/core/evince.bst                           |   4 +-
 elements/core/file-roller.bst                      |   6 +-
 elements/core/gdm.bst                              |   4 +-
 elements/core/gedit.bst                            |  10 +-
 elements/core/gnome-backgrounds.bst                |   4 +-
 elements/core/gnome-bluetooth.bst                  |   6 +-
 elements/core/gnome-boxes.bst                      |   6 +-
 elements/core/gnome-calculator.bst                 |   6 +-
 elements/core/gnome-calendar.bst                   |   4 +-
 elements/core/gnome-characters.bst                 |   6 +-
 elements/core/gnome-clocks.bst                     |   6 +-
 elements/core/gnome-color-manager.bst              |   6 +-
 elements/core/gnome-contacts.bst                   |   6 +-
 elements/core/gnome-control-center.bst             |   6 +-
 elements/core/gnome-desktop.bst                    |   8 +-
 elements/core/gnome-disk-utility.bst               |   4 +-
 elements/core/gnome-font-viewer.bst                |   4 +-
 elements/core/gnome-getting-started-docs.bst       |   4 +-
 elements/core/gnome-initial-setup.bst              |   6 +-
 elements/core/gnome-keyring.bst                    |   8 +-
 elements/core/gnome-logs.bst                       |   8 +-
 elements/core/gnome-maps.bst                       |   4 +-
 elements/core/gnome-menus.bst                      |   4 +-
 elements/core/gnome-music.bst                      |   6 +-
 elements/core/gnome-photos.bst                     |  10 +-
 elements/core/gnome-screenshot.bst                 |   4 +-
 elements/core/gnome-session.bst                    |  10 +-
 elements/core/gnome-settings-daemon.bst            |  12 +-
 elements/core/gnome-shell-extensions.bst           |   4 +-
 elements/core/gnome-shell.bst                      |  10 +-
 elements/core/gnome-software.bst                   |   4 +-
 elements/core/gnome-system-monitor.bst             |   6 +-
 elements/core/gnome-terminal.bst                   |   8 +-
 elements/core/gnome-user-docs.bst                  |   4 +-
 elements/core/gnome-user-share.bst                 |   4 +-
 elements/core/gnome-weather.bst                    |   4 +-
 elements/core/mutter.bst                           |  10 +-
 elements/core/nautilus.bst                         |   4 +-
 elements/core/network-manager-applet.bst           |   4 +-
 elements/core/orca.bst                             |   4 +-
 elements/core/rygel.bst                            |   4 +-
 elements/core/simple-scan.bst                      |   6 +-
 elements/core/sushi.bst                            |   6 +-
 elements/core/totem.bst                            |   8 +-
 elements/core/vino.bst                             |  12 +-
 elements/flatpak/sdk-image.bst                     |   2 +-
 elements/freedesktop-sdk.bst                       |   2 +-
 elements/sdk-platform.bst                          | 354 ++++++---------------
 elements/sdk.bst                                   |  86 +----
 elements/sdk/WebKitGTK.bst                         |  16 +-
 elements/sdk/adwaita-icon-theme.bst                |   4 +-
 elements/sdk/appstream-glib.bst                    |  12 +-
 elements/sdk/at-spi2-atk.bst                       |   4 +-
 elements/sdk/at-spi2-core.bst                      |   6 +-
 elements/sdk/atk.bst                               |   4 +-
 elements/sdk/brotli.bst                            |   4 +-
 elements/sdk/cantarell-fonts.bst                   |   4 +-
 elements/sdk/clutter-gst.bst                       |   6 +-
 elements/sdk/clutter-gtk.bst                       |   4 +-
 elements/sdk/clutter.bst                           |   8 +-
 elements/sdk/cogl.bst                              |  10 +-
 elements/sdk/dbus-glib.bst                         |   6 +-
 elements/sdk/dconf.bst                             |   8 +-
 elements/sdk/enchant-2.bst                         |   6 +-
 elements/sdk/fcitx.bst                             |   6 +-
 elements/sdk/gcab.bst                              |   6 +-
 elements/sdk/gcr.bst                               |   6 +-
 elements/sdk/gdk-pixbuf.bst                        |   8 +-
 elements/sdk/geoclue.bst                           |   4 +-
 elements/sdk/gjs.bst                               |   8 +-
 elements/sdk/glib-networking.bst                   |   6 +-
 elements/sdk/glib.bst                              |   4 +-
 elements/sdk/gnome-common.bst                      |   4 +-
 elements/sdk/gnome-themes-extra.bst                |   6 +-
 elements/sdk/gobject-introspection.bst             |   6 +-
 elements/sdk/graphene.bst                          |   4 +-
 elements/sdk/gsettings-desktop-schemas.bst         |   4 +-
 elements/sdk/gst-libav.bst                         |   6 +-
 elements/sdk/gst-plugins-bad.bst                   |  28 +-
 elements/sdk/gst-plugins-base.bst                  |  18 +-
 elements/sdk/gst-plugins-good.bst                  |  18 +-
 elements/sdk/gtk+-3.bst                            |  28 +-
 elements/sdk/gtk-doc.bst                           |   6 +-
 elements/sdk/gtk.bst                               |  18 +-
 elements/sdk/gvfs.bst                              |   6 +-
 elements/sdk/ibus.bst                              |   4 +-
 elements/sdk/json-glib.bst                         |   4 +-
 elements/sdk/libcanberra.bst                       |   6 +-
 elements/sdk/libcroco.bst                          |   4 +-
 elements/sdk/libgee.bst                            |   4 +-
 elements/sdk/libnotify.bst                         |   4 +-
 elements/sdk/librsvg.bst                           |   6 +-
 elements/sdk/libsecret.bst                         |   4 +-
 elements/sdk/libsoup.bst                           |   6 +-
 elements/sdk/libwpe.bst                            |  10 +-
 elements/sdk/mozjs60.bst                           |  10 +-
 elements/sdk/openjpeg.bst                          |   4 +-
 elements/sdk/os-release.bst                        |   2 +-
 elements/sdk/pango.bst                             |  12 +-
 elements/sdk/pycairo.bst                           |   6 +-
 elements/sdk/pygobject.bst                         |   4 +-
 elements/sdk/python-pygments.bst                   |   4 +-
 elements/sdk/python2.bst                           |  29 --
 elements/sdk/vala-tarball.bst                      |   9 +-
 elements/sdk/vala.bst                              |   8 +-
 elements/sdk/vte.bst                               |   6 +-
 elements/sdk/woff2.bst                             |   4 +-
 elements/sdk/wpebackend-fdo.bst                    |  14 +-
 elements/sdk/yelp-tools.bst                        |   6 +-
 elements/sdk/yelp-xsl.bst                          |  11 +-
 elements/sdk/yelp.bst                              |   6 +-
 elements/sdk/zenity.bst                            |   4 +-
 elements/world/accerciser.bst                      |   2 +-
 elements/world/amtk.bst                            |   2 +-
 elements/world/anthy.bst                           |   4 +-
 elements/world/bijiben.bst                         |   4 +-
 elements/world/dconf-editor.bst                    |   2 +-
 elements/world/devhelp.bst                         |   2 +-
 elements/world/evolution.bst                       |   4 +-
 elements/world/five-or-more.bst                    |   4 +-
 elements/world/four-in-a-row.bst                   |   4 +-
 elements/world/fuse.bst                            |   4 +-
 elements/world/ghex.bst                            |   4 +-
 elements/world/gitg.bst                            |   2 +-
 elements/world/gnome-builder.bst                   |   4 +-
 elements/world/gnome-chess.bst                     |   2 +-
 elements/world/gnome-code-assistance.bst           |   2 +-
 elements/world/gnome-devel-docs.bst                |   2 +-
 elements/world/gnome-dictionary.bst                |   4 +-
 elements/world/gnome-documents.bst                 |  10 +-
 elements/world/gnome-games.bst                     |   4 +-
 elements/world/gnome-internet-radio-locator.bst    |   4 +-
 elements/world/gnome-klotski.bst                   |   4 +-
 elements/world/gnome-mahjongg.bst                  |   4 +-
 elements/world/gnome-mines.bst                     |   4 +-
 elements/world/gnome-multi-writer.bst              |   2 +-
 elements/world/gnome-nettool.bst                   |   2 +-
 elements/world/gnome-nibbles.bst                   |   2 +-
 elements/world/gnome-recipes.bst                   |   4 +-
 elements/world/gnome-robots.bst                    |   2 +-
 elements/world/gnome-sound-recorder.bst            |   4 +-
 elements/world/gnome-sudoku.bst                    |   4 +-
 elements/world/gnome-taquin.bst                    |   2 +-
 elements/world/gnome-tetravex.bst                  |   4 +-
 elements/world/gnome-todo.bst                      |   2 +-
 elements/world/gnome-tweaks.bst                    |   2 +-
 elements/world/gtksourceview-3.bst                 |   6 +-
 elements/world/gtkspell.bst                        |   6 +-
 elements/world/gupnp-igd.bst                       |   4 +-
 elements/world/hitori.bst                          |   2 +-
 elements/world/iagno.bst                           |   2 +-
 elements/world/ibus-anthy.bst                      |   6 +-
 elements/world/ibus-hangul.bst                     |   8 +-
 elements/world/ibus-libpinyin.bst                  |  10 +-
 elements/world/jsonrpc-glib.bst                    |   2 +-
 elements/world/kyotocabinet.bst                    |   4 +-
 elements/world/libbluray.bst                       |   8 +-
 elements/world/libcdio-paranoia.bst                |   4 +-
 elements/world/libcdio.bst                         |   4 +-
 elements/world/libgit2-glib.bst                    |   2 +-
 elements/world/libgit2.bst                         |   2 +-
 elements/world/libgnome-games-support.bst          |   2 +-
 elements/world/libgphoto2.bst                      |   4 +-
 elements/world/libgrss.bst                         |   4 +-
 elements/world/libhangul.bst                       |   4 +-
 elements/world/libimobiledevice.bst                |   4 +-
 elements/world/libmanette.bst                      |   2 +-
 elements/world/libmtp.bst                          |   4 +-
 elements/world/libnfs.bst                          |   4 +-
 elements/world/libpinyin.bst                       |   4 +-
 elements/world/libssh2.bst                         |   2 +-
 elements/world/libusbmuxd.bst                      |   4 +-
 elements/world/lightsoff.bst                       |   4 +-
 elements/world/plist.bst                           |   4 +-
 elements/world/polari.bst                          |   4 +-
 elements/world/qqwing.bst                          |   2 +-
 elements/world/quadrapassel.bst                    |   4 +-
 elements/world/retro-gtk.bst                       |   4 +-
 elements/world/seahorse.bst                        |   4 +-
 elements/world/swell-foop.bst                      |   4 +-
 elements/world/tali.bst                            |   4 +-
 elements/world/telepathy-glib.bst                  |   2 +-
 elements/world/telepathy-logger.bst                |   2 +-
 elements/world/telepathy-mission-control.bst       |   2 +-
 elements/world/template-glib.bst                   |   2 +-
 junction.refs                                      |   2 +-
 324 files changed, 964 insertions(+), 1240 deletions(-)
---
diff --git a/elements/core-deps/ModemManager.bst b/elements/core-deps/ModemManager.bst
index b6a8dee1..95d8e897 100644
--- a/elements/core-deps/ModemManager.bst
+++ b/elements/core-deps/ModemManager.bst
@@ -10,10 +10,10 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index 5cc496de..1a2d28fc 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -14,16 +14,16 @@ depends:
   type: build
 - sdk/pygobject.bst
 - sdk/vala.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/PackageKit.bst b/elements/core-deps/PackageKit.bst
index 86a072bd..3addba4e 100644
--- a/elements/core-deps/PackageKit.bst
+++ b/elements/core-deps/PackageKit.bst
@@ -11,16 +11,16 @@ depends:
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/accountsservice.bst b/elements/core-deps/accountsservice.bst
index 2f25dc07..9e001d10 100644
--- a/elements/core-deps/accountsservice.bst
+++ b/elements/core-deps/accountsservice.bst
@@ -7,10 +7,10 @@ depends:
 - core-deps/polkit.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/atkmm-1.6.bst b/elements/core-deps/atkmm-1.6.bst
index 82768f30..77ad81cd 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -6,13 +6,13 @@ sources:
 depends:
 - core-deps/glibmm-2.4.bst
 - sdk/atk.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/atkmm.bst b/elements/core-deps/atkmm.bst
index fc0e6963..90a19d2f 100644
--- a/elements/core-deps/atkmm.bst
+++ b/elements/core-deps/atkmm.bst
@@ -6,13 +6,13 @@ sources:
 depends:
 - core-deps/glibmm.bst
 - sdk/atk.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/avahi.bst b/elements/core-deps/avahi.bst
index 02ae2d40..7ee0e683 100644
--- a/elements/core-deps/avahi.bst
+++ b/elements/core-deps/avahi.bst
@@ -5,13 +5,13 @@ sources:
 depends:
 - core-deps/libdaemon.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/babl.bst b/elements/core-deps/babl.bst
index 111212e6..fc9041df 100644
--- a/elements/core-deps/babl.bst
+++ b/elements/core-deps/babl.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/babl.git
   track: master
 depends:
-- filename: components/git-minimal.bst
+- filename: base/git-minimal.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/berkeleydb.bst b/elements/core-deps/berkeleydb.bst
index 88ac502d..5645001d 100644
--- a/elements/core-deps/berkeleydb.bst
+++ b/elements/core-deps/berkeleydb.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: http://http.debian.net/debian/pool/main/d/db5.3/db5.3_5.3.28.orig.tar.xz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: dist/
diff --git a/elements/core-deps/blockdev.bst b/elements/core-deps/blockdev.bst
index 238297e3..f02850e0 100644
--- a/elements/core-deps/blockdev.bst
+++ b/elements/core-deps/blockdev.bst
@@ -12,10 +12,10 @@ depends:
 - core-deps/ndctl.bst
 - core-deps/parted.bst
 - core-deps/volume-key.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/boost.bst b/elements/core-deps/boost.bst
index c19bfddd..7bfcc438 100644
--- a/elements/core-deps/boost.bst
+++ b/elements/core-deps/boost.bst
@@ -3,7 +3,7 @@ sources:
 - kind: tar
   url: https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2
 depends:
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 config:
   configure-commands:
diff --git a/elements/core-deps/cairomm-1.0.bst b/elements/core-deps/cairomm-1.0.bst
index d8fb8c1c..8932a877 100644
--- a/elements/core-deps/cairomm-1.0.bst
+++ b/elements/core-deps/cairomm-1.0.bst
@@ -4,12 +4,12 @@ sources:
   url: cairo_org:releases/cairomm-1.13.1.tar.gz
 depends:
 - core-deps/libsigcplusplus-2.0.bst
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build
diff --git a/elements/core-deps/cairomm.bst b/elements/core-deps/cairomm.bst
index f3665922..f3ee1480 100644
--- a/elements/core-deps/cairomm.bst
+++ b/elements/core-deps/cairomm.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 depends:
 - core-deps/libsigcplusplus.bst
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/colord-gtk.bst b/elements/core-deps/colord-gtk.bst
index 3923d421..e0137ebd 100644
--- a/elements/core-deps/colord-gtk.bst
+++ b/elements/core-deps/colord-gtk.bst
@@ -10,16 +10,16 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/colord.bst b/elements/core-deps/colord.bst
index 3a00db89..5004133f 100644
--- a/elements/core-deps/colord.bst
+++ b/elements/core-deps/colord.bst
@@ -12,10 +12,10 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/cryptsetup.bst b/elements/core-deps/cryptsetup.bst
index 7ae80b17..ccca9853 100644
--- a/elements/core-deps/cryptsetup.bst
+++ b/elements/core-deps/cryptsetup.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - core-deps/json-c.bst
 - core-deps/lvm2.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/dmraid.bst b/elements/core-deps/dmraid.bst
index ce55d3e7..8b08384d 100644
--- a/elements/core-deps/dmraid.bst
+++ b/elements/core-deps/dmraid.bst
@@ -5,10 +5,10 @@ sources:
   base-dir: dmraid/1.0.0.rc16-3/dmraid
 depends:
 - core-deps/lvm2.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   make: make -j1
diff --git a/elements/core-deps/dotconf.bst b/elements/core-deps/dotconf.bst
index fe0d44b0..41611da7 100644
--- a/elements/core-deps/dotconf.bst
+++ b/elements/core-deps/dotconf.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:williamh/dotconf/archive/v1.3.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/espeak.bst b/elements/core-deps/espeak.bst
index f54bad70..c62716e0 100644
--- a/elements/core-deps/espeak.bst
+++ b/elements/core-deps/espeak.bst
@@ -4,7 +4,7 @@ sources:
   url: downloads.sourceforge.net:espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
 depends:
 - core-deps/portaudio.bst
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 config:
   configure-commands:
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index cbbe5de7..6b8f0575 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -16,16 +16,16 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
-- filename: components/gperf.bst
+- filename: base/gperf.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/core-deps/exempi.bst b/elements/core-deps/exempi.bst
index d996dc9b..5c86099c 100644
--- a/elements/core-deps/exempi.bst
+++ b/elements/core-deps/exempi.bst
@@ -4,8 +4,8 @@ sources:
   url: https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.bz2
 depends:
 - core-deps/boost.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/exiv2.bst b/elements/core-deps/exiv2.bst
index 2b27f01c..30901aab 100644
--- a/elements/core-deps/exiv2.bst
+++ b/elements/core-deps/exiv2.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:Exiv2/exiv2/archive/v0.26.tar.gz
 depends:
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/folks.bst b/elements/core-deps/folks.bst
index 8e8271ba..50b73e15 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -9,10 +9,10 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/libgee.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/font-util.bst b/elements/core-deps/font-util.bst
index de1705e6..c18cdb58 100644
--- a/elements/core-deps/font-util.bst
+++ b/elements/core-deps/font-util.bst
@@ -3,11 +3,11 @@ sources:
 - kind: tar
   url: https://www.x.org/releases/individual/font/font-util-1.3.1.tar.bz2
 depends:
-- filename: components/xorg-proto-xorgproto.bst
+- filename: desktop/xorg-proto-xorgproto.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/fontenc.bst b/elements/core-deps/fontenc.bst
index 555c9b9f..c7795c3a 100644
--- a/elements/core-deps/fontenc.bst
+++ b/elements/core-deps/fontenc.bst
@@ -3,11 +3,11 @@ sources:
 - kind: tar
   url: https://www.x.org/releases/individual/lib/libfontenc-1.1.3.tar.bz2
 depends:
-- filename: components/xorg-proto-xorgproto.bst
+- filename: desktop/xorg-proto-xorgproto.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 298feef7..3650f3f0 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/json-glib.bst
 - sdk/librsvg.bst
 - sdk/pango.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/geocode-glib.bst b/elements/core-deps/geocode-glib.bst
index b1fe486a..9cc6cd41 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -10,8 +10,8 @@ depends:
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gexiv2.bst b/elements/core-deps/gexiv2.bst
index 1e79a2ca..7df439d2 100644
--- a/elements/core-deps/gexiv2.bst
+++ b/elements/core-deps/gexiv2.bst
@@ -4,10 +4,10 @@ sources:
   url: gnome_downloads:gexiv2/0.12/gexiv2-0.12.0.tar.xz
 depends:
 - core-deps/exiv2.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/glibmm-2.4.bst b/elements/core-deps/glibmm-2.4.bst
index 7525df74..e6926c90 100644
--- a/elements/core-deps/glibmm-2.4.bst
+++ b/elements/core-deps/glibmm-2.4.bst
@@ -6,13 +6,13 @@ sources:
 depends:
 - core-deps/libsigcplusplus-2.0.bst
 - sdk/glib.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/glibmm.bst b/elements/core-deps/glibmm.bst
index 249eee56..9fb2bc7e 100644
--- a/elements/core-deps/glibmm.bst
+++ b/elements/core-deps/glibmm.bst
@@ -6,13 +6,13 @@ sources:
 depends:
 - core-deps/libsigcplusplus.bst
 - sdk/glib.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gmime3.bst b/elements/core-deps/gmime3.bst
index f59eb800..9e84a462 100644
--- a/elements/core-deps/gmime3.bst
+++ b/elements/core-deps/gmime3.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-autoar.bst b/elements/core-deps/gnome-autoar.bst
index 0916c899..57ffa3d7 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -11,8 +11,8 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index a47713cd..e4124d8a 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -14,10 +14,10 @@ depends:
 - sdk/libsoup.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gnome-online-miners.bst b/elements/core-deps/gnome-online-miners.bst
index d1a3b33a..3139447e 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -11,8 +11,8 @@ depends:
 - core-deps/libzapojit.bst
 - core-deps/tracker.bst
 - sdk/glib.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index b3eb2b17..184a7fd6 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -6,16 +6,16 @@ sources:
 depends:
 - filename: sdk/gnome-common.bst
   type: build
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gom.bst b/elements/core-deps/gom.bst
index 29c85841..6d39ca53 100644
--- a/elements/core-deps/gom.bst
+++ b/elements/core-deps/gom.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/pygobject.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst
index 8d616992..358a83d1 100644
--- a/elements/core-deps/graphviz.bst
+++ b/elements/core-deps/graphviz.bst
@@ -5,10 +5,10 @@ sources:
 depends:
 - sdk/gdk-pixbuf.bst
 - sdk/pango.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: config
diff --git a/elements/core-deps/grilo-plugins.bst b/elements/core-deps/grilo-plugins.bst
index cbff8a48..c10989a0 100644
--- a/elements/core-deps/grilo-plugins.bst
+++ b/elements/core-deps/grilo-plugins.bst
@@ -18,12 +18,12 @@ depends:
 - core-deps/tracker.bst
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/grilo.bst b/elements/core-deps/grilo.bst
index 4a9dded2..24695af0 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -12,8 +12,8 @@ depends:
   type: build
 - sdk/libsoup.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index 9cc88ae9..c9b4e1dd 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/libcanberra.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gspell.bst b/elements/core-deps/gspell.bst
index bbf289fe..e222db11 100644
--- a/elements/core-deps/gspell.bst
+++ b/elements/core-deps/gspell.bst
@@ -10,8 +10,8 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gssdp.bst b/elements/core-deps/gssdp.bst
index 6fa65388..d2344653 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/libsoup.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 9ead2139..efc2dfd9 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -12,16 +12,16 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gtkmm-3.bst b/elements/core-deps/gtkmm-3.bst
index ca82195c..bc2d5233 100644
--- a/elements/core-deps/gtkmm-3.bst
+++ b/elements/core-deps/gtkmm-3.bst
@@ -9,13 +9,13 @@ depends:
 - core-deps/pangomm-1.4.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gtkmm.bst b/elements/core-deps/gtkmm.bst
index 13a6ba9e..f4732c3e 100644
--- a/elements/core-deps/gtkmm.bst
+++ b/elements/core-deps/gtkmm.bst
@@ -10,13 +10,12 @@ depends:
 - sdk/glib.bst
 - sdk/gtk.bst
 - filename: base/perl-xml-parser.bst
-- filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gtksourceview.bst b/elements/core-deps/gtksourceview.bst
index 389fa84c..403cb8f7 100644
--- a/elements/core-deps/gtksourceview.bst
+++ b/elements/core-deps/gtksourceview.bst
@@ -8,10 +8,10 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/gupnp-av.bst b/elements/core-deps/gupnp-av.bst
index 36cfdde2..5601edf8 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -9,8 +9,8 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index fe6f6283..274e7d96 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -11,10 +11,10 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gupnp.bst b/elements/core-deps/gupnp.bst
index 5330ba12..43b70989 100644
--- a/elements/core-deps/gupnp.bst
+++ b/elements/core-deps/gupnp.bst
@@ -11,10 +11,10 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/iptables.bst b/elements/core-deps/iptables.bst
index bdc3c3f0..561b18da 100644
--- a/elements/core-deps/iptables.bst
+++ b/elements/core-deps/iptables.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: tarballs_needing_help:iptables_1.6.2.orig.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/json-c.bst b/elements/core-deps/json-c.bst
index 4c1d6bbc..14a4282b 100644
--- a/elements/core-deps/json-c.bst
+++ b/elements/core-deps/json-c.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/kmod.bst b/elements/core-deps/kmod.bst
index 6a436360..3173a513 100644
--- a/elements/core-deps/kmod.bst
+++ b/elements/core-deps/kmod.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libatasmart.bst b/elements/core-deps/libatasmart.bst
index 7da3bdff..884da736 100644
--- a/elements/core-deps/libatasmart.bst
+++ b/elements/core-deps/libatasmart.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: http://0pointer.de/public/libatasmart-0.19.tar.xz
 depends:
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libbytesize.bst b/elements/core-deps/libbytesize.bst
index 6bee4a48..cf91e82d 100644
--- a/elements/core-deps/libbytesize.bst
+++ b/elements/core-deps/libbytesize.bst
@@ -4,8 +4,8 @@ sources:
   url: github_com:storaged-project/libbytesize/releases/download/1.2/libbytesize-1.2.tar.gz
 depends:
 - core-deps/mpfr.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index ed4b51bd..7422471c 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -13,8 +13,8 @@ depends:
 - sdk/libsoup.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libcue.bst b/elements/core-deps/libcue.bst
index fd5aa902..a68938d2 100644
--- a/elements/core-deps/libcue.bst
+++ b/elements/core-deps/libcue.bst
@@ -3,13 +3,13 @@ sources:
 - kind: tar
   url: https://github.com/lipnitsk/libcue/archive/v2.2.1.tar.gz
 depends:
-- filename: components/bison.bst
+- filename: base/bison.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/core-deps/libdaemon.bst b/elements/core-deps/libdaemon.bst
index a6dd114b..1beb75f3 100644
--- a/elements/core-deps/libdaemon.bst
+++ b/elements/core-deps/libdaemon.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libdazzle.bst b/elements/core-deps/libdazzle.bst
index f74a6e06..d6bb9526 100644
--- a/elements/core-deps/libdazzle.bst
+++ b/elements/core-deps/libdazzle.bst
@@ -8,8 +8,8 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libdvdread.bst b/elements/core-deps/libdvdread.bst
index 51289834..49de5b67 100644
--- a/elements/core-deps/libdvdread.bst
+++ b/elements/core-deps/libdvdread.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: http://download.videolan.org/pub/videolan/libdvdread/6.0.0/libdvdread-6.0.0.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libevdev.bst b/elements/core-deps/libevdev.bst
index 6aefa0a3..cbbf5dd3 100644
--- a/elements/core-deps/libevdev.bst
+++ b/elements/core-deps/libevdev.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: https://www.freedesktop.org/software/libevdev/libevdev-1.6.0.tar.xz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libgdata.bst b/elements/core-deps/libgdata.bst
index c9f62ae2..349fcfaf 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -14,8 +14,8 @@ depends:
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgepub.bst b/elements/core-deps/libgepub.bst
index 3cef475b..72db94ea 100644
--- a/elements/core-deps/libgepub.bst
+++ b/elements/core-deps/libgepub.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/WebKitGTK.bst
 - sdk/glib.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgfbgraph.bst b/elements/core-deps/libgfbgraph.bst
index 629e60ae..568e7513 100644
--- a/elements/core-deps/libgfbgraph.bst
+++ b/elements/core-deps/libgfbgraph.bst
@@ -11,11 +11,11 @@ depends:
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgnomekbd.bst b/elements/core-deps/libgnomekbd.bst
index a0b4fa06..967973dc 100644
--- a/elements/core-deps/libgnomekbd.bst
+++ b/elements/core-deps/libgnomekbd.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - core-deps/libxklavier.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgovirt.bst b/elements/core-deps/libgovirt.bst
index a95cd688..8f208b01 100644
--- a/elements/core-deps/libgovirt.bst
+++ b/elements/core-deps/libgovirt.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - core-deps/librest.bst
 - sdk/gobject-introspection.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgsf.bst b/elements/core-deps/libgsf.bst
index 72deefe5..b105336b 100644
--- a/elements/core-deps/libgsf.bst
+++ b/elements/core-deps/libgsf.bst
@@ -8,13 +8,13 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libgtop.bst b/elements/core-deps/libgtop.bst
index 39ae983e..f5eea12c 100644
--- a/elements/core-deps/libgtop.bst
+++ b/elements/core-deps/libgtop.bst
@@ -7,13 +7,13 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/texinfo.bst
+- filename: base/texinfo.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 environment:
   CC: gcc -std=c99
diff --git a/elements/core-deps/libgudev.bst b/elements/core-deps/libgudev.bst
index d3b682ce..98cd8c86 100644
--- a/elements/core-deps/libgudev.bst
+++ b/elements/core-deps/libgudev.bst
@@ -8,12 +8,12 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libgusb.bst b/elements/core-deps/libgusb.bst
index 6bdecba0..513edbdc 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -10,8 +10,8 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgweather.bst b/elements/core-deps/libgweather.bst
index a27bcd7e..482088ac 100644
--- a/elements/core-deps/libgweather.bst
+++ b/elements/core-deps/libgweather.bst
@@ -10,8 +10,8 @@ depends:
 - sdk/libsoup.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libgxps.bst b/elements/core-deps/libgxps.bst
index d19f2443..d8f4bd5c 100644
--- a/elements/core-deps/libgxps.bst
+++ b/elements/core-deps/libgxps.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libhandy.bst b/elements/core-deps/libhandy.bst
index a617f6a1..d8f0d1df 100644
--- a/elements/core-deps/libhandy.bst
+++ b/elements/core-deps/libhandy.bst
@@ -10,13 +10,13 @@ depends:
   type: build
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/libical.bst b/elements/core-deps/libical.bst
index 8b59ab5d..e028f053 100644
--- a/elements/core-deps/libical.bst
+++ b/elements/core-deps/libical.bst
@@ -4,17 +4,16 @@ sources:
   url: github_com:libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz
 depends:
 - sdk/glib.bst
-- filename: sdk/gobject-introspection.bst
-  type: build
+- sdk/gobject-introspection.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local:
diff --git a/elements/core-deps/libinput.bst b/elements/core-deps/libinput.bst
index 2088cd2a..47e60fa5 100644
--- a/elements/core-deps/libinput.bst
+++ b/elements/core-deps/libinput.bst
@@ -8,10 +8,10 @@ depends:
 - core-deps/libwacom.bst
 - core-deps/mtdev.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/libmbim.bst b/elements/core-deps/libmbim.bst
index e5b1f774..7c482918 100644
--- a/elements/core-deps/libmbim.bst
+++ b/elements/core-deps/libmbim.bst
@@ -8,10 +8,10 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libmediaart.bst b/elements/core-deps/libmediaart.bst
index 2660a8dd..838c89b6 100644
--- a/elements/core-deps/libmediaart.bst
+++ b/elements/core-deps/libmediaart.bst
@@ -9,10 +9,10 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libmusicbrainz.bst b/elements/core-deps/libmusicbrainz.bst
index fe246f23..2f76868a 100644
--- a/elements/core-deps/libmusicbrainz.bst
+++ b/elements/core-deps/libmusicbrainz.bst
@@ -7,10 +7,10 @@ sources:
   path: files/libmusicbrainz/cmake-ninja.patch
 depends:
 - core-deps/neon.bst
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/core-deps/libndp.bst b/elements/core-deps/libndp.bst
index 5a8d1892..4fe9973c 100644
--- a/elements/core-deps/libndp.bst
+++ b/elements/core-deps/libndp.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: http://libndp.org/files/libndp-1.6.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libnl.bst b/elements/core-deps/libnl.bst
index b23942c0..4f85c297 100644
--- a/elements/core-deps/libnl.bst
+++ b/elements/core-deps/libnl.bst
@@ -3,13 +3,13 @@ sources:
 - kind: tar
   url: github_com:thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
 depends:
-- filename: components/bison.bst
+- filename: base/bison.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/liboauth.bst b/elements/core-deps/liboauth.bst
index 780c1671..fb2e1ea3 100644
--- a/elements/core-deps/liboauth.bst
+++ b/elements/core-deps/liboauth.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: downloads.sourceforge.net:liboauth/liboauth-1.0.3.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index 4b5cff8b..f3188079 100644
--- a/elements/core-deps/libosinfo.bst
+++ b/elements/core-deps/libosinfo.bst
@@ -15,13 +15,13 @@ depends:
   type: build
 - sdk/libsoup.bst
 - sdk/vala.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libpeas.bst b/elements/core-deps/libpeas.bst
index c5f60066..e2975675 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -12,16 +12,16 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pygobject.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libqmi.bst b/elements/core-deps/libqmi.bst
index d8ec1d87..8c177a2d 100644
--- a/elements/core-deps/libqmi.bst
+++ b/elements/core-deps/libqmi.bst
@@ -8,10 +8,10 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/librest.bst b/elements/core-deps/librest.bst
index 350bce73..4b4f3714 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -8,8 +8,8 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libsass.bst b/elements/core-deps/libsass.bst
index a45ce9ef..bb57a46b 100644
--- a/elements/core-deps/libsass.bst
+++ b/elements/core-deps/libsass.bst
@@ -1,10 +1,10 @@
 kind: autotools
 
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 sources:
 - kind: tar
diff --git a/elements/core-deps/libsigcplusplus-2.0.bst b/elements/core-deps/libsigcplusplus-2.0.bst
index b31302b7..c375cd34 100644
--- a/elements/core-deps/libsigcplusplus-2.0.bst
+++ b/elements/core-deps/libsigcplusplus-2.0.bst
@@ -5,10 +5,10 @@ sources:
   track: libsigc++-2-10
 depends:
 - core-deps/mm-common.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libsigcplusplus.bst b/elements/core-deps/libsigcplusplus.bst
index a12f190d..e4cf42e7 100644
--- a/elements/core-deps/libsigcplusplus.bst
+++ b/elements/core-deps/libsigcplusplus.bst
@@ -5,10 +5,10 @@ sources:
   track: master
 depends:
 - core-deps/mm-common.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libusb.bst b/elements/core-deps/libusb.bst
index 78c3fbc9..a75ba825 100644
--- a/elements/core-deps/libusb.bst
+++ b/elements/core-deps/libusb.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: github_com:libusb/libusb/releases/download/v1.0.21/libusb-1.0.21.tar.bz2
 depends:
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index 2faedc84..b0153222 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -10,13 +10,13 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst
index 58e83b77..fa5bd1e3 100644
--- a/elements/core-deps/libvirt.bst
+++ b/elements/core-deps/libvirt.bst
@@ -6,10 +6,10 @@ depends:
 - core-deps/libnl.bst
 - core-deps/portablexdr.bst
 - core-deps/lvm2.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libwacom.bst b/elements/core-deps/libwacom.bst
index 161dbc90..82cdd054 100644
--- a/elements/core-deps/libwacom.bst
+++ b/elements/core-deps/libwacom.bst
@@ -5,8 +5,8 @@ sources:
 depends:
 - core-deps/libgudev.bst
 - sdk/glib.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libxklavier.bst b/elements/core-deps/libxklavier.bst
index cd20adb1..1726e3f5 100644
--- a/elements/core-deps/libxklavier.bst
+++ b/elements/core-deps/libxklavier.bst
@@ -4,16 +4,16 @@ sources:
   url: people_freedesktop_org:~svu/libxklavier-5.4.tar.bz2
 depends:
 - sdk/gobject-introspection.bst
-- filename: components/xorg-app-xkbcomp.bst
+- filename: desktop/xorg-app-xkbcomp.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-x11.bst
+- filename: desktop/xorg-lib-x11.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xi.bst
+- filename: desktop/xorg-lib-xi.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/libyaml.bst b/elements/core-deps/libyaml.bst
index 31a0982a..096e55c8 100644
--- a/elements/core-deps/libyaml.bst
+++ b/elements/core-deps/libyaml.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:yaml/libyaml/archive/0.1.7.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/libzapojit.bst b/elements/core-deps/libzapojit.bst
index ba51ad7a..00e5de47 100644
--- a/elements/core-deps/libzapojit.bst
+++ b/elements/core-deps/libzapojit.bst
@@ -11,14 +11,14 @@ depends:
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/lvm2.bst b/elements/core-deps/lvm2.bst
index fa91bace..faa5bb38 100644
--- a/elements/core-deps/lvm2.bst
+++ b/elements/core-deps/lvm2.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: https://www.sourceware.org/pub/lvm2/LVM2.2.02.177.tgz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/mm-common.bst b/elements/core-deps/mm-common.bst
index 0285c110..a856b479 100644
--- a/elements/core-deps/mm-common.bst
+++ b/elements/core-deps/mm-common.bst
@@ -24,10 +24,10 @@ sources:
   path: files/mm-common/libstdc++.tag
   directory: doctags/
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/mobile-broadband-provider-info.bst 
b/elements/core-deps/mobile-broadband-provider-info.bst
index 17f8a2cc..a11b57ee 100644
--- a/elements/core-deps/mobile-broadband-provider-info.bst
+++ b/elements/core-deps/mobile-broadband-provider-info.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/mobile-broadband-provider-info.git
   track: master
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/mpc.bst b/elements/core-deps/mpc.bst
index aef74353..ccdfd359 100644
--- a/elements/core-deps/mpc.bst
+++ b/elements/core-deps/mpc.bst
@@ -4,8 +4,8 @@ sources:
   url: ftp_gnu_org:mpc/mpc-1.1.0.tar.gz
 depends:
 - core-deps/mpfr.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/mpfr.bst b/elements/core-deps/mpfr.bst
index 402b0c47..205ef127 100644
--- a/elements/core-deps/mpfr.bst
+++ b/elements/core-deps/mpfr.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: ftp_gnu_org:mpfr/mpfr-4.0.1.tar.xz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/mtdev.bst b/elements/core-deps/mtdev.bst
index 23641ddf..768e9bf4 100644
--- a/elements/core-deps/mtdev.bst
+++ b/elements/core-deps/mtdev.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: config-aux
diff --git a/elements/core-deps/ndctl.bst b/elements/core-deps/ndctl.bst
index c0dbbd58..e849c736 100644
--- a/elements/core-deps/ndctl.bst
+++ b/elements/core-deps/ndctl.bst
@@ -5,12 +5,12 @@ sources:
 depends:
 - core-deps/json-c.bst
 - core-deps/kmod.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/neon.bst b/elements/core-deps/neon.bst
index 1c146681..bb9250d0 100644
--- a/elements/core-deps/neon.bst
+++ b/elements/core-deps/neon.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: http://http.debian.net/debian/pool/main/n/neon27/neon27_0.30.2.orig.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/openldap.bst b/elements/core-deps/openldap.bst
index 2dbc344b..a9358e6c 100644
--- a/elements/core-deps/openldap.bst
+++ b/elements/core-deps/openldap.bst
@@ -4,13 +4,13 @@ sources:
   url: http://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.tgz
 depends:
 - core-deps/berkeleydb.bst
-- filename: components/groff.bst
+- filename: base/groff.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build
diff --git a/elements/core-deps/osinfo-db-tools.bst b/elements/core-deps/osinfo-db-tools.bst
index 98e9da4d..ced517a7 100644
--- a/elements/core-deps/osinfo-db-tools.bst
+++ b/elements/core-deps/osinfo-db-tools.bst
@@ -6,11 +6,11 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/json-glib.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/pangomm-1.4.bst b/elements/core-deps/pangomm-1.4.bst
index 6c1bff7b..f12682dc 100644
--- a/elements/core-deps/pangomm-1.4.bst
+++ b/elements/core-deps/pangomm-1.4.bst
@@ -8,13 +8,13 @@ depends:
 - core-deps/glibmm-2.4.bst
 - sdk/atk.bst
 - sdk/pango.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/pangomm.bst b/elements/core-deps/pangomm.bst
index ace8efbc..9e2c7df1 100644
--- a/elements/core-deps/pangomm.bst
+++ b/elements/core-deps/pangomm.bst
@@ -8,13 +8,13 @@ depends:
 - core-deps/glibmm.bst
 - sdk/atk.bst
 - sdk/pango.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/parted.bst b/elements/core-deps/parted.bst
index cf1032c1..52ae31a7 100644
--- a/elements/core-deps/parted.bst
+++ b/elements/core-deps/parted.bst
@@ -6,10 +6,10 @@ sources:
   path: files/parted/include-sysmacros.patch
 depends:
 - core-deps/lvm2.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index b245e197..7f6940dc 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -10,16 +10,16 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsoup.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/git.bst
+- filename: base/git.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/polkit.bst b/elements/core-deps/polkit.bst
index acc3a4bf..f04dfadc 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -11,18 +11,18 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/poppler.bst b/elements/core-deps/poppler.bst
index ec4043ab..365238db 100644
--- a/elements/core-deps/poppler.bst
+++ b/elements/core-deps/poppler.bst
@@ -7,14 +7,14 @@ depends:
 - sdk/openjpeg.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/fontconfig.bst
+- filename: desktop/fontconfig.bst
   junction: freedesktop-sdk.bst
-- filename: components/freetype.bst
+- filename: desktop/freetype.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/portablexdr.bst b/elements/core-deps/portablexdr.bst
index 51d692be..20785e12 100644
--- a/elements/core-deps/portablexdr.bst
+++ b/elements/core-deps/portablexdr.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: tarballs_needing_help:portablexdr-4.9.1.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/portaudio.bst b/elements/core-deps/portaudio.bst
index fb127516..e512a3dc 100644
--- a/elements/core-deps/portaudio.bst
+++ b/elements/core-deps/portaudio.bst
@@ -4,8 +4,8 @@ sources:
 - kind: tar
   url: http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 depends:
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/ppp.bst b/elements/core-deps/ppp.bst
index 8a580a19..78d38bb2 100644
--- a/elements/core-deps/ppp.bst
+++ b/elements/core-deps/ppp.bst
@@ -5,10 +5,13 @@ sources:
 - kind: patch
   path: files/ppp/use-openssl.patch
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/openssl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base/buildsystem-autotools.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   # not a real autotools project
diff --git a/elements/core-deps/pwquality.bst b/elements/core-deps/pwquality.bst
index 27fa2b3c..0c4105ed 100644
--- a/elements/core-deps/pwquality.bst
+++ b/elements/core-deps/pwquality.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: github_com:libpwquality/libpwquality/releases/download/libpwquality-1.4.0/libpwquality-1.4.0.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/pyatspi2.bst b/elements/core-deps/pyatspi2.bst
index e6539287..453778b8 100644
--- a/elements/core-deps/pyatspi2.bst
+++ b/elements/core-deps/pyatspi2.bst
@@ -6,10 +6,10 @@ sources:
 depends:
 - sdk/at-spi2-core.bst
 - sdk/pygobject.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/rpcsvc-proto.bst b/elements/core-deps/rpcsvc-proto.bst
index 230be48e..d1849a06 100644
--- a/elements/core-deps/rpcsvc-proto.bst
+++ b/elements/core-deps/rpcsvc-proto.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:thkukuk/rpcsvc-proto/archive/v1.3.1.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/samba.bst b/elements/core-deps/samba.bst
index b17f7f85..cae3b05d 100644
--- a/elements/core-deps/samba.bst
+++ b/elements/core-deps/samba.bst
@@ -7,16 +7,16 @@ sources:
 depends:
 - core-deps/openldap.bst
 - core-deps/rpcsvc-proto.bst
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/pkg-config.bst
+- filename: base/pkg-config.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 config:
   configure-commands:
diff --git a/elements/core-deps/sane-backends.bst b/elements/core-deps/sane-backends.bst
index c4ed7f07..e07ed6e5 100644
--- a/elements/core-deps/sane-backends.bst
+++ b/elements/core-deps/sane-backends.bst
@@ -4,8 +4,8 @@ sources:
   url: 
https://gitlab.com/sane-project/backends/uploads/a3ba9fff29253a94e84074917bff581a/sane-backends-1.0.27.tar.gz
 depends:
 - core-deps/libusb.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/sassc.bst b/elements/core-deps/sassc.bst
index 9fc12054..d278650f 100644
--- a/elements/core-deps/sassc.bst
+++ b/elements/core-deps/sassc.bst
@@ -1,10 +1,10 @@
 kind: autotools
 depends:
 - core-deps/libsass.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 sources:
 - kind: tar
diff --git a/elements/core-deps/speech-dispatcher.bst b/elements/core-deps/speech-dispatcher.bst
index 3465ef7e..132c8c55 100644
--- a/elements/core-deps/speech-dispatcher.bst
+++ b/elements/core-deps/speech-dispatcher.bst
@@ -5,13 +5,13 @@ sources:
 depends:
 - core-deps/dotconf.bst
 - core-deps/espeak.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index 4c759fda..97a3577c 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -14,10 +14,10 @@ depends:
 - sdk/vala.bst
 - filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/spice-protocol.bst b/elements/core-deps/spice-protocol.bst
index 605002ef..b6bc2f5c 100644
--- a/elements/core-deps/spice-protocol.bst
+++ b/elements/core-deps/spice-protocol.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: spice:releases/spice-protocol-0.12.15.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/startup-notification.bst b/elements/core-deps/startup-notification.bst
index 1bb915f0..1ae5458f 100644
--- a/elements/core-deps/startup-notification.bst
+++ b/elements/core-deps/startup-notification.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: gnome_downloads:startup-notification/0.12/startup-notification-0.12.tar.xz
 depends:
-- filename: components/xcb-util.bst
+- filename: desktop/xcb-util.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-x11.bst
+- filename: desktop/xorg-lib-x11.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/totem-pl-parser.bst b/elements/core-deps/totem-pl-parser.bst
index 5ea870db..c71f128e 100644
--- a/elements/core-deps/totem-pl-parser.bst
+++ b/elements/core-deps/totem-pl-parser.bst
@@ -7,8 +7,8 @@ depends:
 - core-deps/gmime3.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 91a92da8..aa2d7a30 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -19,17 +19,17 @@ depends:
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
 - sdk/libsecret.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/libseccomp.bst
+- filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/tracker.bst b/elements/core-deps/tracker.bst
index 80bcade6..33ddaab6 100644
--- a/elements/core-deps/tracker.bst
+++ b/elements/core-deps/tracker.bst
@@ -13,10 +13,10 @@ depends:
 - sdk/json-glib.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/udisks2.bst b/elements/core-deps/udisks2.bst
index a13105b6..4f458402 100644
--- a/elements/core-deps/udisks2.bst
+++ b/elements/core-deps/udisks2.bst
@@ -7,13 +7,13 @@ depends:
 - core-deps/libatasmart.bst
 - core-deps/libgudev.bst
 - core-deps/polkit.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/core-deps/uhttpmock.bst b/elements/core-deps/uhttpmock.bst
index 4df61816..c90b5694 100644
--- a/elements/core-deps/uhttpmock.bst
+++ b/elements/core-deps/uhttpmock.bst
@@ -8,8 +8,8 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index 4dfdbc01..f654d733 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -8,11 +8,11 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/volume-key.bst b/elements/core-deps/volume-key.bst
index 488fb76a..6427ce15 100644
--- a/elements/core-deps/volume-key.bst
+++ b/elements/core-deps/volume-key.bst
@@ -4,10 +4,10 @@ sources:
   url: https://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
 depends:
 - core-deps/cryptsetup.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: admin
diff --git a/elements/core-deps/xfont2.bst b/elements/core-deps/xfont2.bst
index 20298d8d..299c4208 100644
--- a/elements/core-deps/xfont2.bst
+++ b/elements/core-deps/xfont2.bst
@@ -5,10 +5,10 @@ sources:
 depends:
 - core-deps/fontenc.bst
 - core-deps/font-util.bst
-- filename: components/freetype.bst
+- filename: desktop/freetype.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/xmlb.bst b/elements/core-deps/xmlb.bst
index 88755487..09489a0f 100644
--- a/elements/core-deps/xmlb.bst
+++ b/elements/core-deps/xmlb.bst
@@ -7,10 +7,10 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/xmlto.bst b/elements/core-deps/xmlto.bst
index 732eaabb..156f0e0d 100644
--- a/elements/core-deps/xmlto.bst
+++ b/elements/core-deps/xmlto.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/xorg-server.bst b/elements/core-deps/xorg-server.bst
index 895e81c8..e085fb49 100644
--- a/elements/core-deps/xorg-server.bst
+++ b/elements/core-deps/xorg-server.bst
@@ -4,32 +4,32 @@ sources:
   url: https://www.x.org/releases/individual/xserver/xorg-server-1.20.3.tar.bz2
 depends:
 - core-deps/xfont2.bst
-- filename: components/libdrm.bst
+- filename: desktop/libdrm.bst
   junction: freedesktop-sdk.bst
-- filename: components/libepoxy.bst
+- filename: desktop/libepoxy.bst
   junction: freedesktop-sdk.bst
-- filename: components/pixman.bst
+- filename: desktop/pixman.bst
   junction: freedesktop-sdk.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland-protocols.bst
+- filename: desktop/wayland-protocols.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/xorg-lib-pciaccess.bst
+- filename: desktop/xorg-lib-pciaccess.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xkbfile.bst
+- filename: desktop/xorg-lib-xkbfile.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xshmfence.bst
+- filename: desktop/xorg-lib-xshmfence.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-proto-xorgproto.bst
+- filename: desktop/xorg-proto-xorgproto.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local:
diff --git a/elements/core/baobab.bst b/elements/core/baobab.bst
index ad24563d..dd5fe842 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -10,10 +10,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 959d54fe..c100ab2c 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -24,13 +24,13 @@ depends:
 - sdk/librsvg.bst
 - filename: sdk/vala.bst
   type: build
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/eog.bst b/elements/core/eog.bst
index 011c09ed..3cae0cec 100644
--- a/elements/core/eog.bst
+++ b/elements/core/eog.bst
@@ -14,10 +14,10 @@ depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index ff4f6c61..ee24df9c 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -18,10 +18,10 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index 6683e43a..4bfdc161 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -17,10 +17,10 @@ depends:
   type: build
 - sdk/libsecret.bst
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core/file-roller.bst b/elements/core/file-roller.bst
index 22e36aaf..70678bdb 100644
--- a/elements/core/file-roller.bst
+++ b/elements/core/file-roller.bst
@@ -7,10 +7,10 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index e3b613eb..c47a4edb 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libcanberra.bst
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core/gedit.bst b/elements/core/gedit.bst
index f0405cf0..cb703c86 100644
--- a/elements/core/gedit.bst
+++ b/elements/core/gedit.bst
@@ -14,16 +14,16 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/git-minimal.bst
+- filename: base/git-minimal.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-backgrounds.bst b/elements/core/gnome-backgrounds.bst
index 85790163..f57db40e 100644
--- a/elements/core/gnome-backgrounds.bst
+++ b/elements/core/gnome-backgrounds.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 depends:
 - sdk/glib.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
index 207d43e2..c7151807 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -14,10 +14,10 @@ depends:
   type: build
 - sdk/libcanberra.bst
 - sdk/libnotify.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 8f1eafed..7a9473d4 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -27,12 +27,12 @@ depends:
 - sdk/libsecret.bst
 - sdk/vala.bst
 - sdk/vte.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-calculator.bst b/elements/core/gnome-calculator.bst
index 7f6e15c9..7294b300 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -13,10 +13,10 @@ depends:
 - sdk/libsoup.bst
 - sdk/libgee.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index 9d4155ed..727c4c84 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -12,8 +12,8 @@ depends:
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-characters.bst b/elements/core/gnome-characters.bst
index 7e6c4cc8..5e39d049 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -8,10 +8,10 @@ depends:
 - sdk/appstream-glib.bst
 - sdk/gjs.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-clocks.bst b/elements/core/gnome-clocks.bst
index 064ccc77..8c33d36b 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -12,10 +12,10 @@ depends:
 - sdk/geoclue.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index b302a3a4..0c0be842 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -13,10 +13,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libcanberra.bst
 - sdk/vte.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index 1d01185b..0e17a0f5 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -14,10 +14,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/vala.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index 119aea04..5dedb4cc 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -42,12 +42,12 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/ibus.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-desktop.bst b/elements/core/gnome-desktop.bst
index ad2ee7b6..4e54171d 100644
--- a/elements/core/gnome-desktop.bst
+++ b/elements/core/gnome-desktop.bst
@@ -11,14 +11,14 @@ depends:
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: components/libseccomp.bst
+- filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-disk-utility.bst b/elements/core/gnome-disk-utility.bst
index 904b2fca..97d55f0a 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -14,10 +14,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-font-viewer.bst b/elements/core/gnome-font-viewer.bst
index 2b487ca9..a8f9c267 100644
--- a/elements/core/gnome-font-viewer.bst
+++ b/elements/core/gnome-font-viewer.bst
@@ -8,8 +8,8 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-getting-started-docs.bst b/elements/core/gnome-getting-started-docs.bst
index 6c9b7ca3..f209cd39 100644
--- a/elements/core/gnome-getting-started-docs.bst
+++ b/elements/core/gnome-getting-started-docs.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 depends:
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index 32fd8af0..4011c77f 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -21,12 +21,12 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/ibus.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-keyring.bst b/elements/core/gnome-keyring.bst
index 92bd2065..c97ab2b2 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -7,13 +7,13 @@ depends:
 - sdk/gcr.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/openssh.bst
+- filename: base/openssh.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-logs.bst b/elements/core/gnome-logs.bst
index 14c2ab7a..0630e41c 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -8,12 +8,12 @@ depends:
 - sdk/appstream-glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index 575994a2..68bde704 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -20,8 +20,8 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/librsvg.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-menus.bst b/elements/core/gnome-menus.bst
index 34d0f95d..1345f4a6 100644
--- a/elements/core/gnome-menus.bst
+++ b/elements/core/gnome-menus.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index a7576410..faaca749 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -22,10 +22,10 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/gvfs.bst
 - sdk/pygobject.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 22c8bff5..11031644 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -26,17 +26,17 @@ depends:
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- filename: components/desktop-file-utils.bst
+- filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: components/git-minimal.bst
+- filename: base/git-minimal.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-screenshot.bst b/elements/core/gnome-screenshot.bst
index cb007e89..8de2089f 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -9,8 +9,8 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libcanberra.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-session.bst b/elements/core/gnome-session.bst
index 05c61f9a..43e4ee0d 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -9,15 +9,15 @@ depends:
 - core/gnome-desktop.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
-- filename: components/xorg-lib-ice.bst
+- filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-sm.bst
+- filename: desktop/xorg-lib-sm.bst
   junction: freedesktop-sdk.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 00f7bf49..f3f21a5e 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -25,17 +25,17 @@ depends:
 - sdk/ibus.bst
 - sdk/libcanberra.bst
 - sdk/libnotify.bst
-- filename: components/alsa-lib.bst
+- filename: desktop/alsa-lib.bst
   junction: freedesktop-sdk.bst
-- filename: components/cups.bst
+- filename: desktop/cups.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xtst.bst
+- filename: desktop/xorg-lib-xtst.bst
   junction: freedesktop-sdk.bst
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-shell-extensions.bst b/elements/core/gnome-shell-extensions.bst
index f3d9653e..35eb4922 100644
--- a/elements/core/gnome-shell-extensions.bst
+++ b/elements/core/gnome-shell-extensions.bst
@@ -7,10 +7,10 @@ depends:
 - core/gnome-menus.bst
 - core/gnome-shell.bst
 - sdk/librsvg.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index f8358119..5ecb79c6 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -30,16 +30,16 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libcroco.bst
 - sdk/libsoup.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index d22eee28..2719ec9e 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -20,10 +20,10 @@ depends:
   type: build
 - sdk/libsecret.bst
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/gnome-system-monitor.bst b/elements/core/gnome-system-monitor.bst
index 3a3f8ffa..cd305e36 100644
--- a/elements/core/gnome-system-monitor.bst
+++ b/elements/core/gnome-system-monitor.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-terminal.bst b/elements/core/gnome-terminal.bst
index 22591472..501e9f04 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -15,15 +15,15 @@ depends:
 - sdk/librsvg.bst
 - sdk/vte.bst
 - sdk/yelp-tools.bst
-- filename: components/desktop-file-utils.bst
+- filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core/gnome-user-docs.bst b/elements/core/gnome-user-docs.bst
index 6ab6a68e..9c65bf6e 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 depends:
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-user-share.bst b/elements/core/gnome-user-share.bst
index ca93e5fc..9776c040 100644
--- a/elements/core/gnome-user-share.bst
+++ b/elements/core/gnome-user-share.bst
@@ -10,8 +10,8 @@ depends:
 - sdk/libnotify.bst
 - filename: sdk/yelp-tools.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-weather.bst b/elements/core/gnome-weather.bst
index ed5b73e8..eb8e07d2 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -14,8 +14,8 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - core/gnome-desktop.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 6ebe140e..9175fcbf 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -22,16 +22,16 @@ depends:
 - sdk/json-glib.bst
 - sdk/pango.bst
 - sdk/zenity.bst
-- filename: components/xorg-lib-xcursor.bst
+- filename: desktop/xorg-lib-xcursor.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xtst.bst
+- filename: desktop/xorg-lib-xtst.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/nautilus.bst b/elements/core/nautilus.bst
index 595b14fa..6cc7f539 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -18,10 +18,10 @@ depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/pango.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/network-manager-applet.bst b/elements/core/network-manager-applet.bst
index 370b8d82..7ea6d4be 100644
--- a/elements/core/network-manager-applet.bst
+++ b/elements/core/network-manager-applet.bst
@@ -17,10 +17,10 @@ depends:
   type: build
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/core/orca.bst b/elements/core/orca.bst
index edb6d381..94ce167b 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -11,8 +11,8 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index abbfc09b..0eea87fa 100644
--- a/elements/core/rygel.bst
+++ b/elements/core/rygel.bst
@@ -12,8 +12,8 @@ depends:
 - core-deps/tracker.bst
 - sdk/libgee.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index 459bb704..18c466cb 100644
--- a/elements/core/simple-scan.bst
+++ b/elements/core/simple-scan.bst
@@ -13,10 +13,10 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 67d82d43..9e27fd76 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -15,10 +15,10 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index dabc34d0..d880ab16 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -28,14 +28,14 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/core/vino.bst b/elements/core/vino.bst
index c51bb808..e59f9a68 100644
--- a/elements/core/vino.bst
+++ b/elements/core/vino.bst
@@ -12,17 +12,17 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
-- filename: components/systemd.bst
+- filename: desktop/systemd.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-ice.bst
+- filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-sm.bst
+- filename: desktop/xorg-lib-sm.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index 80d76c96..eac3bb4a 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -2,7 +2,7 @@ kind: compose
 depends:
 - filename: sdk.bst
   type: build
-- filename: components/man-db-generate.bst
+- filename: base/man-db-generate.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: split-locales.bst
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 3a060277..ced2752f 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,7 +2,7 @@ kind: junction
 sources:
 - kind: git_tag
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
-  track: master
+  track: 18.08
 config:
   options:
     target_arch: '%{arch}'
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 6d50aa50..954b1624 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -69,357 +69,191 @@ depends:
 
 # Due to being relatively deep in the stack, glib needs special treatment.
 
-- filename: mtab.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/ca-certificates.bst
+- filename: desktop/alsa-lib.bst
   junction: freedesktop-sdk.bst
-- filename: components/cracklib.bst
+- filename: desktop/alsa-plugins.bst
   junction: freedesktop-sdk.bst
-- filename: components/curl.bst
+- filename: desktop/aspell.bst
   junction: freedesktop-sdk.bst
-- filename: components/cyrus-sasl.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/e2fsprogs.bst
+- filename: desktop/cups.bst
   junction: freedesktop-sdk.bst
-- filename: components/expat.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: components/flex.bst
+- filename: desktop/dejavu-fonts.bst
   junction: freedesktop-sdk.bst
-- filename: components/frei0r.bst
+- filename: desktop/dictionaries.bst
   junction: freedesktop-sdk.bst
-- filename: components/gdbm.bst
+- filename: desktop/emoji-one-font.bst
   junction: freedesktop-sdk.bst
-- filename: components/gettext.bst
+- filename: desktop/ffmpeg.bst
   junction: freedesktop-sdk.bst
-- filename: components/giflib.bst
+- filename: desktop/fftw.bst
   junction: freedesktop-sdk.bst
-- filename: components/glib.bst
+- filename: desktop/flatpak-xdg-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/gmp.bst
+- filename: desktop/fontconfig.bst
   junction: freedesktop-sdk.bst
-- filename: components/gnupg.bst
+- filename: desktop/freetype.bst
   junction: freedesktop-sdk.bst
-- filename: components/gnutls.bst
+- filename: desktop/fribidi.bst
   junction: freedesktop-sdk.bst
-- filename: components/gzip.bst
+- filename: desktop/gnu-free-fonts.bst
   junction: freedesktop-sdk.bst
-- filename: components/gpgme.bst
+- filename: desktop/google-crosextra-caladea.bst
   junction: freedesktop-sdk.bst
-- filename: components/iana-config.bst
+- filename: desktop/google-crosextra-carlito.bst
   junction: freedesktop-sdk.bst
-- filename: components/icu.bst
+- filename: desktop/graphite2.bst
   junction: freedesktop-sdk.bst
-- filename: components/iso-codes.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/jpeg.bst
+- filename: desktop/harfbuzz.bst
   junction: freedesktop-sdk.bst
-- filename: components/krb5.bst
+- filename: desktop/hicolor-icon-theme.bst
   junction: freedesktop-sdk.bst
-- filename: components/ladspa-sdk.bst
+- filename: desktop/hunspell.bst
   junction: freedesktop-sdk.bst
-- filename: components/lcms.bst
+- filename: desktop/hyphen.bst
   junction: freedesktop-sdk.bst
-- filename: components/less.bst
+- filename: desktop/lame.bst
   junction: freedesktop-sdk.bst
-- filename: components/libarchive.bst
+- filename: desktop/libclc.bst
   junction: freedesktop-sdk.bst
-- filename: components/libassuan.bst
+- filename: desktop/libdatrie.bst
   junction: freedesktop-sdk.bst
-- filename: components/libcap.bst
+- filename: desktop/libdrm.bst
   junction: freedesktop-sdk.bst
-- filename: components/libexif.bst
+- filename: desktop/libepoxy.bst
   junction: freedesktop-sdk.bst
-- filename: components/libffi.bst
+- filename: desktop/liberation-fonts.bst
   junction: freedesktop-sdk.bst
-- filename: components/libflac.bst
+- filename: desktop/libglvnd.bst
   junction: freedesktop-sdk.bst
-- filename: components/libgcrypt.bst
+- filename: desktop/libproxy.bst
   junction: freedesktop-sdk.bst
-- filename: components/libgpg-error.bst
+- filename: desktop/libpsl.bst
   junction: freedesktop-sdk.bst
-- filename: components/libksba.bst
+- filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
-- filename: components/libidn2.bst
+- filename: desktop/libthai.bst
   junction: freedesktop-sdk.bst
-- filename: components/libogg.bst
+- filename: desktop/libva-vdpau-driver.bst
   junction: freedesktop-sdk.bst
-- filename: components/libpng.bst
+- filename: desktop/libva.bst
   junction: freedesktop-sdk.bst
-- filename: components/libsamplerate.bst
+- filename: desktop/libvdpau.bst
   junction: freedesktop-sdk.bst
-- filename: components/libselinux.bst
+- filename: desktop/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: components/libtasn1.bst
+- filename: desktop/llvm6.bst
   junction: freedesktop-sdk.bst
-- filename: components/libtheora.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-- filename: components/libtiff.bst
+- filename: desktop/mpg123.bst
   junction: freedesktop-sdk.bst
-- filename: components/libtirpc.bst
+- filename: desktop/multiarch-links.bst
   junction: freedesktop-sdk.bst
-- filename: components/libtool.bst
+- filename: desktop/mythes.bst
   junction: freedesktop-sdk.bst
-- filename: components/libunistring.bst
+- filename: desktop/openal.bst
   junction: freedesktop-sdk.bst
-- filename: components/libvorbis.bst
+- filename: desktop/opencl.bst
   junction: freedesktop-sdk.bst
-- filename: components/libvpx.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
-- filename: components/libwebp.bst
+- filename: desktop/pixman.bst
   junction: freedesktop-sdk.bst
-- filename: components/libxml2.bst
+- filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
-- filename: components/libxslt.bst
+- filename: desktop/sdl2-image.bst
   junction: freedesktop-sdk.bst
-- filename: components/linux-pam.bst
+- filename: desktop/sdl2-mixer.bst
   junction: freedesktop-sdk.bst
-- filename: components/locales.bst
+- filename: desktop/sdl2-net.bst
   junction: freedesktop-sdk.bst
-- filename: components/lzip.bst
+- filename: desktop/sdl2-ttf.bst
   junction: freedesktop-sdk.bst
-- filename: components/nano.bst
+- filename: desktop/sdl2.bst
   junction: freedesktop-sdk.bst
-- filename: components/nettle.bst
+- filename: desktop/shared-mime-info.bst
   junction: freedesktop-sdk.bst
-- filename: components/npth.bst
+- filename: desktop/sound-theme-freedesktop.bst
   junction: freedesktop-sdk.bst
-- filename: components/nspr.bst
+- filename: desktop/vulkan.bst
   junction: freedesktop-sdk.bst
-- filename: components/nss.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/nsswitch-config.bst
+- filename: desktop/xcb-util-cursor.bst
   junction: freedesktop-sdk.bst
-- filename: components/opus.bst
+- filename: desktop/xcb-util-image.bst
   junction: freedesktop-sdk.bst
-- filename: components/osmesa.bst
+- filename: desktop/xcb-util-keysyms.bst
   junction: freedesktop-sdk.bst
-- filename: components/p11-kit.bst
+- filename: desktop/xcb-util-renderutil.bst
   junction: freedesktop-sdk.bst
-- filename: components/pcre2.bst
+- filename: desktop/xcb-util-wm.bst
   junction: freedesktop-sdk.bst
-- filename: components/pcre.bst
+- filename: desktop/xcb-util.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3.bst
+- filename: desktop/xdg-user-dirs.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3-pip.bst
+- filename: desktop/xorg-app-xkbcomp.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3-setuptools.bst
+- filename: desktop/xorg-data-xkeyboard-config.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3-six.bst
+- filename: desktop/xorg-lib-ice.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3-usercustomize.bst
+- filename: desktop/xorg-lib-pciaccess.bst
   junction: freedesktop-sdk.bst
-- filename: components/python3-sitecustomize.bst
+- filename: desktop/xorg-lib-sm.bst
   junction: freedesktop-sdk.bst
-- filename: components/tar.bst
+- filename: desktop/xorg-lib-x11.bst
   junction: freedesktop-sdk.bst
-- filename: components/sndfile.bst
+- filename: desktop/xorg-lib-xau.bst
   junction: freedesktop-sdk.bst
-- filename: components/sqlite.bst
+- filename: desktop/xorg-lib-xcb.bst
   junction: freedesktop-sdk.bst
-- filename: components/speex.bst
+- filename: desktop/xorg-lib-xcomposite.bst
   junction: freedesktop-sdk.bst
-- filename: components/speexdsp.bst
+- filename: desktop/xorg-lib-xcursor.bst
   junction: freedesktop-sdk.bst
-- filename: components/tzdata.bst
+- filename: desktop/xorg-lib-xdamage.bst
   junction: freedesktop-sdk.bst
-- filename: components/unzip.bst
+- filename: desktop/xorg-lib-xdmcp.bst
   junction: freedesktop-sdk.bst
-- filename: components/util-linux.bst
+- filename: desktop/xorg-lib-xext.bst
   junction: freedesktop-sdk.bst
-- filename: components/which.bst
+- filename: desktop/xorg-lib-xfixes.bst
   junction: freedesktop-sdk.bst
-- filename: components/xz.bst
+- filename: desktop/xorg-lib-xft.bst
   junction: freedesktop-sdk.bst
-- filename: components/zip.bst
+- filename: desktop/xorg-lib-xi.bst
   junction: freedesktop-sdk.bst
-- filename: components/shared-library-guard.bst
+- filename: desktop/xorg-lib-xinerama.bst
   junction: freedesktop-sdk.bst
-- filename: components/alsa-lib.bst
+- filename: desktop/xorg-lib-xkbfile.bst
   junction: freedesktop-sdk.bst
-- filename: components/alsa-plugins.bst
+- filename: desktop/xorg-lib-xpm.bst
   junction: freedesktop-sdk.bst
-- filename: components/aspell.bst
+- filename: desktop/xorg-lib-xrandr.bst
   junction: freedesktop-sdk.bst
-- filename: components/cairo.bst
+- filename: desktop/xorg-lib-xrender.bst
   junction: freedesktop-sdk.bst
-- filename: components/cups.bst
+- filename: desktop/xorg-lib-xscrnsaver.bst
   junction: freedesktop-sdk.bst
-- filename: components/dbus.bst
+- filename: desktop/xorg-lib-xshmfence.bst
   junction: freedesktop-sdk.bst
-- filename: components/dejavu-fonts.bst
+- filename: desktop/xorg-lib-xt.bst
   junction: freedesktop-sdk.bst
-- filename: components/dictionaries.bst
+- filename: desktop/xorg-lib-xtrans.bst
   junction: freedesktop-sdk.bst
-- filename: components/emoji-one-font.bst
+- filename: desktop/xorg-lib-xtst.bst
   junction: freedesktop-sdk.bst
-- filename: components/ffmpeg.bst
+- filename: desktop/xorg-lib-xv.bst
   junction: freedesktop-sdk.bst
-- filename: components/fftw.bst
-  junction: freedesktop-sdk.bst
-- filename: components/flatpak-xdg-utils.bst
-  junction: freedesktop-sdk.bst
-- filename: components/fontconfig.bst
-  junction: freedesktop-sdk.bst
-- filename: components/freetype.bst
-  junction: freedesktop-sdk.bst
-- filename: components/fribidi.bst
-  junction: freedesktop-sdk.bst
-- filename: components/gnu-free-fonts.bst
-  junction: freedesktop-sdk.bst
-- filename: components/google-crosextra-caladea.bst
-  junction: freedesktop-sdk.bst
-- filename: components/google-crosextra-carlito.bst
-  junction: freedesktop-sdk.bst
-- filename: components/graphite2.bst
-  junction: freedesktop-sdk.bst
-- filename: components/gstreamer.bst
-  junction: freedesktop-sdk.bst
-- filename: components/harfbuzz.bst
-  junction: freedesktop-sdk.bst
-- filename: components/hicolor-icon-theme.bst
-  junction: freedesktop-sdk.bst
-- filename: components/hunspell.bst
-  junction: freedesktop-sdk.bst
-- filename: components/hyphen.bst
-  junction: freedesktop-sdk.bst
-- filename: components/lame.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libclc.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libdatrie.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libdrm.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libepoxy.bst
-  junction: freedesktop-sdk.bst
-- filename: components/liberation-fonts.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libglvnd.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libproxy.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libpsl.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libseccomp.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libsystemd.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libthai.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libva-vdpau-driver.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libva.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libvdpau.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libxkbcommon.bst
-  junction: freedesktop-sdk.bst
-- filename: components/llvm8.bst
-  junction: freedesktop-sdk.bst
-- filename: components/mesa-headers.bst
-  junction: freedesktop-sdk.bst
-- filename: components/mpg123.bst
-  junction: freedesktop-sdk.bst
-- filename: components/multiarch-links.bst
-  junction: freedesktop-sdk.bst
-- filename: components/mythes.bst
-  junction: freedesktop-sdk.bst
-- filename: components/openal.bst
-  junction: freedesktop-sdk.bst
-- filename: components/opencl.bst
-  junction: freedesktop-sdk.bst
-- filename: components/orc.bst
-  junction: freedesktop-sdk.bst
-- filename: components/pciutils.bst
-  junction: freedesktop-sdk.bst
-- filename: components/pixman.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libpulse.bst
-  junction: freedesktop-sdk.bst
-- filename: components/sdl2-image.bst
-  junction: freedesktop-sdk.bst
-- filename: components/sdl2-mixer.bst
-  junction: freedesktop-sdk.bst
-- filename: components/sdl2-net.bst
-  junction: freedesktop-sdk.bst
-- filename: components/sdl2-ttf.bst
-  junction: freedesktop-sdk.bst
-- filename: components/sdl2.bst
-  junction: freedesktop-sdk.bst
-- filename: components/shared-mime-info.bst
-  junction: freedesktop-sdk.bst
-- filename: components/vulkan.bst
-  junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util-cursor.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util-image.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util-keysyms.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util-renderutil.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util-wm.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xcb-util.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xdg-user-dirs.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-app-xkbcomp.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-data-xkeyboard-config.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-ice.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-pciaccess.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-sm.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-x11.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xau.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcb.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcomposite.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcursor.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xdamage.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xdmcp.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xext.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xfixes.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xft.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xi.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xinerama.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xkbfile.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xpm.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xrandr.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xrender.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xscrnsaver.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xshmfence.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xt.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xtrans.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xtst.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xv.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xxf86vm.bst
+- filename: desktop/xorg-lib-xxf86vm.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 1e8beb85..43cd09b9 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -11,88 +11,22 @@ depends:
 # unwanted dependencies. See sdk-platform.bst for details.
 # This should be kept in sync with desktop.bst from freedesktop-sdk whenever we
 # update our reference.
-# elements we remove: platform and gtk-doc.
-- filename: components/autoconf-archive.bst
+# elements we remove: desktop-platform and gtk-doc.
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/autoconf.bst
+- filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/automake.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: components/bc.bst
+- filename: desktop/jq.bst
   junction: freedesktop-sdk.bst
-- filename: components/bison.bst
+- filename: desktop/mercurial.bst
   junction: freedesktop-sdk.bst
-- filename: components/ccache.bst
+- filename: desktop/wayland-protocols.bst
   junction: freedesktop-sdk.bst
-- filename: components/cmake.bst
+- filename: desktop/xorg-proto-xcb.bst
   junction: freedesktop-sdk.bst
-- filename: components/cpio.bst
+- filename: desktop/xorg-proto-xorgproto.bst
   junction: freedesktop-sdk.bst
-- filename: components/docbook-xml.bst
-  junction: freedesktop-sdk.bst
-- filename: components/docbook-xsl.bst
-  junction: freedesktop-sdk.bst
-- filename: components/ed.bst
-  junction: freedesktop-sdk.bst
-- filename: components/gdb.bst
-  junction: freedesktop-sdk.bst
-- filename: components/git.bst
-  junction: freedesktop-sdk.bst
-- filename: components/gperf.bst
-  junction: freedesktop-sdk.bst
-- filename: components/groff.bst
-  junction: freedesktop-sdk.bst
-- filename: components/help2man.bst
-  junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libpipeline.bst
-  junction: freedesktop-sdk.bst
-- filename: components/m4.bst
-  junction: freedesktop-sdk.bst
-- filename: components/man-db.bst
-  junction: freedesktop-sdk.bst
-- filename: components/man-pages-posix.bst
-  junction: freedesktop-sdk.bst
-- filename: components/man-pages.bst
-  junction: freedesktop-sdk.bst
-- filename: components/meson.bst
-  junction: freedesktop-sdk.bst
-- filename: components/nasm.bst
-  junction: freedesktop-sdk.bst
-- filename: components/ninja.bst
-  junction: freedesktop-sdk.bst
-- filename: components/perl.bst
-  junction: freedesktop-sdk.bst
-- filename: components/perl-xml-parser.bst
-  junction: freedesktop-sdk.bst
-- filename: components/openssh.bst
-  junction: freedesktop-sdk.bst
-- filename: components/patch.bst
-  junction: freedesktop-sdk.bst
-- filename: components/pkg-config.bst
-  junction: freedesktop-sdk.bst
-- filename: components/ruby.bst
-  junction: freedesktop-sdk.bst
-- filename: components/strace.bst
-  junction: freedesktop-sdk.bst
-- filename: components/texinfo.bst
-  junction: freedesktop-sdk.bst
-- filename: components/valgrind.bst
-  junction: freedesktop-sdk.bst
-- filename: components/desktop-file-utils.bst
-  junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
-  junction: freedesktop-sdk.bst
-- filename: components/jq.bst
-  junction: freedesktop-sdk.bst
-- filename: components/libva-utils.bst
-  junction: freedesktop-sdk.bst
-- filename: components/wayland-protocols.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-proto-xcb.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-proto-xorgproto.bst
-  junction: freedesktop-sdk.bst
-- filename: components/xorg-util-macros.bst
+- filename: desktop/xorg-util-macros.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/WebKitGTK.bst
index d0c2c0c7..d7b6b0bf 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/WebKitGTK.bst
@@ -30,25 +30,25 @@ depends:
 - sdk/pango.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
-- filename: components/hyphen.bst
+- filename: desktop/hyphen.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xt.bst
+- filename: desktop/xorg-lib-xt.bst
   junction: freedesktop-sdk.bst
-- filename: components/gperf.bst
+- filename: base/gperf.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/ruby.bst
+- filename: base/ruby.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   webkitgtk_toolchain: ''
diff --git a/elements/sdk/adwaita-icon-theme.bst b/elements/sdk/adwaita-icon-theme.bst
index 731b3a55..95ddeb08 100644
--- a/elements/sdk/adwaita-icon-theme.bst
+++ b/elements/sdk/adwaita-icon-theme.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/appstream-glib.bst b/elements/sdk/appstream-glib.bst
index a325125e..8cd7603b 100644
--- a/elements/sdk/appstream-glib.bst
+++ b/elements/sdk/appstream-glib.bst
@@ -11,20 +11,20 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
-- filename: components/gettext.bst
+- filename: base/gettext.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/gperf.bst
+- filename: base/gperf.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/libarchive.bst
+- filename: base/libarchive.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/at-spi2-atk.bst b/elements/sdk/at-spi2-atk.bst
index cc9fa8d1..7e0cd03f 100644
--- a/elements/sdk/at-spi2-atk.bst
+++ b/elements/sdk/at-spi2-atk.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/at-spi2-core.bst
 - sdk/atk.bst
 - sdk/glib.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/at-spi2-core.bst b/elements/sdk/at-spi2-core.bst
index 78761474..aaea7bac 100644
--- a/elements/sdk/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -6,10 +6,10 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/atk.bst b/elements/sdk/atk.bst
index c4310316..8ba01c12 100644
--- a/elements/sdk/atk.bst
+++ b/elements/sdk/atk.bst
@@ -8,8 +8,8 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/brotli.bst b/elements/sdk/brotli.bst
index e57f7ef3..f754650f 100644
--- a/elements/sdk/brotli.bst
+++ b/elements/sdk/brotli.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: github_com:google/brotli/archive/v1.0.5.tar.gz
 depends:
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/cantarell-fonts.bst b/elements/sdk/cantarell-fonts.bst
index 82257559..8d26f88f 100644
--- a/elements/sdk/cantarell-fonts.bst
+++ b/elements/sdk/cantarell-fonts.bst
@@ -4,8 +4,8 @@ sources:
   url: gnome_downloads:cantarell-fonts/0.111/cantarell-fonts-0.111.tar.xz
 depends:
 - sdk/appstream-glib.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter-gst.bst b/elements/sdk/clutter-gst.bst
index e6cf0dd3..72e61ff9 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -10,10 +10,10 @@ depends:
 - sdk/gst-plugins-base.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter-gtk.bst b/elements/sdk/clutter-gtk.bst
index 1d72f248..d1e7b1e9 100644
--- a/elements/sdk/clutter-gtk.bst
+++ b/elements/sdk/clutter-gtk.bst
@@ -5,8 +5,8 @@ sources:
 depends:
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/clutter.bst b/elements/sdk/clutter.bst
index a47209d9..0477a7e9 100644
--- a/elements/sdk/clutter.bst
+++ b/elements/sdk/clutter.bst
@@ -12,14 +12,14 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/json-glib.bst
-- filename: components/libxkbcommon.bst
+- filename: desktop/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index f11fe42c..6fcd0e94 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -10,16 +10,16 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pango.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcomposite.bst
+- filename: desktop/xorg-lib-xcomposite.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/dbus-glib.bst b/elements/sdk/dbus-glib.bst
index 294aa006..3cd5271c 100644
--- a/elements/sdk/dbus-glib.bst
+++ b/elements/sdk/dbus-glib.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
 depends:
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/dconf.bst b/elements/sdk/dconf.bst
index 33fa78cb..e4d17632 100644
--- a/elements/sdk/dconf.bst
+++ b/elements/sdk/dconf.bst
@@ -9,16 +9,16 @@ depends:
 - sdk/glib.bst
 - filename: sdk/vala.bst
   type: build
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/enchant-2.bst b/elements/sdk/enchant-2.bst
index c5cc64ae..4e6b8623 100644
--- a/elements/sdk/enchant-2.bst
+++ b/elements/sdk/enchant-2.bst
@@ -4,12 +4,12 @@ sources:
   url: github_com:AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
 depends:
 - sdk/glib.bst
-- filename: components/hunspell.bst
+- filename: desktop/hunspell.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/fcitx.bst b/elements/sdk/fcitx.bst
index 9b257a9c..489131b6 100644
--- a/elements/sdk/fcitx.bst
+++ b/elements/sdk/fcitx.bst
@@ -4,13 +4,13 @@ sources:
   url: https://gitlab.com/fcitx/fcitx/-/archive/4.2.9.6/fcitx-4.2.9.6.tar.gz
 depends:
 - sdk/gtk+-3.bst
-- filename: components/extra-cmake-modules.bst
+- filename: desktop/extra-cmake-modules.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/sdk/gcab.bst b/elements/sdk/gcab.bst
index 5d3fe28e..7bd2af82 100644
--- a/elements/sdk/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -10,11 +10,11 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/git.bst
+- filename: base/git.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gcr.bst b/elements/sdk/gcr.bst
index 6e3f25f7..c4de7bfa 100644
--- a/elements/sdk/gcr.bst
+++ b/elements/sdk/gcr.bst
@@ -10,11 +10,11 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gdk-pixbuf.bst b/elements/sdk/gdk-pixbuf.bst
index 99248e21..78dab6fe 100644
--- a/elements/sdk/gdk-pixbuf.bst
+++ b/elements/sdk/gdk-pixbuf.bst
@@ -8,14 +8,14 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/shared-mime-info.bst
+- filename: desktop/shared-mime-info.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-x11.bst
+- filename: desktop/xorg-lib-x11.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 public:
   bst:
diff --git a/elements/sdk/geoclue.bst b/elements/sdk/geoclue.bst
index 3520e251..5ccf16dd 100644
--- a/elements/sdk/geoclue.bst
+++ b/elements/sdk/geoclue.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/libsoup.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/gjs.bst b/elements/sdk/gjs.bst
index 1479e169..80493b66 100644
--- a/elements/sdk/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -7,14 +7,14 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/mozjs60.bst
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/glib-networking.bst b/elements/sdk/glib-networking.bst
index 9ea83ef9..e6408031 100644
--- a/elements/sdk/glib-networking.bst
+++ b/elements/sdk/glib-networking.bst
@@ -6,12 +6,12 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
-- filename: components/libproxy.bst
+- filename: desktop/libproxy.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/glib.bst b/elements/sdk/glib.bst
index a8ec2e8f..8f3e21a4 100644
--- a/elements/sdk/glib.bst
+++ b/elements/sdk/glib.bst
@@ -6,10 +6,10 @@ sources:
 depends:
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/gnome-common.bst b/elements/sdk/gnome-common.bst
index a850e5d6..46c04a7f 100644
--- a/elements/sdk/gnome-common.bst
+++ b/elements/sdk/gnome-common.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: gnome_downloads:gnome-common/3.18/gnome-common-3.18.0.tar.xz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 config:
   install-commands:
diff --git a/elements/sdk/gnome-themes-extra.bst b/elements/sdk/gnome-themes-extra.bst
index a4d7ba28..83d1ee64 100644
--- a/elements/sdk/gnome-themes-extra.bst
+++ b/elements/sdk/gnome-themes-extra.bst
@@ -7,13 +7,13 @@ depends:
 - sdk/cantarell-fonts.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/gobject-introspection.bst b/elements/sdk/gobject-introspection.bst
index ecb83453..678cc63e 100644
--- a/elements/sdk/gobject-introspection.bst
+++ b/elements/sdk/gobject-introspection.bst
@@ -7,13 +7,13 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/bison.bst
+- filename: base/bison.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/graphene.bst b/elements/sdk/graphene.bst
index c008e25b..38357ce8 100644
--- a/elements/sdk/graphene.bst
+++ b/elements/sdk/graphene.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gsettings-desktop-schemas.bst b/elements/sdk/gsettings-desktop-schemas.bst
index 3304f6cb..e570ad25 100644
--- a/elements/sdk/gsettings-desktop-schemas.bst
+++ b/elements/sdk/gsettings-desktop-schemas.bst
@@ -8,8 +8,8 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gst-libav.bst b/elements/sdk/gst-libav.bst
index 497314f5..49fb989a 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -1,15 +1,15 @@
 kind: filter
 depends:
-- filename: components/gstreamer-libav.bst
+- filename: desktop/gstreamer-libav.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/orc.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/gst-plugins-base.bst
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
index 06f905d7..d95fe7c5 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -1,51 +1,51 @@
 kind: filter
 depends:
-- filename: components/gstreamer-plugins-bad.bst
+- filename: desktop/gstreamer-plugins-bad.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/orc.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/gst-plugins-base.bst
   type: runtime
-- filename: components/libdrm.bst
+- filename: desktop/libdrm.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libfdk-aac.bst
+- filename: desktop/libfdk-aac.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libglvnd.bst
+- filename: desktop/libglvnd.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/librsvg.bst
   type: runtime
-- filename: components/libvdpau.bst
+- filename: desktop/libvdpau.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/mesa.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/openal.bst
+- filename: desktop/openal.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/vulkan.bst
+- filename: desktop/vulkan.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/curl.bst
+- filename: base/curl.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libwebp.bst
+- filename: base/libwebp.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/sndfile.bst
+- filename: base/sndfile.bst
   junction: freedesktop-sdk.bst
   type: runtime
diff --git a/elements/sdk/gst-plugins-base.bst b/elements/sdk/gst-plugins-base.bst
index 9d6e4ce2..6766e092 100644
--- a/elements/sdk/gst-plugins-base.bst
+++ b/elements/sdk/gst-plugins-base.bst
@@ -1,34 +1,34 @@
 kind: filter
 depends:
-- filename: components/gstreamer-plugins-base.bst
+- filename: desktop/gstreamer-plugins-base.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/orc.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/mesa.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/pango.bst
   type: runtime
-- filename: components/xorg-lib-xv.bst
+- filename: desktop/xorg-lib-xv.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libogg.bst
+- filename: base/libogg.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libtheora.bst
+- filename: base/libtheora.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libvorbis.bst
+- filename: base/libvorbis.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/opus.bst
+- filename: base/opus.bst
   junction: freedesktop-sdk.bst
   type: runtime
diff --git a/elements/sdk/gst-plugins-good.bst b/elements/sdk/gst-plugins-good.bst
index 8060be12..09622c11 100644
--- a/elements/sdk/gst-plugins-good.bst
+++ b/elements/sdk/gst-plugins-good.bst
@@ -1,40 +1,40 @@
 kind: filter
 depends:
-- filename: components/gstreamer-plugins-good.bst
+- filename: desktop/gstreamer-plugins-good.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/orc.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/lame.bst
+- filename: desktop/lame.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/libpulse.bst
+- filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/libsoup.bst
   type: runtime
-- filename: components/mpg123.bst
+- filename: desktop/mpg123.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/gtk+-3.bst
   type: runtime
 - filename: sdk/gdk-pixbuf.bst
   type: runtime
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
   type: runtime
 - filename: sdk/gst-plugins-base.bst
   type: runtime
-- filename: components/libflac.bst
+- filename: base/libflac.bst
   junction: freedesktop-sdk.bst
   type: runtime
-- filename: components/wavpack.bst
+- filename: base/wavpack.bst
   junction: freedesktop-sdk.bst
   type: runtime
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index 23b4a0ef..e5f59ed4 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -12,34 +12,34 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pango.bst
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/hicolor-icon-theme.bst
+- filename: desktop/hicolor-icon-theme.bst
   junction: freedesktop-sdk.bst
-- filename: components/libepoxy.bst
+- filename: desktop/libepoxy.bst
   junction: freedesktop-sdk.bst
-- filename: components/libxkbcommon.bst
+- filename: desktop/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: components/mesa-headers.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland-protocols.bst
+- filename: desktop/wayland-protocols.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcomposite.bst
+- filename: desktop/xorg-lib-xcomposite.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xcursor.bst
+- filename: desktop/xorg-lib-xcursor.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xdamage.bst
+- filename: desktop/xorg-lib-xdamage.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xi.bst
+- filename: desktop/xorg-lib-xi.bst
   junction: freedesktop-sdk.bst
-- filename: components/xorg-lib-xinerama.bst
+- filename: desktop/xorg-lib-xinerama.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/gtk-doc.bst b/elements/sdk/gtk-doc.bst
index cff9ff6c..96d45f5c 100644
--- a/elements/sdk/gtk-doc.bst
+++ b/elements/sdk/gtk-doc.bst
@@ -7,10 +7,10 @@ depends:
 - sdk/yelp-tools.bst
 - filename: sdk/python-pygments.bst
   type: runtime
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index bee54453..023d0143 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -15,24 +15,24 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pango.bst
-- filename: components/cups.bst
+- filename: desktop/cups.bst
   junction: freedesktop-sdk.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/hicolor-icon-theme.bst
+- filename: desktop/hicolor-icon-theme.bst
   junction: freedesktop-sdk.bst
-- filename: components/libepoxy.bst
+- filename: desktop/libepoxy.bst
   junction: freedesktop-sdk.bst
-- filename: components/libxkbcommon.bst
+- filename: desktop/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland-protocols.bst
+- filename: desktop/wayland-protocols.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/gvfs.bst b/elements/sdk/gvfs.bst
index 6765a6d2..ec61995f 100644
--- a/elements/sdk/gvfs.bst
+++ b/elements/sdk/gvfs.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 depends:
 - sdk/glib.bst
-- filename: components/dbus.bst
+- filename: desktop/dbus.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/ibus.bst b/elements/sdk/ibus.bst
index 87e4e8d3..68993ad3 100644
--- a/elements/sdk/ibus.bst
+++ b/elements/sdk/ibus.bst
@@ -8,10 +8,10 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/json-glib.bst b/elements/sdk/json-glib.bst
index 3f1d67e6..6f8dec2d 100644
--- a/elements/sdk/json-glib.bst
+++ b/elements/sdk/json-glib.bst
@@ -9,8 +9,8 @@ depends:
   type: build
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libcanberra.bst b/elements/sdk/libcanberra.bst
index 8fd7dd1f..3d2859e5 100644
--- a/elements/sdk/libcanberra.bst
+++ b/elements/sdk/libcanberra.bst
@@ -4,12 +4,12 @@ sources:
   url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
 depends:
 - sdk/gtk+-3.bst
-- filename: components/libpulse.bst
+- filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/sdk/libcroco.bst b/elements/sdk/libcroco.bst
index 8b37de33..37d4816d 100644
--- a/elements/sdk/libcroco.bst
+++ b/elements/sdk/libcroco.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libgee.bst b/elements/sdk/libgee.bst
index 51ee1752..a99023d7 100644
--- a/elements/sdk/libgee.bst
+++ b/elements/sdk/libgee.bst
@@ -8,8 +8,8 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libnotify.bst b/elements/sdk/libnotify.bst
index 212a9e9f..17cfebdd 100644
--- a/elements/sdk/libnotify.bst
+++ b/elements/sdk/libnotify.bst
@@ -11,10 +11,10 @@ depends:
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/librsvg.bst b/elements/sdk/librsvg.bst
index 85ea9151..25bec97d 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -305,15 +305,15 @@ depends:
 - sdk/pango.bst
 - filename: sdk/vala.bst
   type: build
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
 - filename: extensions/rust/rust.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/libsecret.bst b/elements/sdk/libsecret.bst
index 0a5dbea3..80ca53a1 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -10,8 +10,8 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/libsoup.bst b/elements/sdk/libsoup.bst
index 504f50f4..f4c95ed9 100644
--- a/elements/sdk/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -10,12 +10,12 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/libpsl.bst
+- filename: desktop/libpsl.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 - filename: sdk/brotli.bst
 variables:
diff --git a/elements/sdk/libwpe.bst b/elements/sdk/libwpe.bst
index 27b7b5a5..27ed6423 100644
--- a/elements/sdk/libwpe.bst
+++ b/elements/sdk/libwpe.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: github_com:WebPlatformForEmbedded/libwpe/releases/download/1.3.1/libwpe-1.3.1.tar.xz
 depends:
-- filename: bootstrap-import.bst
+- filename: desktop/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-  type: build
-- filename: components/libxkbcommon.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
-- filename: components/mesa-headers.bst
+  type: build
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/mozjs60.bst b/elements/sdk/mozjs60.bst
index 8ec22ba7..06d25b77 100644
--- a/elements/sdk/mozjs60.bst
+++ b/elements/sdk/mozjs60.bst
@@ -3,18 +3,16 @@ sources:
 - kind: tar
   url: gnome_download:teams/releng/tarballs-needing-help/mozjs/mozjs-60.1.0.tar.bz2
 depends:
-- filename: sdk/python2.bst
-  type: build
-- filename: components/which.bst
+- filename: base/python2.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/autoconf.bst
+- filename: base/autoconf.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl.bst
+- filename: base/perl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   mozjs_target: ''
diff --git a/elements/sdk/openjpeg.bst b/elements/sdk/openjpeg.bst
index 21e2ee3e..7beaf544 100644
--- a/elements/sdk/openjpeg.bst
+++ b/elements/sdk/openjpeg.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: github_com:uclouvain/openjpeg/archive/v2.3.1.tar.gz
 depends:
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/sdk/os-release.bst b/elements/sdk/os-release.bst
index a6d61e41..d22c06cf 100644
--- a/elements/sdk/os-release.bst
+++ b/elements/sdk/os-release.bst
@@ -5,7 +5,7 @@ sources:
 depends:
 - filename: sdk/appstream-glib.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 config:
   build-commands:
diff --git a/elements/sdk/pango.bst b/elements/sdk/pango.bst
index 4c12d832..a49939d7 100644
--- a/elements/sdk/pango.bst
+++ b/elements/sdk/pango.bst
@@ -8,16 +8,16 @@ depends:
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/fontconfig.bst
+- filename: desktop/fontconfig.bst
   junction: freedesktop-sdk.bst
-- filename: components/fribidi.bst
+- filename: desktop/fribidi.bst
   junction: freedesktop-sdk.bst
-- filename: components/harfbuzz.bst
+- filename: desktop/harfbuzz.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/pycairo.bst b/elements/sdk/pycairo.bst
index 0e207c6c..1af1834a 100644
--- a/elements/sdk/pycairo.bst
+++ b/elements/sdk/pycairo.bst
@@ -3,12 +3,12 @@ sources:
 - kind: tar
   url: github_com:pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz
 depends:
-- filename: components/cairo.bst
+- filename: desktop/cairo.bst
   junction: freedesktop-sdk.bst
-- filename: components/pkg-config.bst
+- filename: base/pkg-config.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   python: python3
diff --git a/elements/sdk/pygobject.bst b/elements/sdk/pygobject.bst
index 6c1d4d5b..7b5a7915 100644
--- a/elements/sdk/pygobject.bst
+++ b/elements/sdk/pygobject.bst
@@ -7,8 +7,8 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/pycairo.bst
-- filename: components/pkg-config.bst
+- filename: base/pkg-config.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/python-pygments.bst b/elements/sdk/python-pygments.bst
index eeda8595..59ce492a 100644
--- a/elements/sdk/python-pygments.bst
+++ b/elements/sdk/python-pygments.bst
@@ -3,7 +3,5 @@ sources:
 - kind: tar
   url: 
https://files.pythonhosted.org/packages/64/69/413708eaf3a64a6abb8972644e0f20891a55e621c6759e2c3f3891e05d63/Pygments-2.3.1.tar.gz
 depends:
-- filename: components/python3.bst
-  junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/vala-tarball.bst b/elements/sdk/vala-tarball.bst
index 29807e62..068b00ec 100644
--- a/elements/sdk/vala-tarball.bst
+++ b/elements/sdk/vala-tarball.bst
@@ -3,16 +3,13 @@ sources:
 - kind: tar
   url: gnome_downloads:vala/0.36/vala-0.36.18.tar.xz
 depends:
-- filename: components/bison.bst
+- filename: base/bison.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/flex.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: build-aux
diff --git a/elements/sdk/vala.bst b/elements/sdk/vala.bst
index 2275b3bd..029d6c4b 100644
--- a/elements/sdk/vala.bst
+++ b/elements/sdk/vala.bst
@@ -7,16 +7,16 @@ depends:
 - sdk/glib.bst
 - filename: sdk/vala-tarball.bst
   type: build
-- filename: components/bison.bst
+- filename: base/bison.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/git-minimal.bst
+- filename: base/git-minimal.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/vte.bst b/elements/sdk/vte.bst
index bd1b8403..cac49862 100644
--- a/elements/sdk/vte.bst
+++ b/elements/sdk/vte.bst
@@ -10,11 +10,11 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/woff2.bst b/elements/sdk/woff2.bst
index 210dbaf1..9adf6001 100644
--- a/elements/sdk/woff2.bst
+++ b/elements/sdk/woff2.bst
@@ -4,8 +4,8 @@ sources:
   url: github_com:google/woff2/archive/v1.0.2.tar.gz
 depends:
 - sdk/brotli.bst
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/wpebackend-fdo.bst b/elements/sdk/wpebackend-fdo.bst
index 9f1414c9..274a5b1b 100644
--- a/elements/sdk/wpebackend-fdo.bst
+++ b/elements/sdk/wpebackend-fdo.bst
@@ -3,14 +3,14 @@ sources:
 - kind: tar
   url: github_com:Igalia/WPEBackend-fdo/releases/download/1.3.1/wpebackend-fdo-1.3.1.tar.xz
 depends:
-- filename: bootstrap-import.bst
+- sdk/glib.bst
+- sdk/libwpe.bst
+- filename: desktop/mesa.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-cmake.bst
+- filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
-  type: build
-- filename: components/mesa-headers.bst
+- filename: base/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
-- filename: components/wayland.bst
+  type: build
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- sdk/glib.bst
-- sdk/libwpe.bst
diff --git a/elements/sdk/yelp-tools.bst b/elements/sdk/yelp-tools.bst
index 2fb6255f..4f1b5926 100644
--- a/elements/sdk/yelp-tools.bst
+++ b/elements/sdk/yelp-tools.bst
@@ -5,11 +5,11 @@ sources:
   track: master
 depends:
 - sdk/yelp-xsl.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/yelp-xsl.bst b/elements/sdk/yelp-xsl.bst
index 31c3abcd..ea00a5c1 100644
--- a/elements/sdk/yelp-xsl.bst
+++ b/elements/sdk/yelp-xsl.bst
@@ -4,16 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/yelp-xsl.git
   track: master
 depends:
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/which.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
index aa5d1847..b31b9a37 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -12,12 +12,12 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/yelp-xsl.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
-- filename: components/desktop-file-utils.bst
+- filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
 
 public:
diff --git a/elements/sdk/zenity.bst b/elements/sdk/zenity.bst
index 98933819..6037487c 100644
--- a/elements/sdk/zenity.bst
+++ b/elements/sdk/zenity.bst
@@ -6,8 +6,8 @@ sources:
 depends:
 - sdk/gtk+-3.bst
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index f7db2f2e..f6be4c49 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -11,5 +11,5 @@ depends:
 - sdk/pycairo.bst
 - sdk/pygobject.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/amtk.bst b/elements/world/amtk.bst
index 18b914a9..3d392cc4 100644
--- a/elements/world/amtk.bst
+++ b/elements/world/amtk.bst
@@ -9,5 +9,5 @@ depends:
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/anthy.bst b/elements/world/anthy.bst
index 0af8131b..ca24344f 100644
--- a/elements/world/anthy.bst
+++ b/elements/world/anthy.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: http://http.debian.net/debian/pool/main/a/anthy/anthy_0.3.orig.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index c5b8807d..d774028c 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -15,7 +15,7 @@ depends:
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/dconf-editor.bst b/elements/world/dconf-editor.bst
index 938fe6ca..9b0103e7 100644
--- a/elements/world/dconf-editor.bst
+++ b/elements/world/dconf-editor.bst
@@ -9,5 +9,5 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/devhelp.bst b/elements/world/devhelp.bst
index f5b9ff95..63a561d7 100644
--- a/elements/world/devhelp.bst
+++ b/elements/world/devhelp.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/gtk-doc.bst
 - world/amtk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index ae3bbcf2..7960bd8f 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -23,9 +23,9 @@ depends:
 - sdk/libsoup.bst
 - sdk/yelp-tools.bst
 - world/gtkspell.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/world/five-or-more.bst b/elements/world/five-or-more.bst
index 4308ba81..71b172e2 100644
--- a/elements/world/five-or-more.bst
+++ b/elements/world/five-or-more.bst
@@ -8,7 +8,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - world/libgnome-games-support.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/four-in-a-row.bst b/elements/world/four-in-a-row.bst
index 920bafcd..5a1585f0 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -11,8 +11,8 @@ depends:
 - filename: sdk/vala.bst
   type: build
 - sdk/yelp-tools.bst
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/fuse.bst b/elements/world/fuse.bst
index 1b78320a..36331d0a 100644
--- a/elements/world/fuse.bst
+++ b/elements/world/fuse.bst
@@ -5,10 +5,10 @@ sources:
 - kind: patch
   path: files/fuse/fuse-kernel-h-clean-includes.patch
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 environment:
   MOUNT_FUSE_PATH: '%{sbindir}'
diff --git a/elements/world/ghex.bst b/elements/world/ghex.bst
index 12cfac27..dd6c85c7 100644
--- a/elements/world/ghex.bst
+++ b/elements/world/ghex.bst
@@ -6,7 +6,7 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index 93cb2074..df7dc0cb 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -18,5 +18,5 @@ depends:
 - world/gtksourceview-3.bst
 - world/gtkspell.bst
 - world/libgit2-glib.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-builder.bst b/elements/world/gnome-builder.bst
index a0c37602..65e30a1f 100644
--- a/elements/world/gnome-builder.bst
+++ b/elements/world/gnome-builder.bst
@@ -24,9 +24,9 @@ depends:
 - world/template-glib.bst
 - filename: deploy-tools/flatpak.bst
   junction: freedesktop-sdk.bst
-- filename: components/llvm8.bst
+- filename: desktop/llvm6.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   meson-local: >-
diff --git a/elements/world/gnome-chess.bst b/elements/world/gnome-chess.bst
index 35508a45..3836b9a2 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -9,5 +9,5 @@ depends:
 - sdk/librsvg.bst
 - sdk/vala.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.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 fff4e0cf..3f61f7b4 100644
--- a/elements/world/gnome-code-assistance.bst
+++ b/elements/world/gnome-code-assistance.bst
@@ -5,5 +5,5 @@ sources:
   track: master
 depends:
 - sdk/vala.bst
-- filename: bootstrap-import.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 e432cbbc..2cfaaf98 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -5,5 +5,5 @@ sources:
   track: master
 depends:
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-dictionary.bst b/elements/world/gnome-dictionary.bst
index 5d579b99..8bbba510 100644
--- a/elements/world/gnome-dictionary.bst
+++ b/elements/world/gnome-dictionary.bst
@@ -6,7 +6,7 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 524064bd..ee4eacd7 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -23,16 +23,16 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- filename: components/desktop-file-utils.bst
+- filename: desktop/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/docbook-xsl.bst
+- filename: base/docbook-xsl.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/git-minimal.bst
+- filename: base/git-minimal.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-meson.bst
+- filename: base/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-games.bst b/elements/world/gnome-games.bst
index 2f65cf38..458dd958 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -19,7 +19,7 @@ depends:
 - sdk/vala.bst
 - world/libmanette.bst
 - world/retro-gtk.bst
-- filename: components/hicolor-icon-theme.bst
+- filename: desktop/hicolor-icon-theme.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-internet-radio-locator.bst b/elements/world/gnome-internet-radio-locator.bst
index bb41f805..c2433f7b 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -18,7 +18,7 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pango.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index a27088c7..1167993f 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -8,7 +8,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - world/libgnome-games-support.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-mahjongg.bst b/elements/world/gnome-mahjongg.bst
index da0e74f2..bfd06e64 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -8,7 +8,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-mines.bst b/elements/world/gnome-mines.bst
index 721d08d9..36a39098 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -9,7 +9,7 @@ depends:
 - sdk/librsvg.bst
 - sdk/vala.bst
 - world/libgnome-games-support.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-multi-writer.bst b/elements/world/gnome-multi-writer.bst
index 7b124626..9bd1009a 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/libcanberra.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-nettool.bst b/elements/world/gnome-nettool.bst
index f31c4b87..843a30e5 100644
--- a/elements/world/gnome-nettool.bst
+++ b/elements/world/gnome-nettool.bst
@@ -8,5 +8,5 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index d335f426..dd97d03a 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -14,5 +14,5 @@ depends:
 - sdk/vala.bst
 - sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-recipes.bst b/elements/world/gnome-recipes.bst
index 65eb7b2c..bffa9b91 100644
--- a/elements/world/gnome-recipes.bst
+++ b/elements/world/gnome-recipes.bst
@@ -12,7 +12,7 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/gspell.bst
 - sdk/gtk+-3.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-robots.bst b/elements/world/gnome-robots.bst
index 366642a4..701efcd0 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/librsvg.bst
 - sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
-- filename: bootstrap-import.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 54949e6c..5462b16d 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -10,7 +10,7 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
-- filename: components/gstreamer.bst
+- filename: desktop/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-sudoku.bst b/elements/world/gnome-sudoku.bst
index 0e76d559..4019e356 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -10,7 +10,7 @@ depends:
 - sdk/json-glib.bst
 - sdk/libgee.bst
 - world/qqwing.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-taquin.bst b/elements/world/gnome-taquin.bst
index e60dc70f..2ce5c130 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/librsvg.bst
 - sdk/vala.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-tetravex.bst b/elements/world/gnome-tetravex.bst
index 127f6c27..516d0fb4 100644
--- a/elements/world/gnome-tetravex.bst
+++ b/elements/world/gnome-tetravex.bst
@@ -6,7 +6,7 @@ sources:
 depends:
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-todo.bst b/elements/world/gnome-todo.bst
index 7f375360..5c62e974 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-tweaks.bst b/elements/world/gnome-tweaks.bst
index 0a01db02..9c8ab979 100644
--- a/elements/world/gnome-tweaks.bst
+++ b/elements/world/gnome-tweaks.bst
@@ -8,5 +8,5 @@ depends:
 - core/nautilus.bst
 - sdk/librsvg.bst
 - sdk/pygobject.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gtksourceview-3.bst b/elements/world/gtksourceview-3.bst
index b58de715..bbbc5a51 100644
--- a/elements/world/gtksourceview-3.bst
+++ b/elements/world/gtksourceview-3.bst
@@ -9,11 +9,11 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gtkspell.bst b/elements/world/gtkspell.bst
index 26937012..3c7e9bc3 100644
--- a/elements/world/gtkspell.bst
+++ b/elements/world/gtkspell.bst
@@ -10,11 +10,11 @@ depends:
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gupnp-igd.bst b/elements/world/gupnp-igd.bst
index 24973711..a65e12e2 100644
--- a/elements/world/gupnp-igd.bst
+++ b/elements/world/gupnp-igd.bst
@@ -6,10 +6,10 @@ sources:
 depends:
 - core-deps/gupnp.bst
 - sdk/glib.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/hitori.bst b/elements/world/hitori.bst
index 305e135e..69dc0432 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -8,5 +8,5 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/iagno.bst b/elements/world/iagno.bst
index bf0ea796..40b4275f 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/librsvg.bst
 - sdk/vala.bst
 - sdk/yelp-tools.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/ibus-anthy.bst b/elements/world/ibus-anthy.bst
index 3093d17d..eca9e3dc 100644
--- a/elements/world/ibus-anthy.bst
+++ b/elements/world/ibus-anthy.bst
@@ -8,13 +8,13 @@ depends:
 - sdk/ibus.bst
 - sdk/pygobject.bst
 - world/anthy.bst
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/ibus-hangul.bst b/elements/world/ibus-hangul.bst
index 839c3bd5..2cf794ab 100644
--- a/elements/world/ibus-hangul.bst
+++ b/elements/world/ibus-hangul.bst
@@ -5,14 +5,14 @@ sources:
 depends:
 - sdk/ibus.bst
 - world/libhangul.bst
-- filename: components/intltool.bst
+- filename: base/intltool.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
+- filename: base/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/ibus-libpinyin.bst b/elements/world/ibus-libpinyin.bst
index ac9b1b6c..5fd4a98e 100644
--- a/elements/world/ibus-libpinyin.bst
+++ b/elements/world/ibus-libpinyin.bst
@@ -5,16 +5,10 @@ sources:
 depends:
 - sdk/ibus.bst
 - world/libpinyin.bst
-- filename: components/intltool.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/perl-xml-parser.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: public-stacks/buildsystem-autotools.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/jsonrpc-glib.bst b/elements/world/jsonrpc-glib.bst
index 96ff042e..679d81b2 100644
--- a/elements/world/jsonrpc-glib.bst
+++ b/elements/world/jsonrpc-glib.bst
@@ -8,5 +8,5 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/json-glib.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/kyotocabinet.bst b/elements/world/kyotocabinet.bst
index 822f6a54..18f13bb3 100644
--- a/elements/world/kyotocabinet.bst
+++ b/elements/world/kyotocabinet.bst
@@ -5,8 +5,8 @@ sources:
 - kind: patch
   path: files/kyotocabinet/cpp-14.patch
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libbluray.bst b/elements/world/libbluray.bst
index 89f00449..ca234389 100644
--- a/elements/world/libbluray.bst
+++ b/elements/world/libbluray.bst
@@ -3,14 +3,14 @@ sources:
 - kind: tar
   url: http://ftp.videolan.org/pub/videolan/libbluray/1.0.2/libbluray-1.0.2.tar.bz2
 depends:
-- filename: components/fontconfig.bst
+- filename: desktop/fontconfig.bst
   junction: freedesktop-sdk.bst
-- filename: components/freetype.bst
+- filename: desktop/freetype.bst
   junction: freedesktop-sdk.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/libcdio-paranoia.bst b/elements/world/libcdio-paranoia.bst
index f73acb05..6d8d184b 100644
--- a/elements/world/libcdio-paranoia.bst
+++ b/elements/world/libcdio-paranoia.bst
@@ -4,8 +4,8 @@ sources:
   url: ftp_gnu_org:libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
 depends:
 - world/libcdio.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libcdio.bst b/elements/world/libcdio.bst
index efe27810..bfd578d9 100644
--- a/elements/world/libcdio.bst
+++ b/elements/world/libcdio.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: ftp_gnu_org:libcdio/libcdio-2.0.0.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/libgit2-glib.bst b/elements/world/libgit2-glib.bst
index 9d2f5fb1..cb2303d7 100644
--- a/elements/world/libgit2-glib.bst
+++ b/elements/world/libgit2-glib.bst
@@ -10,5 +10,5 @@ depends:
 - sdk/vala.bst
 - world/libgit2.bst
 - world/libssh2.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgit2.bst b/elements/world/libgit2.bst
index dcff0620..06442cbc 100644
--- a/elements/world/libgit2.bst
+++ b/elements/world/libgit2.bst
@@ -4,7 +4,7 @@ sources:
   url: github_com:libgit2/libgit2/archive/v0.26.3.tar.gz
 depends:
 - world/libssh2.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/world/libgnome-games-support.bst b/elements/world/libgnome-games-support.bst
index 3e8502c4..01b83c81 100644
--- a/elements/world/libgnome-games-support.bst
+++ b/elements/world/libgnome-games-support.bst
@@ -8,5 +8,5 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libgphoto2.bst b/elements/world/libgphoto2.bst
index 2b9638f5..d95ac5cd 100644
--- a/elements/world/libgphoto2.bst
+++ b/elements/world/libgphoto2.bst
@@ -3,10 +3,10 @@ sources:
 - kind: tar
   url: downloads.sourceforge.net:gphoto/libgphoto/2.5.16/libgphoto2-2.5.16.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-aux: auto-aux
diff --git a/elements/world/libgrss.bst b/elements/world/libgrss.bst
index 4060ed36..d11979a8 100644
--- a/elements/world/libgrss.bst
+++ b/elements/world/libgrss.bst
@@ -8,8 +8,8 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsoup.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libhangul.bst b/elements/world/libhangul.bst
index c0913fac..1e6a9ff8 100644
--- a/elements/world/libhangul.bst
+++ b/elements/world/libhangul.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: http://kldp.net/hangul/release/3442-libhangul-0.1.0.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libimobiledevice.bst b/elements/world/libimobiledevice.bst
index 22ffdc07..0f1784c8 100644
--- a/elements/world/libimobiledevice.bst
+++ b/elements/world/libimobiledevice.bst
@@ -4,8 +4,8 @@ sources:
   url: http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2
 depends:
 - world/libusbmuxd.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libmanette.bst b/elements/world/libmanette.bst
index db5596b7..fb12062e 100644
--- a/elements/world/libmanette.bst
+++ b/elements/world/libmanette.bst
@@ -9,5 +9,5 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libmtp.bst b/elements/world/libmtp.bst
index a98215eb..fcfdcaff 100644
--- a/elements/world/libmtp.bst
+++ b/elements/world/libmtp.bst
@@ -4,8 +4,8 @@ sources:
   url: downloads.sourceforge.net:libmtp/libmtp/1.1.15/libmtp-1.1.15.tar.gz
 depends:
 - core-deps/libusb.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libnfs.bst b/elements/world/libnfs.bst
index 2c833dde..556538c3 100644
--- a/elements/world/libnfs.bst
+++ b/elements/world/libnfs.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: https://sites.google.com/site/libnfstarballs/li/libnfs-2.0.0.tar.gz
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/libpinyin.bst b/elements/world/libpinyin.bst
index 0b6180b6..81f31b53 100644
--- a/elements/world/libpinyin.bst
+++ b/elements/world/libpinyin.bst
@@ -9,10 +9,10 @@ sources:
 depends:
 - sdk/glib.bst
 - world/kyotocabinet.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/libssh2.bst b/elements/world/libssh2.bst
index 1db7752e..1f600ec6 100644
--- a/elements/world/libssh2.bst
+++ b/elements/world/libssh2.bst
@@ -3,7 +3,7 @@ sources:
 - kind: tar
   url: github_com:libssh2/libssh2/archive/libssh2-1.8.0.tar.gz
 depends:
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   cmake-local: >-
diff --git a/elements/world/libusbmuxd.bst b/elements/world/libusbmuxd.bst
index e87e1166..c77114bb 100644
--- a/elements/world/libusbmuxd.bst
+++ b/elements/world/libusbmuxd.bst
@@ -4,8 +4,8 @@ sources:
   url: http://www.libimobiledevice.org/downloads/libusbmuxd-1.0.10.tar.bz2
 depends:
 - world/plist.bst
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index 48901310..bffdb56c 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -10,7 +10,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/plist.bst b/elements/world/plist.bst
index a7b9c94f..431cb671 100644
--- a/elements/world/plist.bst
+++ b/elements/world/plist.bst
@@ -3,8 +3,8 @@ sources:
 - kind: tar
   url: http://www.libimobiledevice.org/downloads/libplist-2.0.0.tar.bz2
 depends:
-- filename: public-stacks/buildsystem-autotools.bst
+- filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: bootstrap-import.bst
+- filename: base-platform.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/polari.bst b/elements/world/polari.bst
index 99e393b0..fb86b9f5 100644
--- a/elements/world/polari.bst
+++ b/elements/world/polari.bst
@@ -11,7 +11,7 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - world/telepathy-glib.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/qqwing.bst b/elements/world/qqwing.bst
index 084652f2..776377e0 100644
--- a/elements/world/qqwing.bst
+++ b/elements/world/qqwing.bst
@@ -3,5 +3,5 @@ sources:
 - kind: tar
   url: qqwing:qqwing-1.3.4.tar.gz
 depends:
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index 033a20a7..6f5c95ae 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -12,7 +12,7 @@ depends:
 - sdk/librsvg.bst
 - sdk/vala.bst
 - world/libmanette.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/retro-gtk.bst b/elements/world/retro-gtk.bst
index 5e06f9be..3a252b4f 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -8,7 +8,7 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: components/libpulse.bst
+- filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index 1de5729b..7a85ed98 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -16,9 +16,9 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
 - filename: sdk/cantarell-fonts.bst
   type: runtime
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index 4e9d29db..95e6b20f 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -9,7 +9,7 @@ depends:
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/tali.bst b/elements/world/tali.bst
index 4786ebf4..295dbaac 100644
--- a/elements/world/tali.bst
+++ b/elements/world/tali.bst
@@ -5,7 +5,7 @@ sources:
   track: master
 depends:
 - sdk/gtk+-3.bst
-- filename: components/itstools.bst
+- filename: desktop/itstools.bst
   junction: freedesktop-sdk.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/telepathy-glib.bst b/elements/world/telepathy-glib.bst
index 4da75c1b..a8ead62c 100644
--- a/elements/world/telepathy-glib.bst
+++ b/elements/world/telepathy-glib.bst
@@ -11,7 +11,7 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/telepathy-logger.bst b/elements/world/telepathy-logger.bst
index 7d667d5f..fb2caad9 100644
--- a/elements/world/telepathy-logger.bst
+++ b/elements/world/telepathy-logger.bst
@@ -9,5 +9,5 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - world/telepathy-glib.bst
-- filename: bootstrap-import.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 1fff3946..dc362627 100644
--- a/elements/world/telepathy-mission-control.bst
+++ b/elements/world/telepathy-mission-control.bst
@@ -9,7 +9,7 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - world/telepathy-glib.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
   conf-local: >-
diff --git a/elements/world/template-glib.bst b/elements/world/template-glib.bst
index a0f80a62..4e276949 100644
--- a/elements/world/template-glib.bst
+++ b/elements/world/template-glib.bst
@@ -7,5 +7,5 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
-- filename: bootstrap-import.bst
+- filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/junction.refs b/junction.refs
index ede2aa62..525b8447 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,4 +1,4 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: 18.08-branchpoint-1468-gc7b426f264629abc1e959c0adfce74e36da0c185
+    - ref: freedesktop-sdk-18.08.32-0-gdc56d18c8f1cd6b64395aba7e75d1f7303b7b51d


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