GNOME.org
 

[gnome-build-meta/tristan/fdsdk-master: 1/18] use a master snapshot of freedesktop-sdk

commit 7c763f26be71deba19ed7a5386f487c3d6f1c50c
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri May 3 14:32:32 2019 +0100

    use a master snapshot of freedesktop-sdk
    
    use bootstrap-import.bst instead of base-platform.bst as the latter was removed

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