339 files changed, 201 insertions, 1032 deletions

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.def
index 7233d84f..73fd5408 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.def
@@ -1,16 +1,13 @@
 name: NetworkManager-common
-kind: stratum
 build-depends:
-- morph: strata/audio-bluetooth.morph
-- morph: strata/network-security.morph
-- morph: strata/connectivity.morph
-chunks:
+- name: audio-bluetooth
+- name: network-security
+- name: connectivity
+contents:
 - name: libndp
   repo: upstream:libndp
   ref: master
-  build-depends: []
 - name: NetworkManager
-  morph: strata/NetworkManager-common/NetworkManager.morph
   repo: upstream:NetworkManager
   ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
   unpetrify-ref: 0.9.10
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.def
index 9840dfa4..40b05207 100644
--- a/strata/NetworkManager-common/NetworkManager.morph
+++ b/strata/NetworkManager-common/NetworkManager.def
@@ -1,5 +1,4 @@
 name: NetworkManager
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
diff --git a/strata/ansible.morph b/strata/ansible.def
index e0cb8581..12491249 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.def
@@ -1,19 +1,16 @@
 name: ansible
-kind: stratum
 description: A stratum with ansible and its dependencies
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: paramiko
   repo: upstream:paramiko
   ref: 951faed80b017e553a27c4cb98f210df44341f8f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: markupsafe
   repo: upstream:markupsafe
   ref: 58cde05bdcb0a53d87213b4a5bb605937f178171
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: jinja2
   repo: upstream:jinja2
   ref: 91fa138077d9ed5cf73a7903479077498e695492
@@ -21,7 +18,6 @@ chunks:
   build-depends:
   - markupsafe
 - name: ansible
-  morph: strata/ansible/ansible.morph
   repo: upstream:ansible
   ref: aa56db7e28d4fe256471043b05120c2f41a840e5
   unpetrify-ref: baserock/morph
diff --git a/strata/ansible/ansible.morph b/strata/ansible/ansible.def
index da434f03..27396bd7 100644
--- a/strata/ansible/ansible.morph
+++ b/strata/ansible/ansible.def
@@ -1,5 +1,4 @@
 name: ansible
-kind: chunk
 build-system: python-distutils
 post-install-commands:
 - install -D -m644 ansible.cfg "$DESTDIR/etc/ansible/ansible.cfg"
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.def
index c76ae537..3061d8bc 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.def
@@ -1,30 +1,23 @@
 name: armv7lhf-cross-toolchain
-kind: stratum
 description: Stratum for building an armv7lhf cross compiler for your native system.
 build-depends:
-- morph: strata/build-essential.morph
-chunks:
+- name: build-essential
+contents:
 - name: armv7lhf-cross-binutils
-  morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: armv7lhf-cross-linux-api-headers
-  morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
   repo: upstream:linux
   ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
   unpetrify-ref: baserock/v3.8
-  build-depends: []
 - name: armv7lhf-cross-gcc-nolibc
-  morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
   repo: upstream:gcc-tarball
   ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
   unpetrify-ref: baserock/build-essential
   build-depends:
   - armv7lhf-cross-binutils
 - name: armv7lhf-cross-eglibc
-  morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph
   repo: upstream:eglibc2
   ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
   unpetrify-ref: baserock/2.15-build-essential
@@ -33,7 +26,6 @@ chunks:
   - armv7lhf-cross-gcc-nolibc
   - armv7lhf-cross-linux-api-headers
 - name: armv7lhf-cross-gcc
-  morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
   repo: upstream:gcc-tarball
   ref: b0254026149b13782eae26d38435a4c62a002cf0
   unpetrify-ref: baserock/build-essential-4.7
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def
index 8e842e41..07c75279 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.def
@@ -1,5 +1,4 @@
 name: armv7lhf-cross-binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def
index ee28c9dd..9dcd48c8 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.def
@@ -1,5 +1,4 @@
 name: armv7lhf-cross-eglibc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -12,7 +11,7 @@ configure-commands:
 #      support being given a sysroot.
 #   2. Location of binutils, since we build binutils for the final
 #      target triplet, but our gcc of our stage 1 target triplet.
-#   3. Normal flags. See eglibc.morph.
+#   3. Normal flags. See eglibc.
 #   4. Force configuration values of certain things that can't be detected
 #      in a cross-compile.
 - |
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def
index d164a60b..a125af3d 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.def
@@ -1,11 +1,10 @@
 name: armv7lhf-cross-gcc-nolibc
-kind: chunk
 
 configure-commands:
 - mkdir o
 
 # Configure flag notes:
-#  1. Standard flags. See gcc.morph.
+#  1. Standard flags. See gcc.
 #  2. Our binutils is for the final $TARGET, rather than the intermediate
 #     target our GCC is being built for, so we need to set
 #     with-build-time-tools to get it to find our binutils at
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def
index 50c338e5..49bd7222 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.def
@@ -1,5 +1,4 @@
 name: armv7lhf-cross-gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -8,7 +7,7 @@ configure-commands:
 #  1. Use the default sysroot path to install to and locate headers
 #  2. Recommended by Linux From Scratch; required for C++ ABI
 #     compatibility with other Linux distributions.
-#  3. Standard flags. See gcc.morph.
+#  3. Standard flags. See gcc.
 #  4. Avoid having more than one copy of ZLib in use on the system
 - |
   export MORPH_ARCH=armv7lhf
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def
index c2654419..d8288851 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.def
@@ -1,5 +1,4 @@
 name: armv7lhf-cross-linux-api-headers
-kind: chunk
 install-commands:
 - ARCH=arm make INSTALL_HDR_PATH=dest headers_install
 - |
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.def
index 003d451a..65512bd3 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.def
@@ -1,35 +1,27 @@
 name: audio-bluetooth
-kind: stratum
 description: Components required for audio and bluetooth.
 build-depends:
-- morph: strata/foundation.morph
-chunks:
+- name: foundation
+contents:
 - name: libatomic_ops
   repo: upstream:libatomic_ops
   ref: 0a58f5d63969c10d2141af89cb7a53df786909ab
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: alsa-lib
-  morph: strata/audio-bluetooth/alsa-lib.morph
   repo: upstream:alsa-lib
   ref: ab715503853be8d8f365fd157c3cb97ef7a89f7b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: alsa-utils
-  morph: strata/audio-bluetooth/alsa-utils.morph
   repo: upstream:alsa-utils
   ref: f12208425051a7abf5ffc87ac2b9d2bd9e096fe1
   unpetrify-ref: baserock/morph
   build-depends:
   - alsa-lib
 - name: libical
-  morph: strata/audio-bluetooth/libical.morph
   repo: upstream:libical
   ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: bluez
-  morph: strata/audio-bluetooth/bluez.morph
   repo: upstream:bluez
   ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6
   unpetrify-ref: baserock/v5.17-patched
@@ -37,11 +29,9 @@ chunks:
   - libical
   - alsa-lib
 - name: bluez-tools
-  morph: strata/audio-bluetooth/bluez-tools.morph
   repo: upstream:bluez-tools
   ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: obexd
   repo: upstream:obexd
   ref: 4225280022c206762c91beee47c62d05e1baeacc
@@ -53,9 +43,7 @@ chunks:
   repo: upstream:speex
   ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: nohands
-  morph: strata/audio-bluetooth/nohands.morph
   repo: upstream:nohands
   ref: 20ec5cc245fd5e74d9a0fc21497d1ba4164f2a3a
   unpetrify-ref: baserock/morph
@@ -66,9 +54,7 @@ chunks:
   repo: upstream:mobile-broadband-provider-info
   ref: 4ed19e11c2975105b71b956440acdb25d46a347d
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: ofono
-  morph: strata/audio-bluetooth/ofono.morph
   repo: upstream:ofono
   ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
   unpetrify-ref: "1.15"
@@ -76,19 +62,14 @@ chunks:
   - mobile-broadband-provider-info
   - bluez
 - name: json-c
-  morph: strata/audio-bluetooth/json-c.morph
   repo: upstream:json-c
   ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libsndfile
-  morph: strata/audio-bluetooth/libsndfile.morph
   repo: upstream:libsndfile
   ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pulseaudio
-  morph: strata/audio-bluetooth/pulseaudio.morph
   repo: upstream:pulseaudio
   ref: e1b44688c0db505f70761fe76b4fed2ca6924a09
   unpetrify-ref: baserock/morph
diff --git a/strata/audio-bluetooth/alsa-lib.morph b/strata/audio-bluetooth/alsa-lib.def
index 1e3015ca..6a2ead36 100644
--- a/strata/audio-bluetooth/alsa-lib.morph
+++ b/strata/audio-bluetooth/alsa-lib.def
@@ -1,4 +1,3 @@
 name: alsa-lib
-kind: chunk
 description: ALSA library
 build-system: autotools
diff --git a/strata/audio-bluetooth/alsa-utils.morph b/strata/audio-bluetooth/alsa-utils.def
index a6a1e041..cd789c48 100644
--- a/strata/audio-bluetooth/alsa-utils.morph
+++ b/strata/audio-bluetooth/alsa-utils.def
@@ -1,5 +1,4 @@
 name: alsa-utils
-kind: chunk
 description: ALSA utilities
 build-system: autotools
 configure-commands:
diff --git a/strata/audio-bluetooth/bluez-tools.morph b/strata/audio-bluetooth/bluez-tools.def
index 80e47ef5..1470edc3 100644
--- a/strata/audio-bluetooth/bluez-tools.morph
+++ b/strata/audio-bluetooth/bluez-tools.def
@@ -1,5 +1,4 @@
 name: bluez-tools
-kind: chunk
 description: A set of tools to manage Bluetooth devices for Linux
 build-system: autotools
 configure-commands:
diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.def
index 1395b98d..d4a4c9a0 100644
--- a/strata/audio-bluetooth/bluez.morph
+++ b/strata/audio-bluetooth/bluez.def
@@ -1,5 +1,4 @@
 name: bluez
-kind: chunk
 description: Bluetooth protocol stack for Linux
 build-system: autotools
 configure-commands:
diff --git a/strata/audio-bluetooth/json-c.morph b/strata/audio-bluetooth/json-c.def
index c3d9243c..b13322a9 100644
--- a/strata/audio-bluetooth/json-c.morph
+++ b/strata/audio-bluetooth/json-c.def
@@ -1,5 +1,4 @@
 name: json-c
-kind: chunk
 description: JSON C Library
 build-system: autotools
 install-commands:
diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.def
index 1f772fd9..27e91bd7 100644
--- a/strata/audio-bluetooth/libical.morph
+++ b/strata/audio-bluetooth/libical.def
@@ -1,5 +1,4 @@
 name: libical
-kind: chunk
 build-system: autotools
 configure-commands:
 - autoreconf -ivf
diff --git a/strata/audio-bluetooth/libsndfile.morph b/strata/audio-bluetooth/libsndfile.def
index 8d6c2fe0..8618b85a 100644
--- a/strata/audio-bluetooth/libsndfile.morph
+++ b/strata/audio-bluetooth/libsndfile.def
@@ -1,5 +1,4 @@
 name: libsndfile
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-external-libs
diff --git a/strata/audio-bluetooth/nohands.morph b/strata/audio-bluetooth/nohands.def
index ebe249c0..e74d2464 100644
--- a/strata/audio-bluetooth/nohands.morph
+++ b/strata/audio-bluetooth/nohands.def
@@ -1,5 +1,4 @@
 name: nohands
-kind: chunk
 build-system: autotools
 build-commands:
 - make CXXFLAGS="-fpermissive -lpthread"
diff --git a/strata/audio-bluetooth/ofono.morph b/strata/audio-bluetooth/ofono.def
index a775b0c1..c3f8b81f 100644
--- a/strata/audio-bluetooth/ofono.morph
+++ b/strata/audio-bluetooth/ofono.def
@@ -1,5 +1,4 @@
 name: ofono
-kind: chunk
 description: ofono Open Source Telephony
 build-system: autotools
 configure-commands:
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.def
index 117f3396..bcaeb67e 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.def
@@ -1,5 +1,4 @@
 name: pulseaudio
-kind: chunk
 description: PulseAudio System
 build-system: autotools
 configure-commands:
diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.def
index d17d9c66..a6953e05 100644
--- a/strata/bsp-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank.def
@@ -1,12 +1,9 @@
 name: bsp-armv7-highbank
-kind: stratum
 description: The platform dependent components required to boot an ARM highbank board.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-armv7-highbank
-  morph: strata/bsp-armv7-highbank/linux-armv7-highbank.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.def
index dfebf69c..48245222 100644
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.def
@@ -1,5 +1,4 @@
 name: linux-armv7-highbank
-kind: chunk
 configure-commands:
 - make multi_v7_defconfig
 - scripts/config -e AUTOFS4_FS
diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.def
index 801f5287..92cd024a 100644
--- a/strata/bsp-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile.def
@@ -1,13 +1,10 @@
 name: bsp-armv7-versatile
-kind: stratum
 description: The platform dependent components required to boot an ARM versatile development
   board.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-armv7-versatile
-  morph: strata/bsp-armv7-versatile/linux-armv7-versatile.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.def
index 1da640e7..9c2ac915 100644
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.def
@@ -1,5 +1,4 @@
 name: linux-armv7-versatile
-kind: chunk
 configure-commands:
 - make ARCH=arm vexpress_defconfig
 - scripts/config -e BTRFS_FS
diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.def
index fe8c30e1..5822d10b 100644
--- a/strata/bsp-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank.def
@@ -1,12 +1,9 @@
 name: bsp-armv7b-highbank
-kind: stratum
 description: The platform dependent components required to boot an ARM highbank board.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-armv7b-highbank
-  morph: strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.def
index ea1a2d5f..4fc55c7b 100644
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.def
@@ -1,5 +1,4 @@
 name: linux-armv7b-highbank
-kind: chunk
 configure-commands:
 - make multi_v7_defconfig
 - scripts/config -e CPU_BIG_ENDIAN
diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.def
index 81d6fe48..4dd9bcbc 100644
--- a/strata/bsp-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2.def
@@ -1,12 +1,9 @@
 name: bsp-armv7b-vexpress-tc2
-kind: stratum
 description: The platform dependent components required to boot Versatile TC2 board
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-armv7b-vexpress-tc2
-  morph: strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def
index ecf6b9bc..c9e9ad46 100644
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.def
@@ -1,5 +1,4 @@
 name: linux-armv7b-vexpress-tc2
-kind: chunk
 configure-commands:
 - make vexpress_defconfig
 - scripts/config -e CPU_BIG_ENDIAN
diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.def
index eda1d99b..7deecf1d 100644
--- a/strata/bsp-jetson.morph
+++ b/strata/bsp-jetson.def
@@ -1,5 +1,4 @@
 name: bsp-jetson
-kind: stratum
 description: |
   Platform-specific chunks for NVIDIA Jetson TK1
 
@@ -10,44 +9,35 @@ description: |
   your board to the version of U-Boot built in this stratum. Also, the
   CPUs on the Jetson run at a slow speed with this version of Linux.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: device-tree-compiler
-  morph: strata/bsp-jetson/device-tree-compiler.morph
   repo: upstream:device-tree-compiler
   ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: u-boot
-  morph: strata/bsp-jetson/u-boot.morph
   repo: upstream:u-boot
   ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
   unpetrify-ref: baserock/jetson/u-boot-tegra-next
   build-depends:
   - device-tree-compiler
 - name: linux-jetson-tk1
-  morph: strata/bsp-jetson/linux-jetson-tk1.morph
   repo: upstream:linux
   ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
   unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
   build-depends:
   - u-boot
 - name: bsp-support
-  morph: strata/bsp-jetson/bsp-support.morph
   repo: baserock:baserock/bsp-support
   ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
   unpetrify-ref: baserock/arm/tegra-3.10
-  build-depends: []
 - name: nouveau-drm
-  morph: strata/bsp-jetson/nouveau-drm.morph
   repo: upstream:nouveau
   ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
   unpetrify-ref: baserock/jetson/gk20a
   build-depends:
   - linux-jetson-tk1
 - name: linux-firmware-jetson
-  morph: strata/bsp-jetson/linux-firmware-jetson.morph
   repo: upstream:linux-firmware
   ref: 9322ef5b14c78ec28163baa41bff240a0e098810
   unpetrify-ref: baserock/jetson
-  build-depends: []
diff --git a/strata/bsp-jetson/bsp-support.morph b/strata/bsp-jetson/bsp-support.def
index 23524ac7..cd88a463 100644
--- a/strata/bsp-jetson/bsp-support.morph
+++ b/strata/bsp-jetson/bsp-support.def
@@ -1,5 +1,4 @@
 name: bsp-support
-kind: chunk
 install-commands:
 - install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
 - install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
diff --git a/strata/tools/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.def
index 8abfafc8..c5e4bc6f 100644
--- a/strata/tools/device-tree-compiler.morph
+++ b/strata/bsp-jetson/device-tree-compiler.def
@@ -1,5 +1,4 @@
 name: device-tree-compiler
-kind: chunk
 build-commands:
 - make all
 install-commands:
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.def
index c803eab2..29491f17 100644
--- a/strata/bsp-jetson/linux-firmware-jetson.morph
+++ b/strata/bsp-jetson/linux-firmware-jetson.def
@@ -1,5 +1,4 @@
 name: linux-firmware-jetson
-kind: chunk
 install-commands:
 - install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
 - install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.def
index 42c16f01..9859b2a5 100644
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.def
@@ -1,5 +1,4 @@
 name: linux-jetson-tk1
-kind: chunk
 configure-commands:
 - make ARCH=arm tegra_defconfig
 - scripts/config -d KERNEL_LZO
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.def
index e297a069..30a66418 100644
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.def
@@ -1,5 +1,4 @@
 name: nouveau-drm
-kind: chunk
 build-commands:
  - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
 install-commands:
diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot.def
index 705b3851..776bc948 100644
--- a/strata/bsp-jetson/u-boot.morph
+++ b/strata/bsp-jetson/u-boot.def
@@ -1,5 +1,4 @@
 name: u-boot
-kind: chunk
 configure-commands:
 - make ARCH=arm jetson-tk1_config
 build-commands:
diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.def
index cbb0b201..dd122258 100644
--- a/strata/bsp-ppc64-generic.morph
+++ b/strata/bsp-ppc64-generic.def
@@ -1,12 +1,9 @@
 name: bsp-ppc64-generic
-kind: stratum
 description: The platform dependent components required to boot a ppc64 board.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-ppc64
-  morph: strata/bsp-ppc64-generic/linux-ppc64.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.def
index 1740a144..6826d7a2 100644
--- a/strata/bsp-ppc64-generic/linux-ppc64.morph
+++ b/strata/bsp-ppc64-generic/linux-ppc64.def
@@ -1,5 +1,4 @@
 name: linux-ppc64
-kind: chunk
 configure-commands:
 - make ARCH=powerpc ppc64_defconfig
 - scripts/config -e NAMESPACES
diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.def
index 4b07b150..82be4388 100644
--- a/strata/bsp-wandboard.morph
+++ b/strata/bsp-wandboard.def
@@ -1,17 +1,13 @@
 name: bsp-wandboard
-kind: stratum
 description: The platform dependent components required to boot an wandboard ARM board.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: u-boot
-  morph: strata/bsp-wandboard/u-boot.morph
   repo: upstream:u-boot
   ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: linux-armv7-wandboard
-  morph: strata/bsp-wandboard/linux-armv7-wandboard.morph
   repo: upstream:linux
   ref: 9573986cf27ff44814f3efb1f1e95638406db456
   unpetrify-ref: baserock/morph
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.def
index 15317978..2ae70047 100644
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.def
@@ -1,5 +1,4 @@
 name: linux-armv7-wandboard
-kind: chunk
 configure-commands:
 - make ARCH=arm imx_v6_v7_defconfig
 - scripts/config -d KERNEL_LZO
diff --git a/strata/tools/u-boot.morph b/strata/bsp-wandboard/u-boot.def
index 9be30bc7..3b6f5453 100644
--- a/strata/tools/u-boot.morph
+++ b/strata/bsp-wandboard/u-boot.def
@@ -1,5 +1,4 @@
 name: u-boot
-kind: chunk
 build-commands:
 - make tools
 install-commands:
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.def
index fa9dbf75..63cfe9ff 100644
--- a/strata/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.def
@@ -1,24 +1,18 @@
 name: bsp-x86_32-generic
-kind: stratum
 description: The set of platform specific components required for booting a 32-bit
   x86 based system.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-x86-32-generic
-  morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: nasm
-  morph: strata/bsp-x86_32-generic/nasm.morph
   repo: upstream:nasm
   ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: syslinux
-  morph: strata/bsp-x86_32-generic/syslinux.morph
   repo: upstream:syslinux
   ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
   unpetrify-ref: baserock/morph
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.def
index 593d9a65..4aedecb2 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.def
@@ -1,5 +1,4 @@
 name: linux-x86-32-generic
-kind: chunk
 products:
 - artifact: linux-x86-32-generic-devel
   include:
diff --git a/strata/bsp-x86_both-tools/nasm.morph b/strata/bsp-x86_32-generic/nasm.def
index 0ab1a629..00bc26fe 100644
--- a/strata/bsp-x86_both-tools/nasm.morph
+++ b/strata/bsp-x86_32-generic/nasm.def
@@ -1,5 +1,4 @@
 name: nasm
-kind: chunk
 build-system: autotools
 install-commands:
 - make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.def
index c0f15807..810663c5 100644
--- a/strata/bsp-x86_32-generic/syslinux.morph
+++ b/strata/bsp-x86_32-generic/syslinux.def
@@ -1,5 +1,4 @@
 name: syslinux
-kind: chunk
 build-commands:
 - make clean
 - make
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.def
index 8a7b9c9b..b10d0bf6 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.def
@@ -1,24 +1,18 @@
 name: bsp-x86_64-generic
-kind: stratum
 description: The set of platform specific components required for booting a 64-bit
   x86 based system.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: linux-x86-64-generic
-  morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
   repo: upstream:linux
   ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: nasm
-  morph: strata/bsp-x86_64-generic/nasm.morph
   repo: upstream:nasm
   ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: syslinux
-  morph: strata/bsp-x86_64-generic/syslinux.morph
   repo: upstream:syslinux
   ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
   unpetrify-ref: baserock/morph
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.def
index fe0721cc..1d2101a7 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.def
@@ -1,5 +1,4 @@
 name: linux-x86-64-generic
-kind: chunk
 products:
 - artifact: linux-x86-64-generic-devel
   include:
diff --git a/strata/bsp-x86_64-generic/nasm.morph b/strata/bsp-x86_64-generic/nasm.def
index 0ab1a629..00bc26fe 100644
--- a/strata/bsp-x86_64-generic/nasm.morph
+++ b/strata/bsp-x86_64-generic/nasm.def
@@ -1,5 +1,4 @@
 name: nasm
-kind: chunk
 build-system: autotools
 install-commands:
 - make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.def
index c0f15807..810663c5 100644
--- a/strata/bsp-x86_both-tools/syslinux.morph
+++ b/strata/bsp-x86_64-generic/syslinux.def
@@ -1,5 +1,4 @@
 name: syslinux
-kind: chunk
 build-commands:
 - make clean
 - make
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.def
index c1ba501c..ffa6819c 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.def
@@ -1,18 +1,14 @@
 name: bsp-x86_both-tools
-kind: stratum
 description: The set of platform specific components required for configuring a bootable
   x86 based system.
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: nasm
-  morph: strata/bsp-x86_both-tools/nasm.morph
   repo: upstream:nasm
   ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: syslinux
-  morph: strata/bsp-x86_both-tools/syslinux.morph
   repo: upstream:syslinux
   ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
   unpetrify-ref: baserock/morph
diff --git a/strata/bsp-x86_32-generic/nasm.morph b/strata/bsp-x86_both-tools/nasm.def
index 0ab1a629..00bc26fe 100644
--- a/strata/bsp-x86_32-generic/nasm.morph
+++ b/strata/bsp-x86_both-tools/nasm.def
@@ -1,5 +1,4 @@
 name: nasm
-kind: chunk
 build-system: autotools
 install-commands:
 - make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.def
index c0f15807..810663c5 100644
--- a/strata/bsp-x86_64-generic/syslinux.morph
+++ b/strata/bsp-x86_both-tools/syslinux.def
@@ -1,5 +1,4 @@
 name: syslinux
-kind: chunk
 build-commands:
 - make clean
 - make
diff --git a/strata/build-essential.morph b/strata/build-essential.def
index 38bd60d8..3c0a3755 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.def
@@ -1,5 +1,4 @@
 name: build-essential
-kind: stratum
 description: |
   Toolchain stratum
 
@@ -28,7 +27,7 @@ description: |
   show (and cleanliness) and the binaries actually still run on the host.
 
   After build-essential is built we do another trick. See
-  stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
+  stage2-fhs-dirs for details. Basically, /bin is a symlink to
   /tools/bin during stage 2 but in stage 3 it becomes a real directory
   again.
 products:
@@ -37,17 +36,14 @@ products:
   - fhs-dirs-.*
   - busybox-.*
   - glibc-nss
-chunks:
+contents:
 - name: stage1-binutils
-  morph: strata/build-essential/stage1-binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
-  build-depends: []
   build-mode: bootstrap
   prefix: /tools
 - name: stage1-gcc
-  morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
   ref: 999c918a7ad32ad436395666def22ab90b3447fe
   unpetrify-ref: baserock/build-essential
@@ -56,7 +52,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-linux-api-headers
-  morph: strata/build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
   ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
   unpetrify-ref: baserock/v3.8
@@ -66,7 +61,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-glibc
-  morph: strata/build-essential/stage2-glibc.morph
   repo: upstream:glibc
   ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
   unpetrify-ref: baserock/glibc-2.20
@@ -77,7 +71,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-binutils
-  morph: strata/build-essential/stage2-binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
@@ -88,7 +81,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-gcc-fixed-headers
-  morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
   ref: 999c918a7ad32ad436395666def22ab90b3447fe
   unpetrify-ref: baserock/build-essential
@@ -99,7 +91,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-gcc
-  morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
   ref: 999c918a7ad32ad436395666def22ab90b3447fe
   unpetrify-ref: baserock/build-essential
@@ -111,7 +102,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-busybox
-  morph: strata/build-essential/stage2-busybox.morph
   repo: upstream:busybox
   ref: 8a801e0f024f1385d8e989b80b90443546bceae7
   unpetrify-ref: baserock/build-essential
@@ -122,7 +112,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-fake-bash
-  morph: strata/build-essential/stage2-fake-bash.morph
   repo: upstream:bash
   ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
   unpetrify-ref: baserock/bash-4.3-patch-27
@@ -131,15 +120,12 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-fhs-dirs
-  morph: strata/build-essential/stage2-fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
   ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
   unpetrify-ref: master
-  build-depends: []
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-gawk
-  morph: strata/build-essential/stage2-gawk.morph
   repo: upstream:gawk
   ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
   unpetrify-ref: baserock/build-essential
@@ -150,7 +136,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-make
-  morph: strata/build-essential/stage2-make.morph
   repo: upstream:make
   ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
   unpetrify-ref: baserock/build-essential
@@ -161,7 +146,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-reset-specs
-  morph: strata/build-essential/stage2-reset-specs.morph
   repo: upstream:glibc
   ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
   unpetrify-ref: baserock/glibc-2.20
@@ -173,7 +157,6 @@ chunks:
   build-mode: bootstrap
   prefix: /tools
 - name: fhs-dirs
-  morph: strata/build-essential/fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
   ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
   unpetrify-ref: master
@@ -188,7 +171,6 @@ chunks:
   - stage2-make
   - stage2-reset-specs
 - name: linux-api-headers
-  morph: strata/build-essential/linux-api-headers.morph
   repo: upstream:linux
   ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
   unpetrify-ref: baserock/v3.8
@@ -203,7 +185,6 @@ chunks:
   - stage2-make
   - stage2-reset-specs
 - name: glibc
-  morph: strata/build-essential/glibc.morph
   repo: upstream:glibc
   ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
   unpetrify-ref: baserock/glibc-2.20
@@ -224,7 +205,6 @@ chunks:
     glibc-libs: build-essential-minimal
     glibc-nss: build-essential-runtime
 - name: zlib
-  morph: strata/build-essential/zlib.morph
   repo: upstream:zlib
   ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
   unpetrify-ref: baserock/build-essential
@@ -242,7 +222,6 @@ chunks:
   artifacts:
     zlib-libs: build-essential-minimal
 - name: binutils
-  morph: strata/build-essential/binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
@@ -259,7 +238,6 @@ chunks:
   - glibc
   - zlib
 - name: busybox
-  morph: strata/build-essential/busybox.morph
   repo: upstream:busybox
   ref: 8a801e0f024f1385d8e989b80b90443546bceae7
   unpetrify-ref: baserock/build-essential
@@ -275,7 +253,6 @@ chunks:
   - stage2-reset-specs
   - glibc
 - name: gawk
-  morph: strata/build-essential/gawk.morph
   repo: upstream:gawk
   ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
   unpetrify-ref: baserock/build-essential
@@ -291,7 +268,6 @@ chunks:
   - stage2-reset-specs
   - glibc
 - name: gcc
-  morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
   ref: 5c08cea34d5562dc828b85c7c02519246823aaf0
   unpetrify-ref: baserock/build-essential-4.7
@@ -310,7 +286,6 @@ chunks:
   artifacts:
     gcc-libs: build-essential-minimal
 - name: make
-  morph: strata/build-essential/make.morph
   repo: upstream:make
   ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
   unpetrify-ref: baserock/build-essential
@@ -326,7 +301,6 @@ chunks:
   - stage2-reset-specs
   - glibc
 - name: ccache
-  morph: strata/build-essential/ccache.morph
   repo: upstream:ccache
   ref: 567631456f0899cdf0c382f898d38aadc8901d32
   unpetrify-ref: baserock/build-essential
diff --git a/strata/build-essential/binutils.morph b/strata/build-essential/binutils.def
index bab52672..c332c84a 100644
--- a/strata/build-essential/binutils.morph
+++ b/strata/build-essential/binutils.def
@@ -1,5 +1,4 @@
 name: binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.def
index b0bb46f5..265e5e31 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.def
@@ -1,5 +1,4 @@
 name: busybox
-kind: chunk
 
 configure-commands:
 # Busybox's default config has everything enabled.
diff --git a/strata/build-essential/ccache.morph b/strata/build-essential/ccache.def
index 383eee8a..f2d5bc0d 100644
--- a/strata/build-essential/ccache.morph
+++ b/strata/build-essential/ccache.def
@@ -1,5 +1,4 @@
 name: ccache
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.def
index 64474872..9f5a0a88 100644
--- a/strata/build-essential/fhs-dirs.morph
+++ b/strata/build-essential/fhs-dirs.def
@@ -1,5 +1,4 @@
 name: fhs-dirs
-kind: chunk
 description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
diff --git a/strata/build-essential/gawk.morph b/strata/build-essential/gawk.def
index 1ad871c6..f21c81d3 100644
--- a/strata/build-essential/gawk.morph
+++ b/strata/build-essential/gawk.def
@@ -1,5 +1,4 @@
 name: gawk
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.def
index 50e2918c..592a39b7 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.def
@@ -1,5 +1,4 @@
 name: gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.def
index 789283eb..949e6d5e 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.def
@@ -1,5 +1,4 @@
 name: glibc
-kind: chunk
 products:
 - artifact: glibc-nss
   include:
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.def
index e1ff2638..a852e6b4 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.def
@@ -1,5 +1,4 @@
 name: linux-api-headers
-kind: chunk
 install-commands:
 - ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
diff --git a/strata/build-essential/make.morph b/strata/build-essential/make.def
index 1259b342..fdb98974 100644
--- a/strata/build-essential/make.morph
+++ b/strata/build-essential/make.def
@@ -1,5 +1,4 @@
 name: make
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/stage1-binutils.morph b/strata/build-essential/stage1-binutils.def
index b6670d5c..55417a9a 100644
--- a/strata/build-essential/stage1-binutils.morph
+++ b/strata/build-essential/stage1-binutils.def
@@ -1,5 +1,4 @@
 name: stage1-binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.def
index 0cb03568..63a61b81 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.def
@@ -1,11 +1,10 @@
 name: stage1-gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
 
 # Configure flag notes:
-#  1. Standard flags. See gcc.morph.
+#  1. Standard flags. See gcc.
 #  2. Disable searching /usr/local/include for headers
 #  3. The pass 1 compiler needs to find the libraries we build in pass 2.
 #     Include path must be set explicility, because it defaults to
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.def
index bc0b18ac..56f5056d 100644
--- a/strata/build-essential/stage2-binutils.morph
+++ b/strata/build-essential/stage2-binutils.def
@@ -1,5 +1,4 @@
 name: stage2-binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.def
index dc23d09b..da5e0a40 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.def
@@ -1,5 +1,4 @@
 name: stage2-busybox
-kind: chunk
 
 configure-commands:
 # Explicitly setting HOSTCC is required because we have a 'gcc' earlier in
diff --git a/strata/build-essential/stage2-fake-bash.morph b/strata/build-essential/stage2-fake-bash.def
index 021fd366..7deb793b 100644
--- a/strata/build-essential/stage2-fake-bash.morph
+++ b/strata/build-essential/stage2-fake-bash.def
@@ -1,4 +1,3 @@
 name: stage2-fake-bash
-kind: chunk
 install-commands:
 - printf '#!/bin/sh\nexec /bin/sh "$@"\n' | install -D /proc/self/fd/0 -m 755 "$DESTDIR$PREFIX/bin/bash"
diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.def
index 14a6e253..23f08826 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.def
@@ -1,5 +1,4 @@
 name: stage2-fhs-dirs
-kind: chunk
 description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
diff --git a/strata/build-essential/stage2-gawk.morph b/strata/build-essential/stage2-gawk.def
index f644d72b..5e21b421 100644
--- a/strata/build-essential/stage2-gawk.morph
+++ b/strata/build-essential/stage2-gawk.def
@@ -1,5 +1,4 @@
 name: stage2-gawk
-kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
diff --git a/strata/build-essential/stage2-gcc-fixed-headers.morph b/strata/build-essential/stage2-gcc-fixed-headers.def
index 10794872..1c9e70e1 100644
--- a/strata/build-essential/stage2-gcc-fixed-headers.morph
+++ b/strata/build-essential/stage2-gcc-fixed-headers.def
@@ -1,5 +1,4 @@
 name: stage2-gcc-fixed-headers
-kind: chunk
 install-commands:
 # Stage 1 GCC's fixincludes process created a limits.h before there was
 # a real limits.h available for the target. This step (taken from Linux
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.def
index bf6378c1..5c9b729a 100644
--- a/strata/build-essential/stage2-gcc.morph
+++ b/strata/build-essential/stage2-gcc.def
@@ -1,5 +1,4 @@
 name: stage2-gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -19,7 +18,7 @@ configure-commands:
 #  3. This flag causes the correct --sysroot flag to be passed when calling
 #     stage 1 GCC.
 #  4. C++ is built in stage 3.
-#  5. Standard flags. See gcc.morph.
+#  5. Standard flags. See gcc.
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.def
index ffa0970b..5ba67410 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.def
@@ -1,5 +1,4 @@
 name: stage2-glibc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -7,7 +6,7 @@ configure-commands:
 # Configure flag notes:
 #   1. Avoid installing to PREFIX/lib64 on x86_64.
 #   2. Location of linux-api-headers.
-#   3. Normal flags. See glibc.morph.
+#   3. Normal flags. See glibc.
 #   4. Force configuration values of certain things that can't be detected
 #      in a cross-compile.
 - |
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.def
index 5cbf2f05..0742c930 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.def
@@ -1,5 +1,4 @@
 name: stage2-linux-api-headers
-kind: chunk
 install-commands:
 - |
   export ARCH=$(./morph-arch)
diff --git a/strata/build-essential/stage2-make.morph b/strata/build-essential/stage2-make.def
index d3c8bf22..4eaf86ae 100644
--- a/strata/build-essential/stage2-make.morph
+++ b/strata/build-essential/stage2-make.def
@@ -1,5 +1,4 @@
 name: stage2-make
-kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
diff --git a/strata/build-essential/stage2-reset-specs.morph b/strata/build-essential/stage2-reset-specs.def
index 8892f67c..ab933f60 100644
--- a/strata/build-essential/stage2-reset-specs.morph
+++ b/strata/build-essential/stage2-reset-specs.def
@@ -1,5 +1,4 @@
 name: stage2-reset-specs
-kind: chunk
 
 # Nasty hack to get around being unable to reliably add configuration to gcc,
 # hence the gcc specs are modified, combined with Baserock's rootfs protection
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.def
index a69eebf3..730688b1 100644
--- a/strata/build-essential/zlib.morph
+++ b/strata/build-essential/zlib.def
@@ -1,5 +1,4 @@
 name: zlib
-kind: chunk
 max-jobs: 1
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/ceph-service.morph b/strata/ceph-service.def
index 25d6712d..2e4f80e7 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.def
@@ -1,26 +1,20 @@
 name: ceph-service
-kind: stratum
 build-depends:
-- morph: strata/foundation.morph
-- morph: strata/network-security.morph
-chunks:
+- name: foundation
+- name: network-security
+contents:
 - name: libaio
-  morph: strata/ceph-service/libaio.morph
   repo: upstream:libaio
   ref: 262e589ea4ac3d1ff809648c8f2caa3836e69b25
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: keyutils
-  morph: strata/ceph-service/keyutils.morph
   repo: upstream:keyutils
   ref: 116417bce1e1df06a918de5e9e63f6ba88e2f4f5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libunwind
   repo: upstream:libunwind
   ref: 4b8404d153c58b95cb4420fc7603fdae62489a31
   unpetrify-ref: v0.99
-  build-depends: []
 - name: gperftools
   repo: upstream:gperftools
   ref: 2a2d6596f8c3d62b7ec444761f4edf0c85d10d92
@@ -31,9 +25,7 @@ chunks:
   repo: upstream:snappy
   ref: 760c6ffc67836027c5f1d307e5c6cb012dfbdf72
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: leveldb
-  morph: strata/ceph-service/leveldb.morph
   repo: upstream:leveldb
   ref: 0f0ed46e70967365c851243663689e156fe1b7b5
   unpetrify-ref: baserock/morph
@@ -44,15 +36,11 @@ chunks:
   repo: upstream:libeditline-tarball
   ref: 7503ff5f8610734521f40e276b59b3b6291830e7
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: boost
-  morph: strata/ceph-service/boost.morph
   repo: upstream:boost-tarball
   ref: 026fc3d84a27e84a61d0f4c26f011a68271a0d6e
   unpetrify-ref: baserock/markdoffman/morph
-  build-depends: []
 - name: ceph
-  morph: strata/ceph-service/ceph.morph
   repo: upstream:ceph
   ref: 8fdf1df512b73bad0eb695cdf9cbf2d09f0327d4
   unpetrify-ref: baserock/morph
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.def
index 7c3e6cff..0410ded1 100644
--- a/strata/ceph-service/boost.morph
+++ b/strata/ceph-service/boost.def
@@ -1,5 +1,4 @@
 name: boost
-kind: chunk
 configure-commands:
 - ./bootstrap.sh
 build-commands:
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.def
index 5ad0d812..1e05042a 100644
--- a/strata/ceph-service/ceph.morph
+++ b/strata/ceph-service/ceph.def
@@ -1,5 +1,4 @@
 name: ceph
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/ceph-service/keyutils.morph b/strata/ceph-service/keyutils.def
index 4d47e265..c185b1a4 100644
--- a/strata/ceph-service/keyutils.morph
+++ b/strata/ceph-service/keyutils.def
@@ -1,5 +1,4 @@
 name: keyutils
-kind: chunk
 build-commands:
 - make clean
 - make
diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.def
index 1385897c..eae045a6 100644
--- a/strata/ceph-service/leveldb.morph
+++ b/strata/ceph-service/leveldb.def
@@ -1,5 +1,4 @@
 name: leveldb
-kind: chunk
 build-commands:
 - make
 install-commands:
diff --git a/strata/ceph-service/libaio.morph b/strata/ceph-service/libaio.def
index 62c24d37..b51f8480 100644
--- a/strata/ceph-service/libaio.morph
+++ b/strata/ceph-service/libaio.def
@@ -1,5 +1,4 @@
 name: libaio
-kind: chunk
 build-commands:
 - make clean
 - make
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.def
index 399df685..ef80f98a 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.def
@@ -1,32 +1,26 @@
 name: cloudinit-support
-kind: stratum
 description: A stratum with cloudinit to fit a system in the OpenStack cloud.
 build-depends:
-- morph: strata/build-essential.morph
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-chunks:
+- name: build-essential
+- name: core
+- name: foundation
+contents:
 - name: configobj
   repo: upstream:configobj
   ref: 935a78736e4eb43b9fafae87f5e9902328673f63
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-requests
   repo: upstream:python-requests
   ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-prettytable
-  morph: strata/cloudinit-support/python-prettytable.morph
   repo: upstream:python-prettytable
   ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-json-patch
   repo: upstream:python-json-patch
   ref: 27c7032de25923593fa17cc14f535fb7abd52448
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-json-pointer
   repo: upstream:python-json-pointer
   ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
@@ -37,14 +31,11 @@ chunks:
   repo: upstream:python-cheetah
   ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: boto
   repo: upstream:boto
   ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: cloud-init
-  morph: strata/cloudinit-support/cloud-init.morph
   repo: upstream:cloud-init
   ref: 130d51acc5b0becd64e7007f9dfe41a6e022eaec
   unpetrify-ref: baserock/morph
diff --git a/strata/cloudinit-support/cloud-init.morph b/strata/cloudinit-support/cloud-init.def
index 5933dbf8..d131f6d1 100644
--- a/strata/cloudinit-support/cloud-init.morph
+++ b/strata/cloudinit-support/cloud-init.def
@@ -1,5 +1,4 @@
 name: cloud-init
-kind: chunk
 build-system: python-distutils
 post-install-commands:
 - mkdir -p "$DESTDIR"/lib/systemd/system
diff --git a/strata/cloudinit-support/python-prettytable.morph b/strata/cloudinit-support/python-prettytable.def
index cf1ac6e1..35620ff0 100644
--- a/strata/cloudinit-support/python-prettytable.morph
+++ b/strata/cloudinit-support/python-prettytable.def
@@ -1,5 +1,4 @@
 name: python-prettytable
-kind: chunk
 build-commands:
 - cd src && python setup.py build
 install-commands:
diff --git a/strata/connectivity.morph b/strata/connectivity.def
index a8697f3a..aaf53421 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.def
@@ -1,15 +1,12 @@
 name: connectivity
-kind: stratum
 build-depends:
-- morph: strata/foundation.morph
-chunks:
+- name: foundation
+contents:
 - name: libnl
   repo: upstream:libnl
   ref: a2c4bd8f094a7247903578860a9c42049991860b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: wpa_supplicant
-  morph: strata/connectivity/wpa_supplicant.morph
   repo: upstream:hostap
   ref: 1cdfb99c3a04235697dc6979b9eb5418861e42f8
   unpetrify-ref: baserock/genivi/morph
@@ -19,4 +16,3 @@ chunks:
   repo: upstream:iptables
   ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/connectivity/wpa_supplicant.morph b/strata/connectivity/wpa_supplicant.def
index 86a51608..74ebea78 100644
--- a/strata/connectivity/wpa_supplicant.morph
+++ b/strata/connectivity/wpa_supplicant.def
@@ -1,5 +1,4 @@
 name: wpa_supplicant
-kind: chunk
 configure-commands:
 - sed -i 's/^CONFIG_READLINE=y$//' wpa_supplicant/.config
 build-commands:
diff --git a/strata/connman-common.morph b/strata/connman-common.def
index f6f7ddb0..a5f8e51e 100644
--- a/strata/connman-common.morph
+++ b/strata/connman-common.def
@@ -1,11 +1,8 @@
 name: connman-common
-kind: stratum
 build-depends:
-- morph: strata/connectivity.morph
-chunks:
+- name: connectivity
+contents:
 - name: connman
-  morph: strata/connman-common/connman.morph
   repo: upstream:connman
   ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
   unpetrify-ref: baserock/1.24
-  build-depends: []
diff --git a/strata/connman-common/connman.morph b/strata/connman-common/connman.def
index e468bc49..867659b8 100644
--- a/strata/connman-common/connman.morph
+++ b/strata/connman-common/connman.def
@@ -1,5 +1,4 @@
 name: connman
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./bootstrap
diff --git a/strata/core.morph b/strata/core.def
index 140674f1..016b96fe 100644
--- a/strata/core.morph
+++ b/strata/core.def
@@ -1,73 +1,54 @@
 name: core
-kind: stratum
 description: Core components of a Baserock base system that are build tools required
   for the BSP and Foundation strata, but a step above build-essential
 build-depends:
-- morph: strata/build-essential.morph
-chunks:
+- name: build-essential
+contents:
 - name: sqlite3
   repo: upstream:sqlite3
   ref: f6c2a9fe49d20654c2c41844d056033692a223b7
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: cmake
-  morph: strata/core/cmake.morph
   repo: upstream:cmake
   ref: 0b3781e4c497566acaa504d4106d11c02a642501
   unpetrify-ref: v2.8.12.2
-  build-depends: []
 - name: gdbm
-  morph: strata/core/gdbm.morph
   repo: upstream:gdbm
   ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
   unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: gettext
-  morph: strata/core/gettext.morph
   repo: upstream:gettext
   ref: 3898e324f07c05404b63d71f0e519f352fb1e072
   unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: m4
-  morph: strata/core/m4.morph
   repo: upstream:m4
   ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
   unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: mini-utils
-  morph: strata/core/mini-utils.morph
   repo: baserock:baserock/mini-utils
   ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8
   unpetrify-ref: master
-  build-depends: []
 - name: ncurses
-  morph: strata/core/ncurses.morph
   repo: upstream:ncurses
   ref: 0fe89dc66ec061b839bea3ab451207e2dee757b9
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: perl
-  morph: strata/core/perl.morph
   repo: upstream:perl
   ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1
   unpetrify-ref: baserock/morph
   build-depends:
   - gdbm
 - name: pkg-config
-  morph: strata/core/pkg-config.morph
   repo: upstream:pkg-config
   ref: 67a702a15cf88e270539484929ffa1f42b90c728
   unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: texinfo-tarball
-  morph: strata/core/texinfo-tarball.morph
   repo: upstream:texinfo-tarball
   ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b
   unpetrify-ref: baserock/morph
   build-depends:
   - ncurses
 - name: autoconf
-  morph: strata/core/autoconf.morph
   repo: upstream:autoconf
   ref: cffdb90be331111ce3fbe4a32320181ec2b92652
   unpetrify-ref: baserock/build-essential
@@ -75,7 +56,6 @@ chunks:
   - m4
   - perl
 - name: automake
-  morph: strata/core/automake.morph
   repo: upstream:automake
   ref: ba4b42faff673e3e5265416dff09e59affc688fb
   unpetrify-ref: v1.14.1
@@ -84,11 +64,9 @@ chunks:
   - perl
   - texinfo-tarball
 - name: bash
-  morph: strata/core/bash.morph
   repo: upstream:bash
   ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
   unpetrify-ref: baserock/bash-4.3-patch-27
-  build-depends: []
 - name: error-perl-tarball
   repo: upstream:error-perl-tarball
   ref: 661707e7bd4282aeab5a2f6a8f02ca5731fd813f
@@ -96,32 +74,26 @@ chunks:
   build-depends:
   - perl
 - name: flex
-  morph: strata/core/flex.morph
   repo: upstream:flex
   ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
   unpetrify-ref: baserock/build-essential
   build-depends:
   - m4
 - name: openssl-new
-  morph: strata/core/openssl-new.morph
   repo: upstream:openssl-new
   ref: 872e681c00a713e840ebed77a4e05fa0e181f16f
   unpetrify-ref: OpenSSL_1_0_1j
   build-depends:
   - perl
 - name: bzip2
-  morph: strata/core/bzip2.morph
   repo: upstream:bzip2
   ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: readline
   repo: upstream:readline
   ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
 - name: cpython
-  morph: strata/core/cpython.morph
   repo: upstream:cpython
   ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
   unpetrify-ref: v2.7.8
@@ -132,7 +104,6 @@ chunks:
   - ncurses
   - readline
 - name: libtool
-  morph: strata/core/libtool.morph
   repo: upstream:libtool
   ref: d388b7f2dc628b22006025d01179bc09b8aabe81
   unpetrify-ref: baserock/build-essential
@@ -147,7 +118,6 @@ chunks:
   - automake
   - libtool
 - name: xz
-  morph: strata/core/xz.morph
   repo: upstream:xz
   ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
   unpetrify-ref: baserock/morph
@@ -167,7 +137,6 @@ chunks:
   - libtool
   - xz
 - name: ca-certificates
-  morph: strata/core/ca-certificates.morph
   repo: upstream:ca-certificates
   ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
   unpetrify-ref: baserock/debian/20140325
@@ -175,7 +144,6 @@ chunks:
   - automake
   - cpython
 - name: curl
-  morph: strata/core/curl.morph
   repo: upstream:curl
   ref: 202aa9f7758636730299b86715d924f54468a908
   unpetrify-ref: curl-7_38_0
@@ -186,7 +154,6 @@ chunks:
   - openssl-new
   - ca-certificates
 - name: libexpat
-  morph: strata/core/libexpat.morph
   repo: upstream:libexpat
   ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
   unpetrify-ref: baserock/morph
@@ -203,7 +170,6 @@ chunks:
   - libxml2
   - perl
 - name: git
-  morph: strata/core/git.morph
   repo: upstream:git
   ref: 43efcf42382e87de4aa423e5e1607958ad1717d0
   unpetrify-ref: baserock/morph
@@ -216,7 +182,6 @@ chunks:
   - libexpat
   - openssl-new
 - name: help2man
-  morph: strata/core/help2man.morph
   repo: upstream:help2man
   ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
   unpetrify-ref: baserock/morph
@@ -224,7 +189,6 @@ chunks:
   - autoconf
   - automake
 - name: bison
-  morph: strata/core/bison.morph
   repo: upstream:bison
   ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
   unpetrify-ref: baserock/v3.0.2
@@ -238,11 +202,9 @@ chunks:
   - help2man
   - mini-utils
 - name: gperf
-  morph: strata/core/gperf.morph
   repo: upstream:gperf
   ref: 5094e4a539adf845111013f82c2c4fcaec637983
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: intltool
   repo: upstream:intltool
   ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4
@@ -253,7 +215,6 @@ chunks:
   - automake
   - perl
 - name: util-linux
-  morph: strata/core/util-linux.morph
   repo: upstream:util-linux
   ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
   unpetrify-ref: baserock/morph
@@ -278,21 +239,18 @@ chunks:
   - flex
   - texinfo-tarball
 - name: python-setuptools
-  morph: strata/core/python-setuptools.morph
   repo: upstream:python-setuptools
   ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
   unpetrify-ref: baserock/morph
   build-depends:
   - cpython
 - name: pyyaml
-  morph: strata/core/pyyaml.morph
   repo: upstream:pyyaml
   ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
   unpetrify-ref: baserock/morph
   build-depends:
   - python-setuptools
 - name: shadow
-  morph: strata/core/shadow.morph
   repo: upstream:shadow
   ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
   unpetrify-ref: baserock/4.2
@@ -303,7 +261,6 @@ chunks:
   - libtool
   - bison
 - name: patch
-  morph: strata/core/patch.morph
   repo: upstream:patch
   ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
   unpetrify-ref: baserock/v2.7.1
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.def
index 046bfc40..1abd23d2 100644
--- a/strata/core/autoconf.morph
+++ b/strata/core/autoconf.def
@@ -1,5 +1,4 @@
 name: autoconf
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/core/automake.morph b/strata/core/automake.def
index 282535d6..01bc862e 100644
--- a/strata/core/automake.morph
+++ b/strata/core/automake.def
@@ -1,5 +1,4 @@
 name: automake
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./bootstrap.sh
diff --git a/strata/core/bash.morph b/strata/core/bash.def
index 9639593b..3326fad4 100644
--- a/strata/core/bash.morph
+++ b/strata/core/bash.def
@@ -1,5 +1,4 @@
 name: bash
-kind: chunk
 configure-commands:
 - ./configure --prefix=/usr --bindir=/bin --without-bash-malloc --with-installed-readline
 build-commands:
diff --git a/strata/core/bison.morph b/strata/core/bison.def
index a9497d4e..d8abd277 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.def
@@ -1,5 +1,4 @@
 name: bison
-kind: chunk
 configure-commands:
 - echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
 - bash bootstrap --skip-po
diff --git a/strata/core/bzip2.morph b/strata/core/bzip2.def
index f4bdb794..bee616ca 100644
--- a/strata/core/bzip2.morph
+++ b/strata/core/bzip2.def
@@ -1,7 +1,6 @@
 name: bzip2
-kind: chunk
 configure-commands:
-- sed -i -rf bzip2.morph-makefix.sed Makefile
+- sed -i -rf bzip2-makefix.sed Makefile
 build-commands:
 - make -f Makefile-libbz2_so
 - make
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.def
index 3072e4f3..14a67d9c 100644
--- a/strata/core/ca-certificates.morph
+++ b/strata/core/ca-certificates.def
@@ -1,5 +1,4 @@
 name: ca-certificates
-kind: chunk
 build-system: autotools
 configure-commands: []
 pre-install-commands:
diff --git a/strata/core/cmake.morph b/strata/core/cmake.def
index 1d310ef4..db287b52 100644
--- a/strata/core/cmake.morph
+++ b/strata/core/cmake.def
@@ -1,5 +1,4 @@
 name: cmake
-kind: chunk
 configure-commands:
 - ./bootstrap --prefix="$PREFIX" --docdir=/share/doc/cmake --mandir=/share/man
 build-commands:
diff --git a/strata/core/cpython.morph b/strata/core/cpython.def
index 6c9e4b3d..0e244b5e 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/cpython.def
@@ -1,5 +1,4 @@
 name: cpython
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --enable-shared
diff --git a/strata/core/curl.morph b/strata/core/curl.def
index e245688c..81439a0f 100644
--- a/strata/core/curl.morph
+++ b/strata/core/curl.def
@@ -1,5 +1,4 @@
 name: curl
-kind: chunk
 configure-commands:
 - ./buildconf
 - ./configure --disable-manual --prefix="$PREFIX"
diff --git a/strata/core/flex.morph b/strata/core/flex.def
index 7ca8f538..59c1436a 100644
--- a/strata/core/flex.morph
+++ b/strata/core/flex.def
@@ -1,5 +1,4 @@
 name: flex
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX"
 build-commands:
diff --git a/strata/core/gdbm.morph b/strata/core/gdbm.def
index 6bec33e0..194f0402 100644
--- a/strata/core/gdbm.morph
+++ b/strata/core/gdbm.def
@@ -1,5 +1,4 @@
 name: gdbm
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX" --enable-libgdbm-compat --disable-nls
 build-commands:
diff --git a/strata/core/gettext.morph b/strata/core/gettext.def
index 3e2c56b5..7460d351 100644
--- a/strata/core/gettext.morph
+++ b/strata/core/gettext.def
@@ -1,5 +1,4 @@
 name: gettext
-kind: chunk
 max-jobs: 1
 configure-commands:
 - ./configure --prefix=/usr
diff --git a/strata/core/git.morph b/strata/core/git.def
index 62932b0d..a0e4e4c1 100644
--- a/strata/core/git.morph
+++ b/strata/core/git.def
@@ -1,5 +1,4 @@
 name: git
-kind: chunk
 build-commands:
 - make prefix=${PREFIX-/usr} all PYTHON_PATH=${PREFIX-/usr}/bin/python NO_TCLTK=YesPlease
 install-commands:
diff --git a/strata/core/gperf.morph b/strata/core/gperf.def
index e4f598c5..fa714ee2 100644
--- a/strata/core/gperf.morph
+++ b/strata/core/gperf.def
@@ -1,3 +1,2 @@
 name: gperf
-kind: chunk
 build-system: autotools
diff --git a/strata/core/help2man.morph b/strata/core/help2man.def
index e25a8d8e..34d2d298 100644
--- a/strata/core/help2man.morph
+++ b/strata/core/help2man.def
@@ -1,5 +1,4 @@
 name: help2man
-kind: chunk
 configure-commands:
 - autoreconf -i
 - ./configure --prefix=/usr
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.def
index 1e0fe696..7894051e 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.def
@@ -1,5 +1,4 @@
 name: libexpat
-kind: chunk
 configure-commands:
 - autoreconf -i
 - ./configure --prefix="${PREFIX-/usr}"
diff --git a/strata/core/libtool.morph b/strata/core/libtool.def
index f311281d..87361d6e 100644
--- a/strata/core/libtool.morph
+++ b/strata/core/libtool.def
@@ -1,5 +1,4 @@
 name: libtool
-kind: chunk
 max-jobs: 1
 build-system: autotools
 configure-commands:
diff --git a/strata/core/m4.morph b/strata/core/m4.def
index b76afbe4..5c845587 100644
--- a/strata/core/m4.morph
+++ b/strata/core/m4.def
@@ -1,5 +1,4 @@
 name: m4
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/mini-utils.morph b/strata/core/mini-utils.def
index dc915b30..e38137a5 100644
--- a/strata/core/mini-utils.morph
+++ b/strata/core/mini-utils.def
@@ -1,5 +1,4 @@
 name: mini-utils
-kind: chunk
 build-system: autotools
 configure-commands: []
 install-commands:
diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.def
index c75495bc..ca8d3f6e 100644
--- a/strata/core/ncurses.morph
+++ b/strata/core/ncurses.def
@@ -1,5 +1,4 @@
 name: ncurses
-kind: chunk
 configure-commands:
 - LDCONFIG=true ./configure --with-shared --without-debug --enable-widec
 build-commands:
diff --git a/strata/core/openssl-new.morph b/strata/core/openssl-new.def
index 2ed14ff2..349e2f60 100644
--- a/strata/core/openssl-new.morph
+++ b/strata/core/openssl-new.def
@@ -1,5 +1,4 @@
 name: openssl-new
-kind: chunk
 max-jobs: 1
 configure-commands:
 - sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile
diff --git a/strata/core/patch.morph b/strata/core/patch.def
index 01d977c4..9056fa0e 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.def
@@ -1,5 +1,4 @@
 name: patch
-kind: chunk
 configure-commands:
 - bash bootstrap --skip-po
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/perl.morph b/strata/core/perl.def
index ce086aa7..d4fdfe31 100644
--- a/strata/core/perl.morph
+++ b/strata/core/perl.def
@@ -1,5 +1,4 @@
 name: perl
-kind: chunk
 max-jobs: 1
 configure-commands:
 - sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl" -Dprivlib="$PREFIX/share/perl"
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.def
index 090a65e5..8af53cbb 100644
--- a/strata/core/pkg-config.morph
+++ b/strata/core/pkg-config.def
@@ -1,5 +1,4 @@
 name: pkg-config
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --with-internal-glib
diff --git a/strata/core/python-setuptools.morph b/strata/core/python-setuptools.def
index fa436c60..8db444ab 100644
--- a/strata/core/python-setuptools.morph
+++ b/strata/core/python-setuptools.def
@@ -1,5 +1,4 @@
 name: python-setuptools
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.def
index 8ebd7b57..518b6b3d 100644
--- a/strata/core/pyyaml.morph
+++ b/strata/core/pyyaml.def
@@ -1,5 +1,4 @@
 name: pyyaml
-kind: chunk
 build-commands:
 - python setup.py --without-libyaml build
 install-commands:
diff --git a/strata/core/shadow.morph b/strata/core/shadow.def
index 6887a6b3..11b19df0 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.def
@@ -1,5 +1,4 @@
 name: shadow
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --with-selinux=no --sysconfdir=/etc
diff --git a/strata/core/texinfo-tarball.morph b/strata/core/texinfo-tarball.def
index 5f784ba2..14516294 100644
--- a/strata/core/texinfo-tarball.morph
+++ b/strata/core/texinfo-tarball.def
@@ -1,5 +1,4 @@
 name: texinfo-tarball
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX"
 build-commands:
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.def
index 22f19529..b94372c3 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.def
@@ -1,5 +1,4 @@
 name: util-linux
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
diff --git a/strata/core/xz.morph b/strata/core/xz.def
index 8165abdc..7e3b2689 100644
--- a/strata/core/xz.morph
+++ b/strata/core/xz.def
@@ -1,3 +1,2 @@
 name: xz
-kind: chunk
 build-system: autotools
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.def
index 9c5c38fe..3bba9842 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.def
@@ -1,15 +1,12 @@
 name: coreutils-common
-kind: stratum
 description: |
   We need to split this so we can build stuff using coreutils but we can not
   having it in the final systems (for example in genivi ones that do not
   accept GPLv3 code)
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: coreutils
-  morph: strata/coreutils-common/coreutils.morph
   repo: upstream:coreutils
   ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
   unpetrify-ref: baserock/8.23
-  build-depends: []
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.def
index 479e9925..c8b7aeab 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.def
@@ -1,5 +1,4 @@
 name: coreutils
-kind: chunk
 build-system: autotools
 configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.def
index 9687ac7e..467c9fe2 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.def
@@ -1,39 +1,30 @@
 name: cross-bootstrap
-kind: stratum
 description: The minimal development tools to build a baserock devel system
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: six
   repo: upstream:six
   ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: groff
-  morph: strata/cross-bootstrap/groff.morph
   repo: upstream:groff
   ref: c7017a099f954bb6de60e79c876935b1bf438b9a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: openssh
-  morph: strata/cross-bootstrap/openssh.morph
   repo: upstream:openssh
   ref: 233514106dcde5ac61a70f1043de563122e2f1c9
   unpetrify-ref: baserock/morph
   build-depends:
   - groff
 - name: python-ttystatus
-  morph: strata/cross-bootstrap/python-ttystatus.morph
   repo: upstream:python-ttystatus
   ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-coveragepy
-  morph: strata/cross-bootstrap/python-coveragepy.morph
   repo: upstream:python-coveragepy
   ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
   ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
@@ -50,9 +41,7 @@ chunks:
   repo: upstream:python-markdown
   ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: cmdtest
-  morph: strata/cross-bootstrap/cmdtest.morph
   repo: upstream:cmdtest
   ref: ac91791842c6e7e6eda3213916af413255999c7b
   unpetrify-ref: baserock/morph
@@ -64,9 +53,7 @@ chunks:
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pyfilesystem
-  morph: strata/cross-bootstrap/pyfilesystem.morph
   repo: upstream:pyfilesystem
   ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
   unpetrify-ref: baserock/morph
@@ -82,8 +69,6 @@ chunks:
   - python-coverage-test-runner
   - pyfilesystem
 - name: rsync
-  morph: strata/cross-bootstrap/rsync.morph
   repo: upstream:rsync
   ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/morph-utils/cmdtest.morph b/strata/cross-bootstrap/cmdtest.def
index 3e1c71c6..34010c41 100644
--- a/strata/morph-utils/cmdtest.morph
+++ b/strata/cross-bootstrap/cmdtest.def
@@ -1,5 +1,4 @@
 name: cmdtest
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/cross-bootstrap/groff.morph b/strata/cross-bootstrap/groff.def
index fed35b7d..f1fd3c6e 100644
--- a/strata/cross-bootstrap/groff.morph
+++ b/strata/cross-bootstrap/groff.def
@@ -1,5 +1,4 @@
 name: groff
-kind: chunk
 max-jobs: 1
 configure-commands:
 - PAGE=A4 ./configure --prefix="$PREFIX"
diff --git a/strata/foundation/openssh.morph b/strata/cross-bootstrap/openssh.def
index 6c759cb0..8d44993e 100644
--- a/strata/foundation/openssh.morph
+++ b/strata/cross-bootstrap/openssh.def
@@ -1,5 +1,4 @@
 name: openssh
-kind: chunk
 configure-commands:
 - autoreconf -if
 - |
diff --git a/strata/morph-utils/pyfilesystem.morph b/strata/cross-bootstrap/pyfilesystem.def
index a4931dfa..fae6f7d1 100644
--- a/strata/morph-utils/pyfilesystem.morph
+++ b/strata/cross-bootstrap/pyfilesystem.def
@@ -1,5 +1,4 @@
 name: pyfilesystem
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/cross-bootstrap/python-coveragepy.def
index ed5e3d87..cf8718b3 100644
--- a/strata/morph-utils/python-coveragepy.morph
+++ b/strata/cross-bootstrap/python-coveragepy.def
@@ -1,5 +1,4 @@
 name: python-coveragepy
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/cross-bootstrap/python-ttystatus.morph b/strata/cross-bootstrap/python-ttystatus.def
index e45ef7a8..503e7da5 100644
--- a/strata/cross-bootstrap/python-ttystatus.morph
+++ b/strata/cross-bootstrap/python-ttystatus.def
@@ -1,5 +1,4 @@
 name: python-ttystatus
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/cross-bootstrap/rsync.morph b/strata/cross-bootstrap/rsync.def
index 9a92878d..3b7e773c 100644
--- a/strata/cross-bootstrap/rsync.morph
+++ b/strata/cross-bootstrap/rsync.def
@@ -1,5 +1,4 @@
 name: rsync
-kind: chunk
 build-system: autotools
 build-commands:
 - make proto
diff --git a/strata/cross-tools.morph b/strata/cross-tools.def
index c3e35e6d..d6f02424 100644
--- a/strata/cross-tools.morph
+++ b/strata/cross-tools.def
@@ -1,11 +1,9 @@
 name: cross-tools
-kind: stratum
 description: Tools used together with cross compilers
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: patchelf
   repo: upstream:patchelf
   ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/cxmanage.morph b/strata/cxmanage.def
index 057558b8..1b5faf05 100644
--- a/strata/cxmanage.morph
+++ b/strata/cxmanage.def
@@ -1,30 +1,24 @@
 name: cxmanage
-kind: stratum
 description: All the tools for calxeda management
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: ipmitool
   repo: upstream:ipmitool
   ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pexpect
-  morph: strata/cxmanage/pexpect.morph
   repo: upstream:pexpect
   ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pyipmi
   repo: upstream:pyipmi
   ref: bb7dba84578c05ba87db3c4186a2989c89e4e519
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: tftpy
   repo: upstream:tftpy
   ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: cxmanage
   repo: upstream:cxmanage
   ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6
diff --git a/strata/cxmanage/pexpect.morph b/strata/cxmanage/pexpect.def
index 09254350..bd645791 100644
--- a/strata/cxmanage/pexpect.morph
+++ b/strata/cxmanage/pexpect.def
@@ -1,5 +1,4 @@
 name: pexpect
-kind: chunk
 description: |
   Pexpect is a pure Python module that accomplishes behaviour similar to Expect
 configure-commands:
diff --git a/strata/databases.morph b/strata/databases.def
index cb09c5a3..30ccd6ab 100644
--- a/strata/databases.morph
+++ b/strata/databases.def
@@ -1,23 +1,18 @@
 name: databases
-kind: stratum
 description: some popular databases
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/nfs.morph
-chunks:
+- name: tools
+- name: nfs
+contents:
 - name: postgresql
   repo: upstream:postgresql
   ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316
   unpetrify-ref: REL9_3_4
-  build-depends: []
 - name: redis
-  morph: strata/databases/redis.morph
   repo: upstream:redis
   ref: 9ee59fca9c5c429185d35779c2d5db64005091b0
   unpetrify-ref: baserock/3.0
-  build-depends: []
 - name: memcached
   repo: upstream:memcached
   ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
   unpetrify-ref: master
-  build-depends: []
diff --git a/strata/databases/redis.morph b/strata/databases/redis.def
index 51f602dd..ef52ceca 100644
--- a/strata/databases/redis.morph
+++ b/strata/databases/redis.def
@@ -1,5 +1,4 @@
 name: redis
-kind: chunk
 build-commands:
 - make
 install-commands:
diff --git a/strata/enlightenment.morph b/strata/enlightenment.def
index 7ef6e22a..447c1630 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.def
@@ -1,36 +1,30 @@
 name: enlightenment
-kind: stratum
 description: Enlightenment Desktop and Window Manager
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/lua.morph
-- morph: strata/audio-bluetooth.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-- morph: strata/connman-common.morph
-chunks:
+- name: tools
+- name: x-generic
+- name: lua
+- name: audio-bluetooth
+- name: multimedia-gstreamer-0.10
+- name: connman-common
+contents:
 - name: efl
-  morph: strata/enlightenment/efl.morph
   repo: upstream:enlightenment/efl
   ref: 8f9b565e79552f09a39507ce802786b1fe773d2d
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: elementary
-  morph: strata/enlightenment/elementary.morph
   repo: upstream:enlightenment/elementary
   ref: e4c97ddffea9c91a291e1a6a7c6ebd1bbf47629a
   unpetrify-ref: baserock/morph
   build-depends:
   - efl
 - name: evas_generic_loaders
-  morph: strata/enlightenment/evas_generic_loaders.morph
   repo: upstream:enlightenment/evas_generic_loaders
   ref: ddbdaa35201f4ef64f1a3f3b067a99e84c14565a
   unpetrify-ref: baserock/morph
   build-depends:
   - efl
 - name: enlightenment
-  morph: strata/enlightenment/enlightenment.morph
   repo: upstream:enlightenment/enlightenment
   ref: 041b8d14a22f9e4c7f34abe8b0f9a3a1f5933146
   unpetrify-ref: baserock/morph
@@ -38,7 +32,6 @@ chunks:
   - efl
   - elementary
 - name: imlib2
-  morph: strata/enlightenment/imlib2.morph
   repo: upstream:enlightenment/imlib2
   ref: 6d02661a4c57771888304960ce62d4fdf587be8f
   unpetrify-ref: baserock/morph
@@ -47,7 +40,6 @@ chunks:
   - elementary
   - enlightenment
 - name: libast
-  morph: strata/enlightenment/libast.morph
   repo: upstream:enlightenment/libast
   ref: 0dbc0a5df55474bf61ca166be40e8de2d9e3a031
   unpetrify-ref: baserock/morph
@@ -57,7 +49,6 @@ chunks:
   - enlightenment
   - imlib2
 - name: eterm
-  morph: strata/enlightenment/eterm.morph
   repo: upstream:enlightenment/eterm
   ref: 097234f1f27709ff2444e303350764ea3b80b3ad
   unpetrify-ref: baserock/morph
diff --git a/strata/enlightenment/efl.morph b/strata/enlightenment/efl.def
index ca1c0b57..417e4ca5 100644
--- a/strata/enlightenment/efl.morph
+++ b/strata/enlightenment/efl.def
@@ -1,5 +1,4 @@
 name: efl
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr --with-tests=none --disable-fribidi --disable-image-loader-gif
   --disable-image-loader-tiff  --disable-pulseaudio --disable-gstreamer --disable-audio
diff --git a/strata/enlightenment/elementary.morph b/strata/enlightenment/elementary.def
index 3c0bda0d..4f859014 100644
--- a/strata/enlightenment/elementary.morph
+++ b/strata/enlightenment/elementary.def
@@ -1,5 +1,4 @@
 name: elementary
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/enlightenment/enlightenment.morph b/strata/enlightenment/enlightenment.def
index 90f0c646..a9e043ed 100644
--- a/strata/enlightenment/enlightenment.morph
+++ b/strata/enlightenment/enlightenment.def
@@ -1,5 +1,4 @@
 name: enlightenment
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/enlightenment/eterm.morph b/strata/enlightenment/eterm.def
index 9a98d193..ec066535 100644
--- a/strata/enlightenment/eterm.morph
+++ b/strata/enlightenment/eterm.def
@@ -1,5 +1,4 @@
 name: eterm
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/enlightenment/evas_generic_loaders.morph b/strata/enlightenment/evas_generic_loaders.def
index ef36a40b..9bea8b20 100644
--- a/strata/enlightenment/evas_generic_loaders.morph
+++ b/strata/enlightenment/evas_generic_loaders.def
@@ -1,5 +1,4 @@
 name: evas_generic_loaders
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/enlightenment/imlib2.morph b/strata/enlightenment/imlib2.def
index 82617ad2..051f54ec 100644
--- a/strata/enlightenment/imlib2.morph
+++ b/strata/enlightenment/imlib2.def
@@ -1,5 +1,4 @@
 name: imlib2
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/enlightenment/libast.morph b/strata/enlightenment/libast.def
index c44e274c..5ff953fe 100644
--- a/strata/enlightenment/libast.morph
+++ b/strata/enlightenment/libast.def
@@ -1,5 +1,4 @@
 name: libast
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=/usr
 build-commands:
diff --git a/strata/erlang.morph b/strata/erlang.def
index 05a8e090..dd7c3c88 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.def
@@ -1,12 +1,9 @@
 name: erlang
-kind: stratum
 description: stratum for erlang/otp and stuff
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: erlang
-  morph: strata/erlang/erlang.morph
   repo: upstream:erlang
   ref: d307c9520644d17d5f7597c0154888e2d570b107
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/erlang/erlang.morph b/strata/erlang/erlang.def
index feaf04f1..f3b202ca 100644
--- a/strata/erlang/erlang.morph
+++ b/strata/erlang/erlang.def
@@ -1,5 +1,4 @@
 name: erlang
-kind: chunk
 configure-commands:
 - ./otp_build autoconf
 - ./configure --prefix=$PREFIX
diff --git a/strata/foundation.morph b/strata/foundation.def
index a652fbd6..6ce7d296 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.def
@@ -1,51 +1,38 @@
 name: foundation
-kind: stratum
 description: Basic userland runtime system
 build-depends:
-- morph: strata/coreutils-common.morph
-chunks:
+- name: coreutils-common
+contents:
 - name: attr
-  morph: strata/foundation/attr.morph
   repo: upstream:attr
   ref: bf32f1769e9895f8546570f0c841a945c93a5b22
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: groff
-  morph: strata/foundation/groff.morph
   repo: upstream:groff
   ref: c7017a099f954bb6de60e79c876935b1bf438b9a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: kmod
-  morph: strata/foundation/kmod.morph
   repo: upstream:kmod
   ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libcap2
-  morph: strata/foundation/libcap2.morph
   repo: upstream:libcap2
   ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
   unpetrify-ref: baserock/morph
   build-depends:
   - attr
 - name: libffi
-  morph: strata/foundation/libffi.morph
   repo: upstream:libffi
   ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libusbx
   repo: upstream:libusbx
   ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pciutils
-  morph: strata/foundation/pciutils.morph
   repo: upstream:pciutils
   ref: bae04bd0473c68a2f21b7712a627abb08fd84b29
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: usbutils
   repo: upstream:usbutils
   ref: 410f1474af0ddb391bc6ec391777f116eee31569
@@ -63,14 +50,12 @@ chunks:
   build-depends:
   - glib
 - name: dbus-pre
-  morph: strata/foundation/dbus-pre.morph
   repo: upstream:dbus
   ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
   unpetrify-ref: baserock/genivi/dbus-1.8.8
   build-depends:
   - glib
 - name: systemd
-  morph: strata/foundation/systemd.morph
   repo: upstream:systemd
   ref: a77af3ec96015b2382ea31020d0a14b482d10a76
   unpetrify-ref: baserock/morph
@@ -82,19 +67,14 @@ chunks:
   - pciutils
   - usbutils
 - name: lzo
-  morph: strata/foundation/lzo.morph
   repo: upstream:lzo
   ref: 2cdfe9375f1145603d002c12be950062ae54da21
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: fuse
-  morph: strata/foundation/fuse.morph
   repo: upstream:fuse
   ref: 13ee8f62d4aa3360adb6956fb30da0c858928fa2
   unpetrify-ref: baserock/genivi/morph
-  build-depends: []
 - name: btrfs-progs
-  morph: strata/foundation/btrfs-progs.morph
   repo: upstream:btrfs-progs
   ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7
   unpetrify-ref: baserock/morph
@@ -102,7 +82,6 @@ chunks:
   - attr
   - lzo
 - name: dbus
-  morph: strata/foundation/dbus.morph
   repo: upstream:dbus
   ref: ff01faa12daa3481d6a3d2936929c5a2a1fe6fb5
   unpetrify-ref: baserock/genivi/dbus-1.8.8
@@ -113,16 +92,13 @@ chunks:
   repo: upstream:libxslt
   ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: openssh
-  morph: strata/foundation/openssh.morph
   repo: upstream:openssh
   ref: 233514106dcde5ac61a70f1043de563122e2f1c9
   unpetrify-ref: baserock/morph
   build-depends:
   - groff
 - name: tbdiff
-  morph: strata/foundation/tbdiff.morph
   repo: baserock:baserock/tbdiff
   ref: 3190be6906eb21a1ba6878d3c8edb4bd16f925d7
   unpetrify-ref: master
diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.def
index 59158a90..c7e9f991 100644
--- a/strata/foundation/attr.morph
+++ b/strata/foundation/attr.def
@@ -1,5 +1,4 @@
 name: attr
-kind: chunk
 description:
 - 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch'
 configure-commands:
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.def
index 356c3f06..0d7f00f9 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.def
@@ -1,5 +1,4 @@
 name: btrfs-progs
-kind: chunk
 build-commands:
 - make
 install-commands:
diff --git a/strata/foundation/dbus-pre.morph b/strata/foundation/dbus-pre.def
index 3ec008bf..090db71a 100644
--- a/strata/foundation/dbus-pre.morph
+++ b/strata/foundation/dbus-pre.def
@@ -1,5 +1,4 @@
 name: dbus-pre
-kind: chunk
 build-system: autotools
 configure-commands:
 - sh autogen.sh --no-configure
diff --git a/strata/foundation/dbus.morph b/strata/foundation/dbus.def
index 255d2915..3d5ca4fc 100644
--- a/strata/foundation/dbus.morph
+++ b/strata/foundation/dbus.def
@@ -1,5 +1,4 @@
 name: dbus
-kind: chunk
 build-system: autotools
 configure-commands:
 - sh autogen.sh --no-configure
diff --git a/strata/foundation/fuse.morph b/strata/foundation/fuse.def
index 6f7fc170..694eb016 100644
--- a/strata/foundation/fuse.morph
+++ b/strata/foundation/fuse.def
@@ -1,5 +1,4 @@
 name: fuse
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./makeconf.sh
diff --git a/strata/foundation/groff.morph b/strata/foundation/groff.def
index fed35b7d..f1fd3c6e 100644
--- a/strata/foundation/groff.morph
+++ b/strata/foundation/groff.def
@@ -1,5 +1,4 @@
 name: groff
-kind: chunk
 max-jobs: 1
 configure-commands:
 - PAGE=A4 ./configure --prefix="$PREFIX"
diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.def
index 12ac8692..16785b62 100644
--- a/strata/foundation/kmod.morph
+++ b/strata/foundation/kmod.def
@@ -1,5 +1,4 @@
 name: kmod
-kind: chunk
 configure-commands:
 - rm -rf libkmod/docs
 - sed -i -e'/SUBDIRS/{s/\S*doc\S*//;s/\S*man\S*//}' Makefile.am
diff --git a/strata/foundation/libcap2.morph b/strata/foundation/libcap2.def
index 3e4f205e..85412386 100644
--- a/strata/foundation/libcap2.morph
+++ b/strata/foundation/libcap2.def
@@ -1,5 +1,4 @@
 name: libcap2
-kind: chunk
 build-commands:
 - make prefix="$PREFIX"
 install-commands:
diff --git a/strata/foundation/libffi.morph b/strata/foundation/libffi.def
index 174477af..9447017f 100644
--- a/strata/foundation/libffi.morph
+++ b/strata/foundation/libffi.def
@@ -1,5 +1,4 @@
 name: libffi
-kind: chunk
 build-system: autotools
 install-commands:
 - make DESTDIR="$DESTDIR"/ install
diff --git a/strata/foundation/lzo.morph b/strata/foundation/lzo.def
index a1a7bbc7..d715c1e2 100644
--- a/strata/foundation/lzo.morph
+++ b/strata/foundation/lzo.def
@@ -1,5 +1,4 @@
 name: lzo
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --enable-shared=yes --prefix="$PREFIX"
diff --git a/strata/cross-bootstrap/openssh.morph b/strata/foundation/openssh.def
index 6c759cb0..8d44993e 100644
--- a/strata/cross-bootstrap/openssh.morph
+++ b/strata/foundation/openssh.def
@@ -1,5 +1,4 @@
 name: openssh
-kind: chunk
 configure-commands:
 - autoreconf -if
 - |
diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.def
index 8ca13bad..323761d9 100644
--- a/strata/foundation/pciutils.morph
+++ b/strata/foundation/pciutils.def
@@ -1,5 +1,4 @@
 name: pciutils
-kind: chunk
 configure-commands:
 - make ZLIB=no lib/config.mk
 - echo PREFIX=$PREFIX >>lib/config.mk
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.def
index 2a1933d7..6b3b5f01 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.def
@@ -1,5 +1,4 @@
 name: systemd
-kind: chunk
 max-jobs: 1
 build-system: autotools
 configure-commands:
diff --git a/strata/foundation/tbdiff.morph b/strata/foundation/tbdiff.def
index a907a109..6cc07139 100644
--- a/strata/foundation/tbdiff.morph
+++ b/strata/foundation/tbdiff.def
@@ -1,3 +1,2 @@
 name: tbdiff
-kind: chunk
 build-system: autotools
diff --git a/strata/genivi.morph b/strata/genivi.def
index bd0a457d..d2909f53 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.def
@@ -1,35 +1,27 @@
 name: genivi
-kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: strata/foundation.morph
-chunks:
+- name: foundation
+contents:
 - name: linuxquota
-  morph: strata/genivi/linuxquota.morph
   repo: upstream:linuxquota
   ref: 0804c89a16736533e440771dc42a15e5d0223902
   unpetrify-ref: baserock/genivi/morph
-  build-depends: []
 - name: DLT-daemon
   repo: upstream:DLT-daemon
   ref: 8b48e73f79b4463393916e4c6696917e3dedd026
   unpetrify-ref: v2.10.0
-  build-depends: []
 - name: node-startup-controller
-  morph: strata/genivi/node-startup-controller.morph
   repo: upstream:node-startup-controller
   ref: c78fddaddc24a2c49f5ef18896c93403575295ae
   unpetrify-ref: baserock/morph
   build-depends:
   - DLT-daemon
 - name: googletest
-  morph: strata/genivi/googletest.morph
   repo: upstream:googletest
   ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: googlemock
-  morph: strata/genivi/googlemock.morph
   repo: upstream:googlemock
   ref: 0e9998c140079046c396a0e7033bb465abae79cd
   unpetrify-ref: baserock/morph
@@ -39,7 +31,6 @@ chunks:
   repo: upstream:genivi-common-api-runtime
   ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
   unpetrify-ref: 2.1.6
-  build-depends: []
 - name: genivi-common-api-dbus-runtime
   repo: upstream:genivi-common-api-dbus-runtime
   ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
@@ -57,11 +48,9 @@ chunks:
   - genivi-common-api-runtime
   - genivi-common-api-dbus-runtime
 - name: itzam-tarball
-  morph: strata/genivi/itzam-tarball.morph
   repo: upstream:itzam-tarball
   ref: 4ebcf671416927b64475da7b810b6016c847bf73
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
 - name: persistence-client-library
   repo: upstream:genivi/persistence-client-library
   ref: 0934ba263e69be8453cc3150f997dad28489f0c7
diff --git a/strata/genivi/googlemock.morph b/strata/genivi/googlemock.def
index b3eaa952..997635c7 100644
--- a/strata/genivi/googlemock.morph
+++ b/strata/genivi/googlemock.def
@@ -1,5 +1,4 @@
 name: googlemock
-kind: chunk
 build-system: autotools
 configure-commands:
 - mkdir -p gtest/m4
diff --git a/strata/genivi/googletest.morph b/strata/genivi/googletest.def
index 7723c721..40503809 100644
--- a/strata/genivi/googletest.morph
+++ b/strata/genivi/googletest.def
@@ -1,5 +1,4 @@
 name: googletest
-kind: chunk
 build-system: autotools
 install-commands:
 - make DESTDIR="$DESTDIR" install
diff --git a/strata/genivi/itzam-tarball.morph b/strata/genivi/itzam-tarball.def
index eaf2db61..e0841881 100644
--- a/strata/genivi/itzam-tarball.morph
+++ b/strata/genivi/itzam-tarball.def
@@ -1,5 +1,4 @@
 name: itzam-tarball
-kind: chunk
 build-system: autotools
 pre-configure-commands:
 - sed -i 's/GENERIC_LIBRARY_NAME=libitzam/GENERIC_LIBRARY_NAME=itzam/g' configure.ac
diff --git a/strata/genivi/linuxquota.morph b/strata/genivi/linuxquota.def
index 826696ad..f2ccf965 100644
--- a/strata/genivi/linuxquota.morph
+++ b/strata/genivi/linuxquota.def
@@ -1,5 +1,4 @@
 name: linuxquota
-kind: chunk
 build-system: autotools
 configure-commands:
 - autoreconf -ivf
diff --git a/strata/genivi/node-startup-controller.morph b/strata/genivi/node-startup-controller.def
index d3d6dc77..a0b85dd3 100644
--- a/strata/genivi/node-startup-controller.morph
+++ b/strata/genivi/node-startup-controller.def
@@ -1,5 +1,4 @@
 name: node-startup-controller
-kind: chunk
 configure-commands:
 - sh autogen.sh
 - ./configure --prefix="$PREFIX" --sysconfdir=/etc
diff --git a/strata/gitlab.morph b/strata/gitlab.def
index 0a1c35bb..42f28d93 100644
--- a/strata/gitlab.morph
+++ b/strata/gitlab.def
@@ -1,24 +1,17 @@
 name: gitlab
-kind: stratum
 description: gitlab components for server, ci etc
 build-depends:
-- morph: strata/ruby.morph
-chunks:
+- name: ruby
+contents:
 - name: gitlab-ce
-  morph: strata/gitlab/gitlab-ce.morph
   repo: upstream:gitlab/gitlab-ce
   ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
   unpetrify-ref: baserock/v7.0.0
-  build-depends: []
 - name: gitlab-ci
-  morph: strata/gitlab/gitlab-ci.morph
   repo: upstream:gitlab/gitlab-ci
   ref: c74044d65dec2ba8311e242c84e07a67abd52d37
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: gitlab-shell
-  morph: strata/gitlab/gitlab-shell.morph
   repo: upstream:gitlab/gitlab-shell
   ref: 0b4106d57223c666d9360339fd3790174aa43800
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/gitlab/gitlab-ce.morph b/strata/gitlab/gitlab-ce.def
index 571881f8..916af2d6 100644
--- a/strata/gitlab/gitlab-ce.morph
+++ b/strata/gitlab/gitlab-ce.def
@@ -1,5 +1,4 @@
 name: gitlab-ce
-kind: chunk
 install-commands:
 - mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ce"
 - cp -R * "$DESTDIR/$PREFIX/share/gitlab-ce"
diff --git a/strata/gitlab/gitlab-ci.morph b/strata/gitlab/gitlab-ci.def
index 99d01367..ba9d683d 100644
--- a/strata/gitlab/gitlab-ci.morph
+++ b/strata/gitlab/gitlab-ci.def
@@ -1,5 +1,4 @@
 name: gitlab-ci
-kind: chunk
 install-commands:
 - mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ci"
 - cp -R * "$DESTDIR/$PREFIX/share/gitlab-ci"
diff --git a/strata/gitlab/gitlab-shell.morph b/strata/gitlab/gitlab-shell.def
index 069c6c41..a8bf17c5 100644
--- a/strata/gitlab/gitlab-shell.morph
+++ b/strata/gitlab/gitlab-shell.def
@@ -1,5 +1,4 @@
 name: gitlab-shell
-kind: chunk
 install-commands:
 - mkdir -p "$DESTDIR/$PREFIX/share/gitlab-shell"
 - cp -R * "$DESTDIR/$PREFIX/share/gitlab-shell"
diff --git a/strata/graphics-common.morph b/strata/graphics-common.def
index b187df8f..81aa956c 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.def
@@ -1,18 +1,15 @@
 name: graphics-common
-kind: stratum
 build-depends:
-- morph: strata/mesa-common.morph
-chunks:
+- name: mesa-common
+contents:
 - name: pixman
   repo: upstream:pixman
   ref: 87eea99e443b389c978cf37efc52788bf03a0ee0
   unpetrify-ref: pixman-0.32.6
-  build-depends: []
 - name: freetype2
   repo: upstream:freetype2
   ref: ec8853cd18e1a0c275372769bdad37a79550ed66
   unpetrify-ref: VER-2-5-3
-  build-depends: []
 - name: fontconfig
   repo: upstream:fontconfig
   ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
@@ -20,28 +17,22 @@ chunks:
   build-depends:
   - freetype2
 - name: freefont-otf
-  morph: strata/graphics-common/freefont-otf.morph
   repo: upstream:freefont-otf
   ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libpng
   repo: upstream:libpng
   ref: 259fb7761d747655c607efcec7a12ff1f3c24561
   unpetrify-ref: libpng-1.6.13-signed
-  build-depends: []
 - name: libjpeg
   repo: upstream:libjpeg
   ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libtiff
   repo: upstream:libtiff
   ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
   unpetrify-ref: Release-v4-0-3
-  build-depends: []
 - name: cairo
-  morph: strata/graphics-common/cairo.morph
   repo: upstream:cairo
   ref: f6fd372a8b31a0bebbdfe36090d6ffc7bab9a2f8
   unpetrify-ref: 1.14.0
diff --git a/strata/graphics-common/cairo.morph b/strata/graphics-common/cairo.def
index f91ac385..fa782661 100644
--- a/strata/graphics-common/cairo.morph
+++ b/strata/graphics-common/cairo.def
@@ -1,5 +1,4 @@
 name: cairo
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/graphics-common/freefont-otf.morph b/strata/graphics-common/freefont-otf.def
index f021480d..f043a493 100644
--- a/strata/graphics-common/freefont-otf.morph
+++ b/strata/graphics-common/freefont-otf.def
@@ -1,5 +1,4 @@
 name: freefont-otf
-kind: chunk
 install-commands:
 - mkdir -p "$DESTDIR"/usr/share/fonts/opentype/freefont
 - install -p *.otf "$DESTDIR"/usr/share/fonts/opentype/freefont
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.def
index 799ba87a..ea9e9999 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.def
@@ -1,33 +1,26 @@
 name: gtk-deps
-kind: stratum
 description: the GTK+ dependencies stratum
 build-depends:
-- morph: strata/foundation.morph
-- morph: strata/graphics-common.morph
-- morph: strata/x-common.morph
-chunks:
+- name: foundation
+- name: graphics-common
+- name: x-common
+contents:
 - name: pango
   repo: upstream:pango
   ref: e0a21abf52a0b7588b1aa3357818948816ed9103
   unpetrify-ref: 1.36.8
-  build-depends: []
 - name: shared-mime-info
-  morph: strata/gtk-deps/shared-mime-info.morph
   repo: upstream:shared-mime-info
   ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: gnome-common
   repo: upstream:gnome-common
   ref: d213283fcb5228d05eb2c796579f18240e8467e8
   unpetrify-ref: 3.12.0
-  build-depends: []
 - name: gdk-pixbuf
-  morph: strata/gtk-deps/gdk-pixbuf.morph
   repo: upstream:gdk-pixbuf
   ref: b86959aa16e9d49ec6e286bc57d36c5249578c59
   unpetrify-ref: 2.30.8
-  build-depends: []
 - name: atk
   repo: upstream:atk
   ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
@@ -38,7 +31,6 @@ chunks:
   repo: upstream:at-spi2-core
   ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
   unpetrify-ref: AT_SPI2_CORE_2_12_0
-  build-depends: []
 - name: at-spi2-atk
   repo: upstream:at-spi2-atk
   ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
diff --git a/strata/gtk-deps/gdk-pixbuf.morph b/strata/gtk-deps/gdk-pixbuf.def
index c89c75c8..06ae22cd 100644
--- a/strata/gtk-deps/gdk-pixbuf.morph
+++ b/strata/gtk-deps/gdk-pixbuf.def
@@ -1,5 +1,4 @@
 name: gdk-pixbuf
-kind: chunk
 build-system: autotools
 install-commands:
 - make DESTDIR=$DESTDIR install
diff --git a/strata/gtk-deps/shared-mime-info.morph b/strata/gtk-deps/shared-mime-info.def
index e155fde0..47c646cd 100644
--- a/strata/gtk-deps/shared-mime-info.morph
+++ b/strata/gtk-deps/shared-mime-info.def
@@ -1,4 +1,3 @@
 name: shared-mime-info
-kind: chunk
 max-jobs: 1
 build-system: autotools
diff --git a/strata/gtk2.morph b/strata/gtk2.def
index 8ac31eaa..7b37b7c0 100644
--- a/strata/gtk2.morph
+++ b/strata/gtk2.def
@@ -1,12 +1,9 @@
 name: gtk2
-kind: stratum
 description: the gtk2 stratum
 build-depends:
-- morph: strata/gtk-deps.morph
-- morph: strata/x-generic.morph
-chunks:
+- name: gtk-deps
+- name: x-generic
+contents:
 - name: gtk+
-  morph: strata/gtk2/gtk+.morph
   repo: upstream:gtk+
   ref: fbf38d16bcc26630f0f721d266509f5bc292f606
-  build-depends: []
diff --git a/strata/gtk2/gtk+.morph b/strata/gtk2/gtk+.def
index abbf2510..d901499d 100644
--- a/strata/gtk2/gtk+.morph
+++ b/strata/gtk2/gtk+.def
@@ -1,5 +1,4 @@
 name: gtk+
-kind: chunk
 build-system: autotools
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
diff --git a/strata/gtk3.morph b/strata/gtk3.def
index f471bf6e..a2382df3 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.def
@@ -1,17 +1,14 @@
 name: gtk3
-kind: stratum
 description: the gtk3 stratum
 build-depends:
-- morph: strata/gtk-deps.morph
-- morph: strata/wayland-generic.morph
-chunks:
+- name: gtk-deps
+- name: wayland-generic
+contents:
 - name: libepoxy
   repo: upstream:libepoxy
   ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
   unpetrify-ref: v1.2
-  build-depends: []
 - name: gtk3
-  morph: strata/gtk3/gtk3.morph
   repo: upstream:gtk+
   ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
   unpetrify-ref: 3.15.0
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.def
index 4542dc15..a07ac7af 100644
--- a/strata/gtk3/gtk3.morph
+++ b/strata/gtk3/gtk3.def
@@ -1,5 +1,4 @@
 name: gtk3
-kind: chunk
 build-system: autotools
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.def
index b6076cde..e878d6d8 100644
--- a/strata/initramfs-utils.morph
+++ b/strata/initramfs-utils.def
@@ -1,12 +1,9 @@
 name: initramfs-utils
-kind: stratum
 description: stratum for initramfs
 build-depends:
-- morph: strata/build-essential.morph
-chunks:
+- name: build-essential
+contents:
 - name: initramfs-scripts
-  morph: strata/initramfs-utils/initramfs-scripts.morph
   repo: baserock:baserock/initramfs-scripts
   ref: a97dea93d28ba272613029e46a8a0b1f699729d8
   unpetrify-ref: master
-  build-depends: []
diff --git a/strata/initramfs-utils/initramfs-scripts.morph b/strata/initramfs-utils/initramfs-scripts.def
index 68ed4a7b..badd5422 100644
--- a/strata/initramfs-utils/initramfs-scripts.morph
+++ b/strata/initramfs-utils/initramfs-scripts.def
@@ -1,4 +1,3 @@
 name: initramfs-scripts
-kind: chunk
 install-commands:
 - install -m 755 init "$DESTDIR/init"
diff --git a/strata/input-common.morph b/strata/input-common.def
index 0e9d25e6..5ec6cbd1 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.def
@@ -1,25 +1,20 @@
 name: input-common
-kind: stratum
 build-depends:
-- morph: strata/foundation.morph
-- morph: strata/xorg-util-macros-common.morph
-chunks:
+- name: foundation
+- name: xorg-util-macros-common
+contents:
 - name: mtdev
   repo: upstream:mtdev-git
   ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
 - name: xkeyboard-config
-  morph: strata/input-common/xkeyboard-config.morph
   repo: upstream:xkeyboard-config
   ref: bc3ac1b0d152e929b3532a541596cf9fe286bb9e
   unpetrify-ref: xkeyboard-config-2.12
-  build-depends: []
 - name: libevdev
   repo: upstream:libevdev
   ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
 - name: libinput
   repo: upstream:libinput
   ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d
diff --git a/strata/input-common/xkeyboard-config.morph b/strata/input-common/xkeyboard-config.def
index ad33b422..4a06b024 100644
--- a/strata/input-common/xkeyboard-config.morph
+++ b/strata/input-common/xkeyboard-config.def
@@ -1,5 +1,4 @@
 name: xkeyboard-config
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps
 install-commands:
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.def
index 37bff746..7c300ae8 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.def
@@ -1,16 +1,13 @@
 name: libdrm-common
-kind: stratum
 build-depends:
-- morph: strata/xorg-util-macros-common.morph
-chunks:
+- name: xorg-util-macros-common
+contents:
 - name: xorg-lib-libpciaccess
   repo: upstream:xorg-lib-libpciaccess
   ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: drm
   repo: upstream:drm
-  morph: strata/libdrm-common/drm.morph
   ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
   unpetrify-ref: baserock/jetson/drm
   build-depends:
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.def
index d3d06fd8..40e1545e 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.def
@@ -1,5 +1,4 @@
 name: drm
-kind: chunk
 build-system: autotools
 configure-commands:
   - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.def
index cf3dec19..72958519 100644
--- a/strata/lighttpd-server.morph
+++ b/strata/lighttpd-server.def
@@ -1,13 +1,10 @@
 name: lighttpd-server
-kind: stratum
 description: lighttpd web server
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/pcre-utils.morph
-chunks:
+- name: tools
+- name: pcre-utils
+contents:
 - name: lighttpd
-  morph: strata/lighttpd-server/lighttpd.morph
   repo: upstream:lighttpd
   ref: 12e4e21763da770034267ff0a7b660876930f789
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/lighttpd-server/lighttpd.morph b/strata/lighttpd-server/lighttpd.def
index ae371c52..cb762f21 100644
--- a/strata/lighttpd-server/lighttpd.morph
+++ b/strata/lighttpd-server/lighttpd.def
@@ -1,5 +1,4 @@
 name: lighttpd
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
diff --git a/strata/llvm-common.morph b/strata/llvm-common.def
index 243461d6..f92804e6 100644
--- a/strata/llvm-common.morph
+++ b/strata/llvm-common.def
@@ -1,11 +1,8 @@
 name: llvm-common
-kind: stratum
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: llvm
-  morph: strata/llvm-common/llvm.morph
   repo: upstream:llvm
   ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f
   unpetrify-ref: release_33
-  build-depends: []
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.def
index 9d280062..e73d1cae 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.def
@@ -1,5 +1,4 @@
 name: llvm
-kind: chunk
 description: Low Level Virtual Machine
 build-system: autotools
 configure-commands:
diff --git a/strata/lua.morph b/strata/lua.def
index 5ac3102b..503c8d91 100644
--- a/strata/lua.morph
+++ b/strata/lua.def
@@ -1,12 +1,9 @@
 name: lua
-kind: stratum
 description: Interpreter for the lua scripting language.
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: lua
-  morph: strata/lua/lua.morph
   repo: upstream:lua
   ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
   unpetrify-ref: baserock/5.1-morph
-  build-depends: []
diff --git a/strata/lua/lua.morph b/strata/lua/lua.def
index 32aeb5c1..b04c2b63 100644
--- a/strata/lua/lua.morph
+++ b/strata/lua/lua.def
@@ -1,5 +1,4 @@
 name: lua
-kind: chunk
 configure-commands:
 - sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
 - sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
diff --git a/strata/mesa-common.def b/strata/mesa-common.def
new file mode 100644
index 00000000..8143a4e9
--- /dev/null
+++ b/strata/mesa-common.def
@@ -0,0 +1,10 @@
+name: mesa-common
+build-depends:
+- name: llvm-common
+- name: libdrm-common
+- name: wayland-generic
+contents:
+- name: mesa
+  repo: upstream:mesa
+  ref: 1a9cc5f50db5d27530a3449743b43aac389d781f
+  unpetrify-ref: mesa-10.3.3
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
deleted file mode 100644
index efae2449..00000000
--- a/strata/mesa-common.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: mesa-common
-kind: stratum
-build-depends:
-- morph: strata/llvm-common.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: mesa
-  morph: strata/mesa-common/mesa.morph
-  repo: upstream:mesa
-  ref: 1a9cc5f50db5d27530a3449743b43aac389d781f
-  unpetrify-ref: mesa-10.3.3
-  build-depends: []
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.def
index 4194acc2..c1c25812 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.def
@@ -1,5 +1,4 @@
 name: mesa
-kind: chunk
 build-system: autotools
 configure-commands:
 - |
diff --git a/strata/morph-utils.morph b/strata/morph-utils.def
index 54292eb0..591a430d 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.def
@@ -1,43 +1,33 @@
 name: morph-utils
-kind: stratum
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: python-ttystatus
-  morph: strata/morph-utils/python-ttystatus.morph
   repo: upstream:python-ttystatus
   ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-markdown
   repo: upstream:python-markdown
   ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: git-fat
-  morph: strata/tools/git-fat.morph
   repo: upstream:git-fat
   ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: six
   repo: upstream:six
   ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pyfilesystem
-  morph: strata/morph-utils/pyfilesystem.morph
   repo: upstream:pyfilesystem
   ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
   unpetrify-ref: baserock/morph
   build-depends:
   - six
 - name: python-coveragepy
-  morph: strata/morph-utils/python-coveragepy.morph
   repo: upstream:python-coveragepy
   ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
   ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
@@ -51,7 +41,6 @@ chunks:
   build-depends:
   - python-coverage-test-runner
 - name: cmdtest
-  morph: strata/morph-utils/cmdtest.morph
   repo: upstream:cmdtest
   ref: ac91791842c6e7e6eda3213916af413255999c7b
   unpetrify-ref: baserock/morph
@@ -63,12 +52,10 @@ chunks:
   repo: upstream:bottle
   ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: flup
   repo: upstream:flup
   ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: morph
   repo: baserock:baserock/morph
   ref: 9b0b5206a25c1d874d6e17952c4385838e57563e
diff --git a/strata/cross-bootstrap/cmdtest.morph b/strata/morph-utils/cmdtest.def
index 3e1c71c6..34010c41 100644
--- a/strata/cross-bootstrap/cmdtest.morph
+++ b/strata/morph-utils/cmdtest.def
@@ -1,5 +1,4 @@
 name: cmdtest
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/cross-bootstrap/pyfilesystem.morph b/strata/morph-utils/pyfilesystem.def
index a4931dfa..fae6f7d1 100644
--- a/strata/cross-bootstrap/pyfilesystem.morph
+++ b/strata/morph-utils/pyfilesystem.def
@@ -1,5 +1,4 @@
 name: pyfilesystem
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/cross-bootstrap/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.def
index ed5e3d87..cf8718b3 100644
--- a/strata/cross-bootstrap/python-coveragepy.morph
+++ b/strata/morph-utils/python-coveragepy.def
@@ -1,5 +1,4 @@
 name: python-coveragepy
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/morph-utils/python-ttystatus.morph b/strata/morph-utils/python-ttystatus.def
index e45ef7a8..503e7da5 100644
--- a/strata/morph-utils/python-ttystatus.morph
+++ b/strata/morph-utils/python-ttystatus.def
@@ -1,5 +1,4 @@
 name: python-ttystatus
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.def
index ae5fe656..99cd13f6 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.def
@@ -1,16 +1,14 @@
 name: multimedia-gstreamer-0.10
-kind: stratum
 description: Codecs
 build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/audio-bluetooth.morph
-chunks:
+- name: core
+- name: foundation
+- name: audio-bluetooth
+contents:
 - name: orc
   repo: upstream:orc
   ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: gstreamer
   repo: upstream:gstreamer
   ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
diff --git a/strata/multimedia.morph b/strata/multimedia.def
index b0d82984..726f6f56 100644
--- a/strata/multimedia.morph
+++ b/strata/multimedia.def
@@ -1,14 +1,12 @@
 name: multimedia
-kind: stratum
 description: Codecs
 build-depends:
-- morph: strata/audio-bluetooth.morph
-chunks:
+- name: audio-bluetooth
+contents:
 - name: orc
   repo: upstream:orc
   ref: ec132ae118bead13312f126a1f6e5709a2429ff6
   unpetrify-ref: orc-0.4.19
-  build-depends: []
 - name: gstreamer
   repo: upstream:gstreamer
   ref: 0217fba607637860a475d0b5d48a3d4b249ca360
diff --git a/strata/network-security.morph b/strata/network-security.def
index 3d0c7814..5ed1ef90 100644
--- a/strata/network-security.morph
+++ b/strata/network-security.def
@@ -1,16 +1,12 @@
 name: network-security
-kind: stratum
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: nspr
-  morph: strata/network-security/nspr.morph
   repo: upstream:nspr-hg
   ref: a6ee84946475c1fb7624973af28163f6da247c0d
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: nss
-  morph: strata/network-security/nss.morph
   repo: upstream:nss
   ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
   unpetrify-ref: baserock/morph
diff --git a/strata/network-security/nspr.morph b/strata/network-security/nspr.def
index 27613eb4..d0a3fc48 100644
--- a/strata/network-security/nspr.morph
+++ b/strata/network-security/nspr.def
@@ -1,5 +1,4 @@
 name: nspr
-kind: chunk
 build-system: autotools
 configure-commands:
 - |
diff --git a/strata/network-security/nss.morph b/strata/network-security/nss.def
index c83fd174..8edc170e 100644
--- a/strata/network-security/nss.morph
+++ b/strata/network-security/nss.def
@@ -1,5 +1,4 @@
 name: nss
-kind: chunk
 max-jobs: 1
 build-system: autotools
 configure-commands:
diff --git a/strata/nfs.morph b/strata/nfs.def
index 68988d54..570dedf4 100644
--- a/strata/nfs.morph
+++ b/strata/nfs.def
@@ -1,29 +1,23 @@
 name: nfs
-kind: stratum
 description: NFS utilities
 build-depends:
-- morph: strata/foundation.morph
-chunks:
+- name: foundation
+contents:
 - name: libevent
   repo: upstream:libevent
   ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
   unpetrify-ref: baserock/release-2.0.21-stable
-  build-depends: []
 - name: ti-rpc
-  morph: strata/nfs/ti-rpc.morph
   repo: upstream:ti-rpc
   ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f
   unpetrify-ref: baserock/master
-  build-depends: []
 - name: rpcbind
-  morph: strata/nfs/rpcbind.morph
   repo: upstream:rpcbind
   ref: aa3ac0d86c258d3e355ae59df31a96da795ecdfa
   unpetrify-ref: baserock/master
   build-depends:
   - ti-rpc
 - name: nfs-utils
-  morph: strata/nfs/nfs-utils.morph
   repo: upstream:nfs-utils
   ref: 08baf3bc2f66a1ca6401191e19380028d2fc2c6d
   unpetrify-ref: baserock/master
diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.def
index c412e1d0..7f890bc9 100644
--- a/strata/nfs/nfs-utils.morph
+++ b/strata/nfs/nfs-utils.def
@@ -1,5 +1,4 @@
 name: nfs-utils
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/nfs/rpcbind.morph b/strata/nfs/rpcbind.def
index 0ca929dc..7b80e19e 100644
--- a/strata/nfs/rpcbind.morph
+++ b/strata/nfs/rpcbind.def
@@ -1,5 +1,4 @@
 name: rpcbind
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/nfs/tcp-wrappers.morph b/strata/nfs/tcp-wrappers.def
index c68671f6..80cfcc51 100644
--- a/strata/nfs/tcp-wrappers.morph
+++ b/strata/nfs/tcp-wrappers.def
@@ -1,5 +1,4 @@
 name: tcp-wrappers
-kind: chunk
 build-commands:
 - make MAJOR=0 MINOR=7 REL=6 linux
 install-commands:
diff --git a/strata/nfs/ti-rpc.morph b/strata/nfs/ti-rpc.def
index 3fb91e1f..5edecefd 100644
--- a/strata/nfs/ti-rpc.morph
+++ b/strata/nfs/ti-rpc.def
@@ -1,5 +1,4 @@
 name: ti-rpc
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/nodejs.morph b/strata/nodejs.def
index f8955a01..ef9f2f32 100644
--- a/strata/nodejs.morph
+++ b/strata/nodejs.def
@@ -1,11 +1,9 @@
 name: nodejs
-kind: stratum
 description: Stratum for nodejs related stuff
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: node
   repo: upstream:node
   ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
   unpetrify-ref: v0.10.26
-  build-depends: []
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.def
index 616a8762..cfb1560d 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.def
@@ -1,24 +1,20 @@
 name: openstack-clients
-kind: stratum
 description: A stratum with OpenStack clients, for OpenStack deployments.
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: jsonschema
   repo: upstream:jsonschema
   ref: 292a256b918af1e567982bb801c427cf4ca5b9fe
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-json-pointer
   repo: upstream:python-json-pointer
   ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-json-patch
   repo: upstream:python-json-patch
   ref: 27c7032de25923593fa17cc14f535fb7abd52448
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: warlock
   repo: upstream:warlock
   ref: 1a0de8a67df8282c42f71014cc871684e8d7c0cf
@@ -28,52 +24,41 @@ chunks:
   - python-json-pointer
   - python-json-patch
 - name: python-prettytable
-  morph: strata/openstack-clients/python-prettytable.morph
   repo: upstream:python-prettytable
   ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pbr
   repo: upstream:pbr
   ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: argparse
   repo: upstream:argparse
   ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pyopenssl
   repo: upstream:pyopenssl
   ref: 6bbf44a00b35fb28df1f66aa194b2fe95eab1ab2
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pyiso8601
   repo: upstream:pyiso8601
   ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-requests
   repo: upstream:python-requests
   ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: simplejson
   repo: upstream:simplejson
   ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: netaddr
   repo: upstream:netaddr
   ref: f64ae19e533ffa5522dcba1fc833975cb2ee88a5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pytz
-  morph: strata/openstack-clients/pytz.morph
   repo: upstream:pytz
   ref: 384207f01fd5b8bf1eb20cb64c17679084731944
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: babel
   repo: upstream:babel
   ref: d764b35bc3910b8f67ff811752df615afa7667f6
diff --git a/strata/openstack-clients/python-prettytable.morph b/strata/openstack-clients/python-prettytable.def
index cf1ac6e1..35620ff0 100644
--- a/strata/openstack-clients/python-prettytable.morph
+++ b/strata/openstack-clients/python-prettytable.def
@@ -1,5 +1,4 @@
 name: python-prettytable
-kind: chunk
 build-commands:
 - cd src && python setup.py build
 install-commands:
diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pytz.def
index f5557946..b827d9b8 100644
--- a/strata/openstack-clients/pytz.morph
+++ b/strata/openstack-clients/pytz.def
@@ -1,5 +1,4 @@
 name: pytz
-kind: chunk
 build-commands:
 - cd src && python setup.py build
 install-commands:
diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.def
index bcc03c86..9204f179 100644
--- a/strata/patch-manager-gerrit.morph
+++ b/strata/patch-manager-gerrit.def
@@ -1,11 +1,8 @@
 name: patch-manager-gerrit
-kind: stratum
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: gerrit-installation-binaries
-  morph: strata/patch-manager-gerrit/gerrit-installation-binaries.morph
   repo: github:franred/gerrit-installation-binaries
   ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
   unpetrify-ref: master
-  build-depends: []
diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph b/strata/patch-manager-gerrit/gerrit-installation-binaries.def
index b0d1a393..366e3ba0 100644
--- a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
+++ b/strata/patch-manager-gerrit/gerrit-installation-binaries.def
@@ -1,5 +1,4 @@
 name: gerrit-installation-binaries
-kind: chunk
 configure-commands: []
 build-commands:
 - cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.def
index 44d0bab2..3e0f57f0 100644
--- a/strata/pcre-utils.morph
+++ b/strata/pcre-utils.def
@@ -1,10 +1,8 @@
 name: pcre-utils
-kind: stratum
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: pcre
   repo: upstream:pcre
   ref: 2720152c58e13e7cc7403642ec33127101b9971b
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.def
index b260c9d9..45bdde01 100644
--- a/strata/qt4-sdk.morph
+++ b/strata/qt4-sdk.def
@@ -1,12 +1,9 @@
 name: qt4-sdk
-kind: stratum
 description: Qt4 Desktop Environment, IDE and Example Apps
 build-depends:
-- morph: strata/qt4-tools.morph
-chunks:
+- name: qt4-tools
+contents:
 - name: qt-creator
-  morph: strata/qt4-sdk/qt-creator.morph
   repo: upstream:qt-creator
   ref: d5a6b10634c1a3271012e9578e016772ef077d59
   unpetrify-ref: baserock/morph/2.7
-  build-depends: []
diff --git a/strata/qt5-sdk/qt-creator.morph b/strata/qt4-sdk/qt-creator.def
index 76d9f7d7..19fbd952 100644
--- a/strata/qt5-sdk/qt-creator.morph
+++ b/strata/qt4-sdk/qt-creator.def
@@ -1,5 +1,4 @@
 name: qt-creator
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.def
index 18d2cc5f..162047b2 100644
--- a/strata/qt4-tools.morph
+++ b/strata/qt4-tools.def
@@ -1,32 +1,25 @@
 name: qt4-tools
-kind: stratum
 description: Qt4 Development Libraries and Tools
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-chunks:
+- name: tools
+- name: x-generic
+- name: multimedia-gstreamer-0.10
+contents:
 - name: icu
-  morph: strata/qt4-tools/icu.morph
   repo: upstream:icu
   ref: ba023548a3bff7277cbea4acade3042ce9d8949e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: ruby-1.8
-  morph: strata/qt4-tools/ruby-1.8.morph
   repo: upstream:ruby
   ref: 7a24f1710028d568ad61d0aa49d5178260178d77
   unpetrify-ref: baserock/morph/ruby_1_8_7
-  build-depends: []
 - name: ruby-1.9
-  morph: strata/qt4-tools/ruby-1.9.morph
   repo: upstream:ruby
   ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
   unpetrify-ref: baserock/morph/ruby_1_9_3
   build-depends:
   - ruby-1.8
 - name: qt4-tools
-  morph: strata/qt4-tools/qt4-tools.morph
   repo: upstream:qt4-tools
   ref: a182f020bc1703c20d86ba18f2f6b4ea8889de84
   unpetrify-ref: baserock/morph
diff --git a/strata/qt4-tools/icu.morph b/strata/qt4-tools/icu.def
index 37dec07e..fc136fd2 100644
--- a/strata/qt4-tools/icu.morph
+++ b/strata/qt4-tools/icu.def
@@ -1,5 +1,4 @@
 name: icu
-kind: chunk
 configure-commands:
 - cd source; ./runConfigureICU Linux --prefix=/usr
 build-commands:
diff --git a/strata/qt4-tools/qt4-tools.morph b/strata/qt4-tools/qt4-tools.def
index bc4cc17e..228ca7b3 100644
--- a/strata/qt4-tools/qt4-tools.morph
+++ b/strata/qt4-tools/qt4-tools.def
@@ -1,5 +1,4 @@
 name: qt4-tools
-kind: chunk
 max-jobs: 1
 configure-commands:
 - |
diff --git a/strata/qt4-tools/ruby-1.8.morph b/strata/qt4-tools/ruby-1.8.def
index cee282c0..9b36a794 100644
--- a/strata/qt4-tools/ruby-1.8.morph
+++ b/strata/qt4-tools/ruby-1.8.def
@@ -1,5 +1,4 @@
 name: ruby-1.8
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --program-suffix=-1.8
diff --git a/strata/qt4-tools/ruby-1.9.morph b/strata/qt4-tools/ruby-1.9.def
index bc697ada..3d54adab 100644
--- a/strata/qt4-tools/ruby-1.9.morph
+++ b/strata/qt4-tools/ruby-1.9.def
@@ -1,5 +1,4 @@
 name: ruby-1.9
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.def
index f0b3cc2e..f4023d6c 100644
--- a/strata/qt5-sdk.morph
+++ b/strata/qt5-sdk.def
@@ -1,18 +1,13 @@
 name: qt5-sdk
-kind: stratum
 description: Qt5 Desktop Environment, IDE and Example Apps
 build-depends:
-- morph: strata/qt5-tools.morph
-chunks:
+- name: qt5-tools
+contents:
 - name: qt-creator
-  morph: strata/qt5-sdk/qt-creator.morph
   repo: upstream:qt-creator
   ref: d5a6b10634c1a3271012e9578e016772ef077d59
   unpetrify-ref: baserock/morph/2.7
-  build-depends: []
 - name: snowshoe
-  morph: strata/qt5-sdk/snowshoe.morph
   repo: upstream:snowshoe
   ref: 098f931de58072edd5d591cdc4a2ad3c05e83991
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/qt4-sdk/qt-creator.morph b/strata/qt5-sdk/qt-creator.def
index 76d9f7d7..19fbd952 100644
--- a/strata/qt4-sdk/qt-creator.morph
+++ b/strata/qt5-sdk/qt-creator.def
@@ -1,5 +1,4 @@
 name: qt-creator
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-sdk/snowshoe.morph b/strata/qt5-sdk/snowshoe.def
index f89ab751..a9ceb5e5 100644
--- a/strata/qt5-sdk/snowshoe.morph
+++ b/strata/qt5-sdk/snowshoe.def
@@ -1,5 +1,4 @@
 name: snowshoe
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.def
index 1c784bf3..d27f49a6 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.def
@@ -1,53 +1,43 @@
 name: qt5-tools
-kind: stratum
 description: Qt5 Development Libraries and Tools
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
-chunks:
+- name: tools
+- name: x-generic
+- name: multimedia-gstreamer-0.10
+contents:
 - name: icu
-  morph: strata/qt5-tools/icu.morph
   repo: upstream:icu
   ref: ba023548a3bff7277cbea4acade3042ce9d8949e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: ruby-1.8
-  morph: strata/qt5-tools/ruby-1.8.morph
   repo: upstream:ruby
   ref: 7a24f1710028d568ad61d0aa49d5178260178d77
   unpetrify-ref: baserock/morph/ruby_1_8_7
-  build-depends: []
 - name: ruby-1.9
-  morph: strata/qt5-tools/ruby-1.9.morph
   repo: upstream:ruby
   ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
   unpetrify-ref: baserock/morph/ruby_1_9_3
   build-depends:
   - ruby-1.8
 - name: qtbase
-  morph: strata/qt5-tools/qtbase.morph
   repo: upstream:qt5/qtbase
   ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
   unpetrify-ref: baserock/morph
   build-depends:
   - icu
 - name: qtsvg
-  morph: strata/qt5-tools/qtsvg.morph
   repo: upstream:qt5/qtsvg
   ref: 552bf3adcc48c669f9dfbda5818142fb18c9e957
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtjsbackend
-  morph: strata/qt5-tools/qtjsbackend.morph
   repo: upstream:qt5/qtjsbackend
   ref: c6978bf56f599a3da8c03b1a7e58102aa84223e7
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtscript
-  morph: strata/qt5-tools/qtscript.morph
   repo: upstream:qt5/qtscript
   ref: d20e99b3bdbcf77b69a92a2ba1b3ca1f1379e7c8
   unpetrify-ref: baserock/morph
@@ -55,7 +45,6 @@ chunks:
   - qtbase
   - qtjsbackend
 - name: qtdeclarative
-  morph: strata/qt5-tools/qtdeclarative.morph
   repo: upstream:qt5/qtdeclarative
   ref: 774d0310883a9526210c4530bbb9d0af26d88699
   unpetrify-ref: baserock/morph
@@ -64,7 +53,6 @@ chunks:
   - qtjsbackend
   - qtscript
 - name: qtquick1
-  morph: strata/qt5-tools/qtquick1.morph
   repo: upstream:qt5/qtquick1
   ref: b13755a2411dca01e65bb443a399ed130d5dd738
   unpetrify-ref: baserock/morph
@@ -73,7 +61,6 @@ chunks:
   - qtjsbackend
   - qtscript
 - name: qt3d
-  morph: strata/qt5-tools/qt3d.morph
   repo: upstream:qt5/qt3d
   ref: 805fbf45a54f1b69f4b13f6dc9f962b07c017d3b
   unpetrify-ref: baserock/morph
@@ -83,7 +70,6 @@ chunks:
   - qtscript
   - qtdeclarative
 - name: qtquickcontrols
-  morph: strata/qt5-tools/qtquickcontrols.morph
   repo: upstream:qt5/qtquickcontrols
   ref: acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb
   unpetrify-ref: baserock/morph
@@ -92,28 +78,24 @@ chunks:
   - qtjsbackend
   - qtdeclarative
 - name: qtsensors
-  morph: strata/qt5-tools/qtsensors.morph
   repo: upstream:qt5/qtsensors
   ref: cd22d77e07af6046be24d0322187a86c9a3c4d1d
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtserialport
-  morph: strata/qt5-tools/qtserialport.morph
   repo: upstream:qt5/qtserialport
   ref: b1abca2eee45e7b8ecf71cb5cd1e77a2821fcac2
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtx11extras
-  morph: strata/qt5-tools/qtx11extras.morph
   repo: upstream:qt5/qtx11extras
   ref: 3b33afd2814c88002e2efc4955e5b1851aff0c58
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtwebkit
-  morph: strata/qt5-tools/qtwebkit.morph
   repo: upstream:qt5/qtwebkit
   ref: 15a558c03ea7a35f97dfc0b16024d026d20920be
   unpetrify-ref: baserock/morph
@@ -124,7 +106,6 @@ chunks:
   - qtjsbackend
   - qtdeclarative
 - name: qtwebkit-examples
-  morph: strata/qt5-tools/qtwebkit-examples.morph
   repo: upstream:qt5/qtwebkit-examples
   ref: fdaa2bb5e47d6ca1d3e8c681f88eae0b9d4ae351
   unpetrify-ref: baserock/morph
@@ -134,28 +115,24 @@ chunks:
   - qtdeclarative
   - qtwebkit
 - name: qtmultimedia
-  morph: strata/qt5-tools/qtmultimedia.morph
   repo: upstream:qt5/qtmultimedia
   ref: 8b73d090f87f88ee3ae4efc437ac866d05df76be
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtxmlpatterns
-  morph: strata/qt5-tools/qtxmlpatterns.morph
   repo: upstream:qt5/qtxmlpatterns
   ref: ed713a904ee55f1c345d2d6c35e77892be96977e
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtdoc
-  morph: strata/qt5-tools/qtdoc.morph
   repo: upstream:qt5/qtdoc
   ref: 674abef4f06bdde57a272d69750e2a4ac5027ea9
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qtgraphicaleffects
-  morph: strata/qt5-tools/qtgraphicaleffects.morph
   repo: upstream:qt5/qtgraphicaleffects
   ref: e41d08f95d74d7309fc976cb62141b78239de975
   unpetrify-ref: baserock/morph
@@ -164,14 +141,12 @@ chunks:
   - qtjsbackend
   - qtdeclarative
 - name: qtimageformats
-  morph: strata/qt5-tools/qtimageformats.morph
   repo: upstream:qt5/qtimageformats
   ref: 3f7f6126d9832e03a4dcaaca5279220f00126e89
   unpetrify-ref: baserock/morph
   build-depends:
   - qtbase
 - name: qttools
-  morph: strata/qt5-tools/qttools.morph
   repo: upstream:qt5/qttools
   ref: 1369d91dd095cd4ea2febe759ef6446e41bd2d80
   unpetrify-ref: baserock/morph
@@ -181,7 +156,6 @@ chunks:
   - qtdeclarative
   - qtwebkit
 - name: qttranslations
-  morph: strata/qt5-tools/qttranslations.morph
   repo: upstream:qt5/qttranslations
   ref: e91af8e6363a4538f08992b6af51d17b91453080
   unpetrify-ref: baserock/morph
diff --git a/strata/qt5-tools/icu.morph b/strata/qt5-tools/icu.def
index 37dec07e..fc136fd2 100644
--- a/strata/qt5-tools/icu.morph
+++ b/strata/qt5-tools/icu.def
@@ -1,5 +1,4 @@
 name: icu
-kind: chunk
 configure-commands:
 - cd source; ./runConfigureICU Linux --prefix=/usr
 build-commands:
diff --git a/strata/qt5-tools/qt3d.morph b/strata/qt5-tools/qt3d.def
index d4e44d4e..73ad6c38 100644
--- a/strata/qt5-tools/qt3d.morph
+++ b/strata/qt5-tools/qt3d.def
@@ -1,5 +1,4 @@
 name: qt3d
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.def
index 1427c4c2..a313e529 100644
--- a/strata/qt5-tools/qtbase.morph
+++ b/strata/qt5-tools/qtbase.def
@@ -1,5 +1,4 @@
 name: qtbase
-kind: chunk
 configure-commands:
 - ./configure -v -prefix /usr -opensource -confirm-license
 build-commands:
diff --git a/strata/qt5-tools/qtdeclarative.morph b/strata/qt5-tools/qtdeclarative.def
index 9eb02331..4333bbd0 100644
--- a/strata/qt5-tools/qtdeclarative.morph
+++ b/strata/qt5-tools/qtdeclarative.def
@@ -1,5 +1,4 @@
 name: qtdeclarative
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtdoc.morph b/strata/qt5-tools/qtdoc.def
index 3b449382..78e4befe 100644
--- a/strata/qt5-tools/qtdoc.morph
+++ b/strata/qt5-tools/qtdoc.def
@@ -1,5 +1,4 @@
 name: qtdoc
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtgraphicaleffects.morph b/strata/qt5-tools/qtgraphicaleffects.def
index 27c42971..abeba83b 100644
--- a/strata/qt5-tools/qtgraphicaleffects.morph
+++ b/strata/qt5-tools/qtgraphicaleffects.def
@@ -1,5 +1,4 @@
 name: qtgraphicaleffects
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtimageformats.morph b/strata/qt5-tools/qtimageformats.def
index 08323ca1..73e101df 100644
--- a/strata/qt5-tools/qtimageformats.morph
+++ b/strata/qt5-tools/qtimageformats.def
@@ -1,5 +1,4 @@
 name: qtimageformats
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtjsbackend.morph b/strata/qt5-tools/qtjsbackend.def
index 5813084c..f49b3c21 100644
--- a/strata/qt5-tools/qtjsbackend.morph
+++ b/strata/qt5-tools/qtjsbackend.def
@@ -1,5 +1,4 @@
 name: qtjsbackend
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtmultimedia.morph b/strata/qt5-tools/qtmultimedia.def
index 537baa08..8000aed2 100644
--- a/strata/qt5-tools/qtmultimedia.morph
+++ b/strata/qt5-tools/qtmultimedia.def
@@ -1,5 +1,4 @@
 name: qtmultimedia
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtquick1.morph b/strata/qt5-tools/qtquick1.def
index d4692445..e58e3cf3 100644
--- a/strata/qt5-tools/qtquick1.morph
+++ b/strata/qt5-tools/qtquick1.def
@@ -1,5 +1,4 @@
 name: qtquick1
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtquickcontrols.morph b/strata/qt5-tools/qtquickcontrols.def
index 12051034..0f8b5d2b 100644
--- a/strata/qt5-tools/qtquickcontrols.morph
+++ b/strata/qt5-tools/qtquickcontrols.def
@@ -1,5 +1,4 @@
 name: qtquickcontrols
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtscript.morph b/strata/qt5-tools/qtscript.def
index 6f27842e..b9a83461 100644
--- a/strata/qt5-tools/qtscript.morph
+++ b/strata/qt5-tools/qtscript.def
@@ -1,5 +1,4 @@
 name: qtscript
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtsensors.morph b/strata/qt5-tools/qtsensors.def
index d4b4ec00..8fc9318c 100644
--- a/strata/qt5-tools/qtsensors.morph
+++ b/strata/qt5-tools/qtsensors.def
@@ -1,5 +1,4 @@
 name: qtsensors
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtserialport.morph b/strata/qt5-tools/qtserialport.def
index 0a623865..41cbeff0 100644
--- a/strata/qt5-tools/qtserialport.morph
+++ b/strata/qt5-tools/qtserialport.def
@@ -1,5 +1,4 @@
 name: qtserialport
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtsvg.morph b/strata/qt5-tools/qtsvg.def
index 40316a3c..7eaae454 100644
--- a/strata/qt5-tools/qtsvg.morph
+++ b/strata/qt5-tools/qtsvg.def
@@ -1,5 +1,4 @@
 name: qtsvg
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qttools.morph b/strata/qt5-tools/qttools.def
index 1baa10e7..681526ab 100644
--- a/strata/qt5-tools/qttools.morph
+++ b/strata/qt5-tools/qttools.def
@@ -1,5 +1,4 @@
 name: qttools
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qttranslations.morph b/strata/qt5-tools/qttranslations.def
index bfb61302..2913efad 100644
--- a/strata/qt5-tools/qttranslations.morph
+++ b/strata/qt5-tools/qttranslations.def
@@ -1,5 +1,4 @@
 name: qttranslations
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtwebkit-examples.morph b/strata/qt5-tools/qtwebkit-examples.def
index b6683e65..4190358e 100644
--- a/strata/qt5-tools/qtwebkit-examples.morph
+++ b/strata/qt5-tools/qtwebkit-examples.def
@@ -1,5 +1,4 @@
 name: qtwebkit-examples
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtwebkit.morph b/strata/qt5-tools/qtwebkit.def
index c9348aca..2f8cc98c 100644
--- a/strata/qt5-tools/qtwebkit.morph
+++ b/strata/qt5-tools/qtwebkit.def
@@ -1,5 +1,4 @@
 name: qtwebkit
-kind: chunk
 max-jobs: 1
 configure-commands:
 - QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro
diff --git a/strata/qt5-tools/qtx11extras.morph b/strata/qt5-tools/qtx11extras.def
index edea0acf..51266bd5 100644
--- a/strata/qt5-tools/qtx11extras.morph
+++ b/strata/qt5-tools/qtx11extras.def
@@ -1,5 +1,4 @@
 name: qtx11extras
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/qtxmlpatterns.morph b/strata/qt5-tools/qtxmlpatterns.def
index bdd32d5f..d60b27d7 100644
--- a/strata/qt5-tools/qtxmlpatterns.morph
+++ b/strata/qt5-tools/qtxmlpatterns.def
@@ -1,5 +1,4 @@
 name: qtxmlpatterns
-kind: chunk
 configure-commands:
 - qmake
 build-commands:
diff --git a/strata/qt5-tools/ruby-1.8.morph b/strata/qt5-tools/ruby-1.8.def
index cee282c0..9b36a794 100644
--- a/strata/qt5-tools/ruby-1.8.morph
+++ b/strata/qt5-tools/ruby-1.8.def
@@ -1,5 +1,4 @@
 name: ruby-1.8
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --program-suffix=-1.8
diff --git a/strata/qt5-tools/ruby-1.9.morph b/strata/qt5-tools/ruby-1.9.def
index bc697ada..3d54adab 100644
--- a/strata/qt5-tools/ruby-1.9.morph
+++ b/strata/qt5-tools/ruby-1.9.def
@@ -1,5 +1,4 @@
 name: ruby-1.9
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
diff --git a/strata/ruby.morph b/strata/ruby.def
index c5bd9993..21ff1c35 100644
--- a/strata/ruby.morph
+++ b/strata/ruby.def
@@ -1,5 +1,4 @@
 name: ruby
-kind: stratum
 description: |
   Ruby and common Ruby build dependencies.
 
@@ -8,21 +7,17 @@ description: |
   'hoe' and 'rake-compiler', are exceptions to that rule, and are kept
   in this stratum so they are always available when building other Gems.
 build-depends:
-- morph: strata/tools.morph
-chunks:
+- name: tools
+contents:
 - name: ruby-1.8
-  morph: strata/ruby/ruby-1.8.morph
   repo: upstream:ruby
   ref: 7a24f1710028d568ad61d0aa49d5178260178d77
   unpetrify-ref: baserock/morph/ruby_1_8_7
-  build-depends: []
 - name: libyaml
   repo: upstream:libyaml-hg
   ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
   unpetrify-ref: master
-  build-depends: []
 - name: ruby
-  morph: strata/ruby/ruby.morph
   repo: upstream:ruby
   ref: 05604af5a6da635b8bca51269db8b433972e82c0
   unpetrify-ref: baserock/ruby_2_0_0
@@ -30,21 +25,18 @@ chunks:
   - ruby-1.8
   - libyaml
 - name: bundler
-  morph: strata/ruby/bundler.morph
   repo: upstream:bundler
   ref: 0708fbe62617a63300e1cc3b9869cc1280c57ef6
   unpetrify-ref: baserock/v1.6.2
   build-depends:
   - ruby
 - name: hoe
-  morph: strata/ruby/hoe.morph
   repo: upstream:ruby-gems/hoe
   ref: 50a2706d0f70ece52922ddcc56630e1e0655b83e
   unpetrify-ref: master
   build-depends:
   - ruby
 - name: rake-compiler
-  morph: strata/ruby/rake-compiler.morph
   repo: upstream:ruby-gems/rake-compiler
   ref: aaed621f6fdb0b0395775fea5464cc83e794fbdb
   unpetrify-ref: v0.9.3
diff --git a/strata/ruby/bundler.morph b/strata/ruby/bundler.def
index 643ef119..1ed62520 100644
--- a/strata/ruby/bundler.morph
+++ b/strata/ruby/bundler.def
@@ -1,5 +1,4 @@
 name: bundler
-kind: chunk
 build-commands:
 - rake build
 install-commands:
diff --git a/strata/ruby/hoe.morph b/strata/ruby/hoe.def
index 0d06a82a..b0d17ae0 100644
--- a/strata/ruby/hoe.morph
+++ b/strata/ruby/hoe.def
@@ -1,5 +1,4 @@
 name: hoe
-kind: chunk
 description: |
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage, maintain, and release your project and includes a dynamic
diff --git a/strata/ruby/rake-compiler.morph b/strata/ruby/rake-compiler.def
index 9286f14a..46428b54 100644
--- a/strata/ruby/rake-compiler.morph
+++ b/strata/ruby/rake-compiler.def
@@ -1,5 +1,4 @@
 name: rake-compiler
-kind: chunk
 description: |
   Provide a standard and simplified way to build and package Ruby
   extensions (C, Java) using Rake as glue.
diff --git a/strata/ruby/ruby-1.8.morph b/strata/ruby/ruby-1.8.def
index cee282c0..9b36a794 100644
--- a/strata/ruby/ruby-1.8.morph
+++ b/strata/ruby/ruby-1.8.def
@@ -1,5 +1,4 @@
 name: ruby-1.8
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --program-suffix=-1.8
diff --git a/strata/ruby/ruby.morph b/strata/ruby/ruby.def
index c5d4afe1..13ab2d44 100644
--- a/strata/ruby/ruby.morph
+++ b/strata/ruby/ruby.def
@@ -1,5 +1,4 @@
 name: ruby
-kind: chunk
 configure-commands:
 - autoconf
 - ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
diff --git a/strata/tools.morph b/strata/tools.def
index a09c24f5..801e884c 100644
--- a/strata/tools.morph
+++ b/strata/tools.def
@@ -1,107 +1,78 @@
 name: tools
-kind: stratum
 description: Extra development tools included in the devel system
 build-depends:
-- morph: strata/foundation.morph
-chunks:
+- name: foundation
+contents:
 - name: distcc
-  morph: strata/tools/distcc.morph
   repo: upstream:distcc
   ref: c9691a9604fdf9d6711204999787d332b7141692
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: e2fsprogs
-  morph: strata/tools/e2fsprogs.morph
   repo: upstream:e2fsprogs
   ref: 6a3741ad293031447b95b88431eafa77401a8987
   unpetrify-ref: v1.42.12
-  build-depends: []
 - name: file
   repo: upstream:file
   ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: gdb
   repo: upstream:gdb
   ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: less
   repo: upstream:less
   ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: linux-user-chroot
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: lsof
-  morph: strata/tools/lsof.morph
   repo: upstream:lsof
   ref: fffb8558208586338587027c265fd0eca44466be
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pv
   repo: upstream:pv
   ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: rsync
-  morph: strata/tools/rsync.morph
   repo: upstream:rsync
   ref: 9faf8e0ccff2755cd019ff64d8322226a214b013
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: strace
   repo: upstream:strace
   ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: vala
-  morph: strata/tools/vala.morph
   repo: upstream:vala
   ref: 4e4a02c03445336237b36723b23a91670ef7621b
   unpetrify-ref: baserock/bootstrap
-  build-depends: []
 - name: vim
-  morph: strata/tools/vim.morph
   repo: upstream:vim
   ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: screen
-  morph: strata/tools/screen.morph
   repo: upstream:screen
   ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: u-boot
-  morph: strata/tools/u-boot.morph
   repo: upstream:u-boot
   ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: kexec-tools
-  morph: strata/tools/kexec-tools.morph
   repo: upstream:kexec-tools
   ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: device-tree-compiler
-  morph: strata/tools/device-tree-compiler.morph
   repo: upstream:device-tree-compiler
   ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: sudo
   repo: upstream:sudo
   ref: a4769dc7999b53260325fb89945bef85714fb338
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: procps-ng
   repo: upstream:procps-ng
   ref: 85fff468fa263cdd2ff1c0144579527c32333695
   unpetrify-ref: v3.3.9
-  build-depends: []
   prefix: /
diff --git a/strata/bsp-jetson/device-tree-compiler.morph b/strata/tools/device-tree-compiler.def
index 8abfafc8..c5e4bc6f 100644
--- a/strata/bsp-jetson/device-tree-compiler.morph
+++ b/strata/tools/device-tree-compiler.def
@@ -1,5 +1,4 @@
 name: device-tree-compiler
-kind: chunk
 build-commands:
 - make all
 install-commands:
diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.def
index 9f42b50e..f6084242 100644
--- a/strata/tools/distcc.morph
+++ b/strata/tools/distcc.def
@@ -1,5 +1,4 @@
 name: distcc
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.def
index 801f8abe..4704e329 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/tools/e2fsprogs.def
@@ -1,5 +1,4 @@
 name: e2fsprogs
-kind: chunk
 build-system: autotools
 configure-commands:
 # Configure with the usual paths for binaries and config
diff --git a/strata/tools/git-fat.morph b/strata/tools/git-fat.def
index c971b07f..2b6cabe6 100644
--- a/strata/tools/git-fat.morph
+++ b/strata/tools/git-fat.def
@@ -1,4 +1,3 @@
 name: git-fat
-kind: chunk
 install-commands:
 - install -D -m 755 git-fat "$DESTDIR/usr/bin/git-fat"
diff --git a/strata/tools/kexec-tools.morph b/strata/tools/kexec-tools.def
index 118c1ac2..8750272c 100644
--- a/strata/tools/kexec-tools.morph
+++ b/strata/tools/kexec-tools.def
@@ -1,5 +1,4 @@
 name: kexec-tools
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./bootstrap
diff --git a/strata/tools/lsof.morph b/strata/tools/lsof.def
index 5fabcd64..e0a44bf3 100644
--- a/strata/tools/lsof.morph
+++ b/strata/tools/lsof.def
@@ -1,5 +1,4 @@
 name: lsof
-kind: chunk
 configure-commands:
 - tar xf lsof_*_src.tar
 - cd lsof_*_src/ && ./Configure -n linux
diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.def
index 9a92878d..3b7e773c 100644
--- a/strata/tools/rsync.morph
+++ b/strata/tools/rsync.def
@@ -1,5 +1,4 @@
 name: rsync
-kind: chunk
 build-system: autotools
 build-commands:
 - make proto
diff --git a/strata/tools/screen.morph b/strata/tools/screen.def
index 0b23c5d4..39e3dc46 100644
--- a/strata/tools/screen.morph
+++ b/strata/tools/screen.def
@@ -1,5 +1,4 @@
 name: screen
-kind: chunk
 description: A terminal multiplexer and sanity tool for many
 max-jobs: 1
 configure-commands:
diff --git a/strata/bsp-wandboard/u-boot.morph b/strata/tools/u-boot.def
index 9be30bc7..3b6f5453 100644
--- a/strata/bsp-wandboard/u-boot.morph
+++ b/strata/tools/u-boot.def
@@ -1,5 +1,4 @@
 name: u-boot
-kind: chunk
 build-commands:
 - make tools
 install-commands:
diff --git a/strata/tools/vala.morph b/strata/tools/vala.def
index dcac5d49..bcafe779 100644
--- a/strata/tools/vala.morph
+++ b/strata/tools/vala.def
@@ -1,5 +1,4 @@
 name: vala
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/tools/vim.morph b/strata/tools/vim.def
index 58e1403f..b3836f0d 100644
--- a/strata/tools/vim.morph
+++ b/strata/tools/vim.def
@@ -1,5 +1,4 @@
 name: vim
-kind: chunk
 build-system: autotools
 configure-commands:
 - echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h
diff --git a/strata/trove.morph b/strata/trove.def
index 3b285372..1c7a0157 100644
--- a/strata/trove.morph
+++ b/strata/trove.def
@@ -1,33 +1,27 @@
 name: trove
-kind: stratum
 description: Trove software
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/morph-utils.morph
-- morph: strata/pcre-utils.morph
-chunks:
+- name: tools
+- name: morph-utils
+- name: pcre-utils
+contents:
 - name: lua
-  morph: strata/trove/lua.morph
   repo: upstream:lua
   ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
   unpetrify-ref: baserock/5.1-morph
-  build-depends: []
 - name: lace
-  morph: strata/trove/lace.morph
   repo: upstream:gitano/lace
   ref: d1b540b6d361d6a1f51e53cdaab69f053340efbb
   unpetrify-ref: baserock/morph
   build-depends:
   - lua
 - name: luxio
-  morph: strata/trove/luxio.morph
   repo: upstream:luxio
   ref: be9d125080b9ff2376273e21b75669b65dc88d46
   unpetrify-ref: baserock/morph
   build-depends:
   - lua
 - name: supple
-  morph: strata/trove/supple.morph
   repo: upstream:gitano/supple
   ref: 0963e5706d78d0ae7446ea91af986de1e196eb39
   unpetrify-ref: baserock/morph
@@ -35,14 +29,12 @@ chunks:
   - lua
   - luxio
 - name: clod
-  morph: strata/trove/clod.morph
   repo: upstream:gitano/clod
   ref: da15894f42f48d15db997c4355d6b672371a4163
   unpetrify-ref: baserock/morph
   build-depends:
   - lua
 - name: gall
-  morph: strata/trove/gall.morph
   repo: upstream:gitano/gall
   ref: f58c7526fbb0421d7f5446644f01f4cf57035ee2
   unpetrify-ref: baserock/morph
@@ -50,35 +42,29 @@ chunks:
   - lua
   - luxio
 - name: lrexlib-pcre
-  morph: strata/trove/lrexlib-pcre.morph
   repo: upstream:lrexlib
   ref: 0524a6e3ab6d50cba63c8642a875e246de53d651
   unpetrify-ref: baserock/morph
   build-depends:
   - lua
 - name: gitano
-  morph: strata/trove/gitano.morph
   repo: upstream:gitano/gitano
   ref: 4b8ce6875266fdd6609a217dcf2924d7d4815cc2
   unpetrify-ref: baserock/morph
   build-depends:
   - lua
 - name: cgit
-  morph: strata/trove/cgit.morph
   repo: upstream:cgit
   ref: acbf4a15e260c711094455dbef7c024f2553fd32
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: bzr-tarball
   repo: upstream:bzr-tarball
   ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: python-fastimport
   repo: upstream:python-fastimport
   ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: bzr-fastimport
   repo: upstream:bzr-fastimport
   ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
@@ -87,29 +73,23 @@ chunks:
   - bzr-tarball
   - python-fastimport
 - name: cvs-tarball
-  morph: strata/trove/cvs-tarball.morph
   repo: upstream:cvs-tarball
   ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libapr-tarball
   repo: upstream:libapr-tarball
   ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libapr-util-tarball
-  morph: strata/trove/libapr-util-tarball.morph
   repo: upstream:libapr-util-tarball
   ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
   unpetrify-ref: baserock/morph
   build-depends:
   - libapr-tarball
 - name: perl-dbi-tarball
-  morph: strata/trove/perl-dbi-tarball.morph
   repo: upstream:perl-dbi-tarball
   ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: perl-dbd-sqlite-tarball
   repo: upstream:perl-dbd-sqlite-tarball
   ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
@@ -124,19 +104,14 @@ chunks:
   - libapr-tarball
   - libapr-util-tarball
 - name: swig-tarball
-  morph: strata/trove/swig-tarball.morph
   repo: upstream:swig-tarball
   ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: neon
-  morph: strata/trove/neon.morph
   repo: upstream:neon
   ref: 837374e9d797e216f1de684595cefe791f67c0e4
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: subversion-tarball
-  morph: strata/trove/subversion-tarball.morph
   repo: upstream:subversion-tarball
   ref: 351e074672d9aa6446d5829938b697a3d6b23266
   unpetrify-ref: baserock/morph
@@ -147,26 +122,20 @@ chunks:
   - libserf-tarball
   - neon
 - name: mercurial-tarball
-  morph: strata/trove/mercurial-tarball.morph
   repo: upstream:mercurial-tarball
   ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: hg-fast-export
-  morph: strata/trove/hg-fast-export.morph
   repo: upstream:hg-fast-export
   ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
   unpetrify-ref: baserock/morph
   build-depends:
   - mercurial-tarball
 - name: cvsps
-  morph: strata/trove/cvsps.morph
   repo: upstream:cvsps
   ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: lorry
-  morph: strata/trove/lorry.morph
   repo: baserock:baserock/lorry
   ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
   unpetrify-ref: master
@@ -182,19 +151,14 @@ chunks:
   - mercurial-tarball
   - hg-fast-export
 - name: trove-setup
-  morph: strata/trove/trove-setup.morph
   repo: baserock:baserock/trove-setup
   ref: 5f2dab59ff6e70edf6ffbcd65fe64b487c4380c2
   unpetrify-ref: master
-  build-depends: []
 - name: lorry-controller
-  morph: strata/trove/lorry-controller.morph
   repo: baserock:baserock/lorry-controller
   ref: 689174532cc4920d2ef96bcebeb8a1adaf985804
   unpetrify-ref: master
-  build-depends: []
 - name: lua-scrypt
-  morph: strata/trove/lua-scrypt.morph
   repo: upstream:lua-scrypt
   ref: 0d7f74cd3eab7d54fbb13294194de7ea70ac34a5
   unpetrify-ref: baserock/morph
diff --git a/strata/trove/cgit.morph b/strata/trove/cgit.def
index bd373a51..fb39a079 100644
--- a/strata/trove/cgit.morph
+++ b/strata/trove/cgit.def
@@ -1,5 +1,4 @@
 name: cgit
-kind: chunk
 build-commands:
 - make prefix="$PREFIX"
 install-commands:
diff --git a/strata/trove/clod.morph b/strata/trove/clod.def
index e31ca4fb..bf9c70a3 100644
--- a/strata/trove/clod.morph
+++ b/strata/trove/clod.def
@@ -1,5 +1,4 @@
 name: clod
-kind: chunk
 description: Configuration Language Organised (by) Dots.
 build-commands:
 - make
diff --git a/strata/trove/cvs-tarball.morph b/strata/trove/cvs-tarball.def
index e8322017..b3fad379 100644
--- a/strata/trove/cvs-tarball.morph
+++ b/strata/trove/cvs-tarball.def
@@ -1,5 +1,4 @@
 name: cvs-tarball
-kind: chunk
 build-system: autotools
 configure-commands:
 - YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi
diff --git a/strata/trove/cvsps.morph b/strata/trove/cvsps.def
index ff53784e..69a66203 100644
--- a/strata/trove/cvsps.morph
+++ b/strata/trove/cvsps.def
@@ -1,5 +1,4 @@
 name: cvsps
-kind: chunk
 build-commands:
 - make
 install-commands:
diff --git a/strata/trove/gall.morph b/strata/trove/gall.def
index c1f2fd47..a3596740 100644
--- a/strata/trove/gall.morph
+++ b/strata/trove/gall.def
@@ -1,5 +1,4 @@
 name: gall
-kind: chunk
 description: Git Abstraction Layer for Lua
 build-commands:
 - make
diff --git a/strata/trove/gitano.morph b/strata/trove/gitano.def
index 962224d5..41177d08 100644
--- a/strata/trove/gitano.morph
+++ b/strata/trove/gitano.def
@@ -1,5 +1,4 @@
 name: gitano
-kind: chunk
 install-commands:
 - make install INST_ROOT="$PREFIX" DESTDIR="$DESTDIR"
 - cp scripts/htpasswd "$DESTDIR/$PREFIX/bin"
diff --git a/strata/trove/hg-fast-export.morph b/strata/trove/hg-fast-export.def
index ef99a97a..567357f4 100644
--- a/strata/trove/hg-fast-export.morph
+++ b/strata/trove/hg-fast-export.def
@@ -1,5 +1,4 @@
 name: hg-fast-export
-kind: chunk
 install-commands:
 - install -d "$DESTDIR/$PREFIX/bin"
 - install -m 0755 hg-fast-export.py "$DESTDIR/$PREFIX/bin/"
diff --git a/strata/trove/lace.morph b/strata/trove/lace.def
index 70752397..f87b5d37 100644
--- a/strata/trove/lace.morph
+++ b/strata/trove/lace.def
@@ -1,5 +1,4 @@
 name: lace
-kind: chunk
 description: Lua Access Control Engine.
 build-commands:
 - make
diff --git a/strata/trove/libapr-util-tarball.morph b/strata/trove/libapr-util-tarball.def
index e34e3610..0d909e90 100644
--- a/strata/trove/libapr-util-tarball.morph
+++ b/strata/trove/libapr-util-tarball.def
@@ -1,5 +1,4 @@
 name: libapr-util-tarball
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config
diff --git a/strata/trove/lorry-controller.morph b/strata/trove/lorry-controller.def
index 2f90a9a1..a059a5eb 100644
--- a/strata/trove/lorry-controller.morph
+++ b/strata/trove/lorry-controller.def
@@ -1,5 +1,4 @@
 name: lorry-controller
-kind: chunk
 build-system: python-distutils
 post-install-commands:
 - install -d 0755 "$DESTDIR/etc/lighttpd"
diff --git a/strata/trove/lorry.morph b/strata/trove/lorry.def
index 6b8cb355..58f90609 100644
--- a/strata/trove/lorry.morph
+++ b/strata/trove/lorry.def
@@ -1,3 +1,2 @@
 name: lorry
-kind: chunk
 build-system: python-distutils
diff --git a/strata/trove/lrexlib-pcre.morph b/strata/trove/lrexlib-pcre.def
index 63f3b034..e283e3ce 100644
--- a/strata/trove/lrexlib-pcre.morph
+++ b/strata/trove/lrexlib-pcre.def
@@ -1,5 +1,4 @@
 name: lrexlib-pcre
-kind: chunk
 description: Lua regular expression library - PCRE build only
 build-commands:
 - gcc -fPIC -DPIC -DVERSION=\"2.7.2\" -o rex_pcre.so -shared src/common.c src/pcre/lpcre.c
diff --git a/strata/trove/lua-scrypt.morph b/strata/trove/lua-scrypt.def
index 141b8ec3..9ae57a5b 100644
--- a/strata/trove/lua-scrypt.morph
+++ b/strata/trove/lua-scrypt.def
@@ -1,4 +1,3 @@
 name: lua-scrypt
-kind: chunk
 install-commands:
 - make lua-5.1-install DESTDIR="$DESTDIR"
diff --git a/strata/trove/lua.morph b/strata/trove/lua.def
index 32aeb5c1..b04c2b63 100644
--- a/strata/trove/lua.morph
+++ b/strata/trove/lua.def
@@ -1,5 +1,4 @@
 name: lua
-kind: chunk
 configure-commands:
 - sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
 - sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
diff --git a/strata/trove/luxio.morph b/strata/trove/luxio.def
index 29aabfaf..ababc39b 100644
--- a/strata/trove/luxio.morph
+++ b/strata/trove/luxio.def
@@ -1,5 +1,4 @@
 name: luxio
-kind: chunk
 description: Lua Unix IO (and related stuff).
 build-commands:
 - make lua-5.1
diff --git a/strata/trove/mercurial-tarball.morph b/strata/trove/mercurial-tarball.def
index 03264f56..f366b7f2 100644
--- a/strata/trove/mercurial-tarball.morph
+++ b/strata/trove/mercurial-tarball.def
@@ -1,5 +1,4 @@
 name: mercurial-tarball
-kind: chunk
 build-commands:
 - make build PREFIX="$PREFIX"
 install-commands:
diff --git a/strata/trove/neon.morph b/strata/trove/neon.def
index 19f8e83f..5faf65c3 100644
--- a/strata/trove/neon.morph
+++ b/strata/trove/neon.def
@@ -1,5 +1,4 @@
 name: neon
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
diff --git a/strata/trove/perl-dbi-tarball.morph b/strata/trove/perl-dbi-tarball.def
index 9eb3a537..f1a48a6b 100644
--- a/strata/trove/perl-dbi-tarball.morph
+++ b/strata/trove/perl-dbi-tarball.def
@@ -1,5 +1,4 @@
 name: perl-dbi-tarball
-kind: chunk
 build-system: cpan
 build-commands:
 - make -j1
diff --git a/strata/trove/subversion-tarball.morph b/strata/trove/subversion-tarball.def
index cb416d53..3441c784 100644
--- a/strata/trove/subversion-tarball.morph
+++ b/strata/trove/subversion-tarball.def
@@ -1,5 +1,4 @@
 name: subversion-tarball
-kind: chunk
 build-system: autotools
 configure-commands:
 - python gen-make.py build.conf
diff --git a/strata/trove/supple.morph b/strata/trove/supple.def
index 6470ba28..4fa5b089 100644
--- a/strata/trove/supple.morph
+++ b/strata/trove/supple.def
@@ -1,5 +1,4 @@
 name: supple
-kind: chunk
 description: Sandbox (for) Untrusted Procedure Partitioning (in) Lua Engine.
 build-commands:
 - make
diff --git a/strata/trove/swig-tarball.morph b/strata/trove/swig-tarball.def
index 61f154a4..feb7cfdb 100644
--- a/strata/trove/swig-tarball.morph
+++ b/strata/trove/swig-tarball.def
@@ -1,5 +1,4 @@
 name: swig-tarball
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-ccache
diff --git a/strata/trove/trove-setup.morph b/strata/trove/trove-setup.def
index 1f49760f..7caa3b6b 100644
--- a/strata/trove/trove-setup.morph
+++ b/strata/trove/trove-setup.def
@@ -1,4 +1,3 @@
 name: trove-setup
-kind: chunk
 install-commands:
 - make install DESTDIR="$DESTDIR"
diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.def
index 7ac14158..055bf8ed 100644
--- a/strata/virtualbox-guest-x86_64.morph
+++ b/strata/virtualbox-guest-x86_64.def
@@ -1,21 +1,17 @@
 name: virtualbox-guest-x86_64
-kind: stratum
 description: |
   VirtualBox Guest Additions for x86_64
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/bsp-x86_64-generic.morph
-- morph: strata/x-common.morph
-- morph: strata/x-generic.morph
-chunks:
+- name: tools
+- name: bsp-x86_64-generic
+- name: x-common
+- name: x-generic
+contents:
 - name: yasm
-  morph: strata/virtualbox-guest-x86_64/yasm.morph
   repo: upstream:yasm
   ref: fefefe262eb29081f0bcb4d48f2d476ce5730562
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: vboxguest
-  morph: strata/virtualbox-guest-x86_64/vboxguest.morph
   repo: upstream:VirtualBox
   ref: 617aeb5a3c13f4a46423e8c2fb560449403ad56d
   unpetrify-ref: baserock/morph
diff --git a/strata/virtualbox-guest-x86_64/vboxguest.morph b/strata/virtualbox-guest-x86_64/vboxguest.def
index f31c9944..9311b634 100644
--- a/strata/virtualbox-guest-x86_64/vboxguest.morph
+++ b/strata/virtualbox-guest-x86_64/vboxguest.def
@@ -1,5 +1,4 @@
 name: vboxguest
-kind: chunk
 description: |
   VirtualBox guest additions
 max-jobs: 1
diff --git a/strata/virtualbox-guest-x86_64/yasm.morph b/strata/virtualbox-guest-x86_64/yasm.def
index 437ae97d..c6e561d4 100644
--- a/strata/virtualbox-guest-x86_64/yasm.morph
+++ b/strata/virtualbox-guest-x86_64/yasm.def
@@ -1,4 +1,3 @@
 name: yasm
-kind: chunk
 max-jobs: 1
 build-system: autotools
diff --git a/strata/virtualization.morph b/strata/virtualization.def
index e3261f84..4be68ae8 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.def
@@ -1,45 +1,34 @@
 name: virtualization
-kind: stratum
 description: virtualization for baserock
 build-depends:
-- morph: strata/connman-common.morph
-chunks:
+- name: connman-common
+contents:
 - name: yajl
-  morph: strata/virtualization/yajl.morph
   repo: upstream:yajl
   ref: 52fc681857228c65c1cb439782da485554875481
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xml-catalog
-  morph: strata/virtualization/xml-catalog.morph
   repo: baserock:baserock/xml-catalog
   ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
   unpetrify-ref: master
-  build-depends: []
 - name: lvm2
-  morph: strata/virtualization/lvm2.morph
   repo: upstream:lvm2
   ref: 8c5b90b50bdf9f1a7ae1d3c4cf58ce4b0d7c2768
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: dnsmasq
-  morph: strata/virtualization/dnsmasq.morph
   repo: upstream:dnsmasq
   ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954
   unpetrify-ref: baserock/morph
   build-depends:
   - lvm2
 - name: qemu
-  morph: strata/virtualization/qemu.morph
   repo: upstream:qemu
   ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-util-macros
   repo: upstream:xorg-util-macros
   ref: c98b41de5596c675c603ef43ae9570133f1a9921
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libpciaccess
   repo: upstream:libpciaccess
   ref: b9c068896914b4132a24839c9ef7f9fcd6282d88
@@ -47,7 +36,6 @@ chunks:
   build-depends:
   - xorg-util-macros
 - name: libvirt
-  morph: strata/virtualization/libvirt.morph
   repo: upstream:libvirt
   ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
   unpetrify-ref: baserock/morph
@@ -61,7 +49,6 @@ chunks:
   repo: upstream:pycurl
   ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: urlgrabber
   repo: upstream:urlgrabber
   ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04
@@ -72,7 +59,6 @@ chunks:
   repo: upstream:cython
   ref: 005d38d5921a603d5f4d413aae72f98a6d33192f
   unpetrify-ref: master
-  build-depends: []
 - name: python-lxml
   repo: upstream:python-lxml
   ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92
@@ -91,23 +77,19 @@ chunks:
   repo: upstream:gnome-common
   ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8
   unpetrify-ref: 3.7.4
-  build-depends: []
 - name: pygobject
-  morph: strata/virtualization/pygobject.morph
   repo: upstream:pygobject
   ref: 276341d7ddab180020c31e6837bd28fd25784de0
   unpetrify-ref: baserock/morph
   build-depends:
   - gnome-common
 - name: libsoup
-  morph: strata/virtualization/libsoup.morph
   repo: upstream:libsoup
   ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
   unpetrify-ref: baserock/morph
   build-depends:
   - gnome-common
 - name: libosinfo
-  morph: strata/virtualization/libosinfo.morph
   repo: upstream:libosinfo
   ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12
   unpetrify-ref: baserock/morph
diff --git a/strata/virtualization/dnsmasq.morph b/strata/virtualization/dnsmasq.def
index 4db0bf09..dce1d1cb 100644
--- a/strata/virtualization/dnsmasq.morph
+++ b/strata/virtualization/dnsmasq.def
@@ -1,5 +1,4 @@
 name: dnsmasq
-kind: chunk
 build-system: autotools
 configure-commands: []
 install-commands:
diff --git a/strata/virtualization/libosinfo.morph b/strata/virtualization/libosinfo.def
index d5679965..f5eaf6ce 100644
--- a/strata/virtualization/libosinfo.morph
+++ b/strata/virtualization/libosinfo.def
@@ -1,5 +1,4 @@
 name: libosinfo
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc --disable-tests --disable-vala
diff --git a/strata/virtualization/libsoup.morph b/strata/virtualization/libsoup.def
index 0a5ebef6..e561905f 100644
--- a/strata/virtualization/libsoup.morph
+++ b/strata/virtualization/libsoup.def
@@ -1,5 +1,4 @@
 name: libsoup
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.def
index 63b5d768..ae6316d6 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.def
@@ -1,5 +1,4 @@
 name: libvirt
-kind: chunk
 build-system: autotools
 configure-commands:
 - |
diff --git a/strata/virtualization/lvm2.morph b/strata/virtualization/lvm2.def
index 49c166dc..9b4e1439 100644
--- a/strata/virtualization/lvm2.morph
+++ b/strata/virtualization/lvm2.def
@@ -1,5 +1,4 @@
 name: lvm2
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --enable-applib --enable-cmdlib --enable-pkgconfig
diff --git a/strata/virtualization/pygobject.morph b/strata/virtualization/pygobject.def
index a423537e..72f17fc2 100644
--- a/strata/virtualization/pygobject.morph
+++ b/strata/virtualization/pygobject.def
@@ -1,5 +1,4 @@
 name: pygobject
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --disable-cairo
diff --git a/strata/virtualization/qemu.morph b/strata/virtualization/qemu.def
index 17ffbeb6..76c4f543 100644
--- a/strata/virtualization/qemu.morph
+++ b/strata/virtualization/qemu.def
@@ -1,5 +1,4 @@
 name: qemu
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/virtualization/xml-catalog.morph b/strata/virtualization/xml-catalog.def
index 34ba0306..9af491b1 100644
--- a/strata/virtualization/xml-catalog.morph
+++ b/strata/virtualization/xml-catalog.def
@@ -1,5 +1,4 @@
 name: xml-catalog
-kind: chunk
 install-commands:
 - make DESTDIR="$DESTDIR" install
 post-install-commands:
diff --git a/strata/virtualization/yajl.morph b/strata/virtualization/yajl.def
index 3fac99db..605ac9df 100644
--- a/strata/virtualization/yajl.morph
+++ b/strata/virtualization/yajl.def
@@ -1,5 +1,4 @@
 name: yajl
-kind: chunk
 configure-commands:
 - ./configure -p "$PREFIX"
 build-commands:
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.def
index 628ff2ad..f7314a7f 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.def
@@ -1,16 +1,13 @@
 name: wayland-generic
-kind: stratum
 build-depends:
-- morph: strata/foundation.morph
-- morph: strata/xorg-util-macros-common.morph
-chunks:
+- name: foundation
+- name: xorg-util-macros-common
+contents:
 - name: libxkbcommon
   repo: upstream:xorg-lib-libxkbcommon
   ref: b721254769212d671a4729f1c88b059979b80efc
   unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
 - name: wayland
-  morph: strata/wayland-generic/wayland.morph
   repo: upstream:wayland
   ref: 339e83aa579569711cd14623ca4b2db46256b766
   unpetrify-ref: 1.6.0
diff --git a/strata/wayland-generic/wayland.morph b/strata/wayland-generic/wayland.def
index 752a5d6e..63850992 100644
--- a/strata/wayland-generic/wayland.morph
+++ b/strata/wayland-generic/wayland.def
@@ -1,5 +1,4 @@
 name: wayland
-kind: chunk
 description: Wayland server
 build-system: autotools
 configure-commands:
diff --git a/strata/webtools.morph b/strata/webtools.def
index fd893ae6..b376a9bf 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.def
@@ -1,35 +1,26 @@
 name: webtools
-kind: stratum
 description: pip, node and other fun things
 build-depends:
-- morph: strata/tools.morph
-- morph: strata/pcre-utils.morph
-chunks:
+- name: tools
+- name: pcre-utils
+contents:
 - name: icu
-  morph: strata/webtools/icu.morph
   repo: upstream:icu
   ref: ba023548a3bff7277cbea4acade3042ce9d8949e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libgit2
   repo: upstream:libgit2
   ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
   unpetrify-ref: master
-  build-depends: []
 - name: tar
-  morph: strata/webtools/tar.morph
   repo: upstream:tar
   ref: 0492b656656ca7973b126b8c117804d80952de48
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pip
   repo: upstream:pip.git
   ref: d4b691b743a91500cf49119d28a805db8313f129
   unpetrify-ref: master
-  build-depends: []
 - name: nginx
-  morph: strata/webtools/nginx.morph
   repo: upstream:nginx
   ref: 37a582c9ea3e731c115e560d31b26f78535b8fca
   unpetrify-ref: baserock/v1.7.0
-  build-depends: []
diff --git a/strata/webtools/icu.morph b/strata/webtools/icu.def
index 37dec07e..fc136fd2 100644
--- a/strata/webtools/icu.morph
+++ b/strata/webtools/icu.def
@@ -1,5 +1,4 @@
 name: icu
-kind: chunk
 configure-commands:
 - cd source; ./runConfigureICU Linux --prefix=/usr
 build-commands:
diff --git a/strata/webtools/nginx.morph b/strata/webtools/nginx.def
index 08949ec9..680d275f 100644
--- a/strata/webtools/nginx.morph
+++ b/strata/webtools/nginx.def
@@ -1,5 +1,4 @@
 name: nginx
-kind: chunk
 configure-commands:
 - |
   ./configure --prefix=$PREFIX \
diff --git a/strata/webtools/tar.morph b/strata/webtools/tar.def
index 2253e3b7..c7e7693d 100644
--- a/strata/webtools/tar.morph
+++ b/strata/webtools/tar.def
@@ -1,5 +1,4 @@
 name: tar
-kind: chunk
 configure-commands:
 - bash bootstrap --skip-po
 - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.def
index d47d0ac4..14780c9a 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.def
@@ -1,26 +1,22 @@
 name: weston-genivi
-kind: stratum
 build-depends:
-- morph: strata/graphics-common.morph
-- morph: strata/input-common.morph
-- morph: strata/mesa-common.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/wayland-generic.morph
-chunks:
+- name: graphics-common
+- name: input-common
+- name: mesa-common
+- name: libdrm-common
+- name: wayland-generic
+contents:
 - name: linux-pam
   repo: upstream:linux-pam
   ref: b1521c97e73b10469f7b34c0571d51c647eca83c
   unpetrify-ref: Linux-PAM-1.1.8
-  build-depends: []
 - name: weston
-  morph: strata/weston-genivi/weston.morph
   repo: upstream:weston
   ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6
   unpetrify-ref: baserock/genivi/1.3.0
   build-depends:
   - linux-pam
 - name: wayland-ivi-extension
-  morph: strata/weston-genivi/wayland-ivi-extension.morph
   repo: upstream:genivi/wayland-ivi-extension
   ref: 43fa65ede93cef9e6c902df2248229ad204b510a
   unpetrify-ref: master
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.def
index bceb2a88..1dcbc31a 100644
--- a/strata/weston-genivi/wayland-ivi-extension.morph
+++ b/strata/weston-genivi/wayland-ivi-extension.def
@@ -1,5 +1,4 @@
 name: wayland-ivi-extension
-kind: chunk
 configure-commands:
 - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston"
 build-commands:
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.def
index 810ce5e9..f5a3de00 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.def
@@ -1,5 +1,4 @@
 name: weston
-kind: chunk
 description: weston compositor
 build-system: autotools
 configure-commands:
diff --git a/strata/x-common.morph b/strata/x-common.def
index f842c7a9..3aeb0025 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.def
@@ -1,141 +1,113 @@
 name: x-common
-kind: stratum
 build-depends:
-- morph: strata/xorg-util-macros-common.morph
-chunks:
+- name: xorg-util-macros-common
+contents:
 - name: xorg-proto-bigreqsproto
   repo: upstream:xorg-proto-bigreqsproto
   ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-compositeproto
   repo: upstream:xorg-proto-compositeproto
   ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-damageproto
   repo: upstream:xorg-proto-damageproto
   ref: 015b980e5091492dbe681af59569768ba89fbfe0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-dmxproto
   repo: upstream:xorg-proto-dmxproto
   ref: 395f6fcc0a5635907b5e45829e86b29431316184
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-fixesproto
   repo: upstream:xorg-proto-fixesproto
   ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-fontsproto
   repo: upstream:xorg-proto-fontsproto
   ref: 81e4d4ec53f1f3848ff269fe476c3a1d35d93aef
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-glproto
   repo: upstream:xorg-proto-glproto
   ref: 8e3407e02980d088e20041e79bdcdd3737e7827e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-inputproto
   repo: upstream:xorg-proto-inputproto
   ref: f8428123019e7357891bbfc0aef21dbb4d0db10f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-kbproto
   repo: upstream:xorg-proto-kbproto
   ref: f7022f5775350dce3348b7151845a32390e98791
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xineramaproto
   repo: upstream:xorg-proto-xineramaproto
   ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-randrproto
   repo: upstream:xorg-proto-randrproto
   ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-recordproto
   repo: upstream:xorg-proto-recordproto
   ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-renderproto
   repo: upstream:xorg-proto-renderproto
   ref: 935f5ec95a3718c184ff685f5b79b467483b7844
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-resourceproto
   repo: upstream:xorg-proto-resourceproto
   ref: ada91f54c98b5a61d3e116fca6bf239a8604730f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-scrnsaverproto
   repo: upstream:xorg-proto-scrnsaverproto
   ref: 614532026e8ec7496216316fb584d6f2af6a7f7b
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-videoproto
   repo: upstream:xorg-proto-videoproto
   ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xcmiscproto
   repo: upstream:xorg-proto-xcmiscproto
   ref: 83549077a3c2140b9862709004cd873f1c55e395
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xextproto
   repo: upstream:xorg-proto-xextproto
   ref: f27fcc99d1cf935cc289933326f7d3baacd5107a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xf86bigfontproto
   repo: upstream:xorg-proto-xf86bigfontproto
   ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xf86dgaproto
   repo: upstream:xorg-proto-xf86dgaproto
   ref: c52b205c3175309be7952774668c87dd2d5ce30e
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xf86driproto
   repo: upstream:xorg-proto-xf86driproto
   ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xf86vidmodeproto
   repo: upstream:xorg-proto-xf86vidmodeproto
   ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-x11proto
   repo: upstream:xorg-proto-x11proto
   ref: f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-dri2proto
   repo: upstream:xorg-proto-dri2proto
   ref: ead89ad84877551cc15d26b95cb19a3e205df71f
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-dri3proto
   repo: upstream:xorg-proto-dri3proto
   ref: 91df0f88b70c268f3580385a7b37543ab8c544c8
-  build-depends: []
 - name: xorg-proto-presentproto
   repo: upstream:xorg-proto-presentproto
   ref: ef84007fc4a23d3897b4776906139de9d0698c2a
-  build-depends: []
 - name: xcb-proto
   repo: upstream:xcb-proto
   ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640
   unpetrify-ref: "1.11"
-  build-depends: []
 - name: xorg-lib-libxshmfence
   repo: upstream:xorg-lib-libxshmfence
   ref: 9c4f070e1304a3503cfab08f68573443025fc4c9
@@ -158,7 +130,6 @@ chunks:
   repo: upstream:xorg-lib-libxtrans
   ref: bd53f4c8543faf910a7a151241ee07661b4d57ad
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libX11
   repo: upstream:xorg-lib-libX11
   ref: cb107760df33ffc8630677e66e2e50aa37950a5c
@@ -291,7 +262,6 @@ chunks:
   repo: upstream:xorg-proto-printproto
   ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libXp
   repo: upstream:xorg-lib-libXp
   ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
diff --git a/strata/x-common/drm.def b/strata/x-common/drm.def
new file mode 100644
index 00000000..f5775726
--- /dev/null
+++ b/strata/x-common/drm.def
@@ -0,0 +1,9 @@
+name: drm
+build-system: autotools
+configure-commands:
+  - NOCONFIGURE=1 ./autogen.sh
+  - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api
+install-commands:
+  - make install DESTDIR="$DESTDIR"
+  - mkdir -p "$DESTDIR"/usr/lib/pkgconfig
+  - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig
diff --git a/strata/x-common/llvm.def b/strata/x-common/llvm.def
new file mode 100644
index 00000000..714908d2
--- /dev/null
+++ b/strata/x-common/llvm.def
@@ -0,0 +1,7 @@
+name: llvm
+description: Low Level Virtual Machine
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/llvm --sysconfdir=/etc --enable-shared
+  --enable-libffi --enable-targets=all --disable-expensive-checks --disable-debug-runtime
+  --disable-assertions --enable-optimized
diff --git a/strata/x-generic.morph b/strata/x-generic.def
index af42c55e..9f6f22a3 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.def
@@ -1,21 +1,18 @@
 name: x-generic
-kind: stratum
 build-depends:
-- morph: strata/foundation.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/x-common.morph
-- morph: strata/graphics-common.morph
-chunks:
+- name: foundation
+- name: libdrm-common
+- name: x-common
+- name: graphics-common
+contents:
 - name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
   ref: 7381c2f9013ef7784c78091fa671e652a62ca706
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-font-util
   repo: upstream:xorg-font-util
   ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
   ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
@@ -32,7 +29,6 @@ chunks:
   repo: upstream:xorg-lib-libICE
   ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libSM
   repo: upstream:xorg-lib-libSM
   ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
@@ -69,9 +65,7 @@ chunks:
   repo: upstream:libsha1
   ref: 17173732b9f1b2d4142de27913250b4563db2436
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xserver
-  morph: strata/x-generic/xserver.morph
   repo: upstream:xserver
   ref: b7cbfa882778cf8857577e0da77aa9295f072db3
   unpetrify-ref: baserock/morph
@@ -137,28 +131,22 @@ chunks:
   repo: upstream:xorg-app-xinit
   ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libXft
   repo: upstream:xorg-lib-libXft
   ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
   unpetrify-ref: libXft-2.3.2
-  build-depends: []
 - name: xcb-util
   repo: upstream:xcb-util
   ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: util-wm
   repo: upstream:util-wm
   ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: util-keysyms
-  morph: strata/x-generic/util-keysyms.morph
   repo: upstream:util-keysyms
   ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: util-image
   repo: upstream:util-image
   ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
diff --git a/strata/x-generic/util-keysyms.morph b/strata/x-generic/util-keysyms.def
index ddae3707..bfe4dee1 100644
--- a/strata/x-generic/util-keysyms.morph
+++ b/strata/x-generic/util-keysyms.def
@@ -1,5 +1,4 @@
 name: util-keysyms
-kind: chunk
 configure-commands:
 - git submodule update --init
 - ./autogen.sh --prefix=/usr
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.def
index 473f5d32..ff5b6499 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.def
@@ -1,5 +1,4 @@
 name: xserver
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1
diff --git a/strata/xfce.morph b/strata/xfce.def
index 5678c1fc..911fff2c 100644
--- a/strata/xfce.morph
+++ b/strata/xfce.def
@@ -1,35 +1,28 @@
 name: xfce
-kind: stratum
 description: xfce stratum
 build-depends:
-- morph: strata/gtk2.morph
-- morph: strata/x-generic.morph
-chunks:
+- name: gtk2
+- name: x-generic
+contents:
 - name: libcroco
   repo: upstream:libcroco
   ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: librsvg
-  morph: strata/xfce/librsvg.morph
   repo: upstream:librsvg
   ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xfce-dev-tools
   repo: upstream:xfce/xfce4-dev-tools
   ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libxfce4util
-  morph: strata/xfce/libxfce4util.morph
   repo: upstream:xfce/libxfce4util
   ref: fc0437fe503c3eaa5ccd4fa68f098bc428f27cad
   unpetrify-ref: baserock/morph
   build-depends:
   - xfce-dev-tools
 - name: xfconf
-  morph: strata/xfce/xfconf.morph
   repo: upstream:xfce/xfconf
   ref: ed6ed2f7656a0d5d8cb453cb643061c9a157f2ae
   unpetrify-ref: baserock/morph
@@ -37,7 +30,6 @@ chunks:
   - xfce-dev-tools
   - libxfce4util
 - name: libxfce4ui
-  morph: strata/xfce/libxfce4ui.morph
   repo: upstream:xfce/libxfce4ui
   ref: a9c2a379709915dfda255d3ca9181fac3f8484d8
   unpetrify-ref: baserock/morph
@@ -46,7 +38,6 @@ chunks:
   - libxfce4util
   - xfconf
 - name: garcon
-  morph: strata/xfce/garcon.morph
   repo: upstream:xfce/garcon
   ref: febd4136365714556f6afbccf4302e8f4550e5d1
   unpetrify-ref: baserock/morph
@@ -56,9 +47,7 @@ chunks:
   repo: upstream:libwww-perl/uri
   ref: 3dd72ded7f043a4f6973781fe594722e2e95f491
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: exo
-  morph: strata/xfce/exo.morph
   repo: upstream:xfce/exo
   ref: b985c4b5c72ef116d55bbf746c16a05f26afc045
   unpetrify-ref: baserock/morph
@@ -67,13 +56,10 @@ chunks:
   - libxfce4ui
   - perl-uri
 - name: libwnck
-  morph: strata/xfce/libwnck.morph
   repo: upstream:libwnck
   ref: 6792abcdf27aceba1012406d51606e84b065a526
   unpetrify-ref: baserock/xfce-build
-  build-depends: []
 - name: xfce4-panel
-  morph: strata/xfce/xfce4-panel.morph
   repo: upstream:xfce/xfce4-panel
   ref: 6ac8bfcb481781e8e23b101f5c5fdd70cf6d083b
   unpetrify-ref: baserock/morph
@@ -83,7 +69,6 @@ chunks:
   - exo
   - libwnck
 - name: thunar
-  morph: strata/xfce/thunar.morph
   repo: upstream:xfce/thunar
   ref: 8289f48c200b91cc1e9932e13defb8e6a4765054
   unpetrify-ref: baserock/morph
@@ -93,7 +78,6 @@ chunks:
   - garcon
   - libwnck
 - name: xfce4-settings
-  morph: strata/xfce/xfce4-settings.morph
   repo: upstream:xfce/xfce4-settings
   ref: 697ce5cd4bf4860a0a20c27b557be296c9adf469
   unpetrify-ref: baserock/morph
@@ -107,9 +91,7 @@ chunks:
   repo: upstream:iceauth
   ref: c07d443d43e53cfe21b53a9a0eafcd6189432867
   unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xfce4-session
-  morph: strata/xfce/xfce4-session.morph
   repo: upstream:xfce/xfce4-session
   ref: 2c89b2f12409ca617fc094e2942cb0d69318c7b5
   unpetrify-ref: baserock/morph
@@ -120,14 +102,12 @@ chunks:
   - libxfce4ui
   - libwnck
 - name: gtk-xfce-engine-2
-  morph: strata/xfce/gtk-xfce-engine-2.morph
   repo: upstream:xfce/gtk-xfce-engine
   ref: ed44a71f1a4d76ae850483ece41638bb9a3e7781
   unpetrify-ref: baserock/morph
   build-depends:
   - xfce-dev-tools
 - name: xfdesktop
-  morph: strata/xfce/xfdesktop.morph
   repo: upstream:xfce/xfdesktop
   ref: d2f7404da32f29cfec4a704389112fe7183edda5
   unpetrify-ref: baserock/morph
@@ -137,7 +117,6 @@ chunks:
   - xfconf
   - libwnck
 - name: xfwm4
-  morph: strata/xfce/xfwm4.morph
   repo: upstream:xfce/xfwm4
   ref: 523ef8a6861af772be3468cd700ad14172c86768
   unpetrify-ref: baserock/morph
@@ -148,7 +127,6 @@ chunks:
   - xfconf
   - libwnck
 - name: xfce4-appfinder
-  morph: strata/xfce/xfce4-appfinder.morph
   repo: upstream:xfce/xfce4-appfinder
   ref: 5c069f13fde648913a59f022957b2c83b5764f39
   unpetrify-ref: baserock/morph
@@ -157,15 +135,12 @@ chunks:
   - libxfce4ui
   - garcon
 - name: tumbler
-  morph: strata/xfce/tumbler.morph
   repo: upstream:xfce/tumbler
   ref: f8191f286227a045fbdabd7684c9da81ade518c8
   unpetrify-ref: baserock/morph
   build-depends:
   - xfce-dev-tools
 - name: elementary-xfce
-  morph: strata/xfce/elementary-xfce.morph
   repo: upstream:elementary-xfce
   ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779
   unpetrify-ref: baserock/morph
-  build-depends: []
diff --git a/strata/xfce/elementary-xfce.morph b/strata/xfce/elementary-xfce.def
index 978cfdc4..52ad7962 100644
--- a/strata/xfce/elementary-xfce.morph
+++ b/strata/xfce/elementary-xfce.def
@@ -1,5 +1,4 @@
 name: elementary-xfce
-kind: chunk
 install-commands:
 - mkdir -p $DESTDIR/usr/share/icons/
 - cp -R elementary-xfce $DESTDIR/usr/share/icons/
diff --git a/strata/xfce/exo.morph b/strata/xfce/exo.def
index f5096213..433a075b 100644
--- a/strata/xfce/exo.morph
+++ b/strata/xfce/exo.def
@@ -1,5 +1,4 @@
 name: exo
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/garcon.morph b/strata/xfce/garcon.def
index 569197ff..709338c4 100644
--- a/strata/xfce/garcon.morph
+++ b/strata/xfce/garcon.def
@@ -1,5 +1,4 @@
 name: garcon
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/gtk-xfce-engine-2.morph b/strata/xfce/gtk-xfce-engine-2.def
index cf1c2530..a0d12c32 100644
--- a/strata/xfce/gtk-xfce-engine-2.morph
+++ b/strata/xfce/gtk-xfce-engine-2.def
@@ -1,5 +1,4 @@
 name: gtk-xfce-engine-2
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/librsvg.morph b/strata/xfce/librsvg.def
index f4d880ed..82cb4399 100644
--- a/strata/xfce/librsvg.morph
+++ b/strata/xfce/librsvg.def
@@ -1,5 +1,4 @@
 name: librsvg
-kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
diff --git a/strata/xfce/libwnck.morph b/strata/xfce/libwnck.def
index bb8d7afa..aa965504 100644
--- a/strata/xfce/libwnck.morph
+++ b/strata/xfce/libwnck.def
@@ -1,5 +1,4 @@
 name: libwnck
-kind: chunk
 build-system: autotools
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
diff --git a/strata/xfce/libxfce4ui.morph b/strata/xfce/libxfce4ui.def
index 5fbd342e..f73055d7 100644
--- a/strata/xfce/libxfce4ui.morph
+++ b/strata/xfce/libxfce4ui.def
@@ -1,5 +1,4 @@
 name: libxfce4ui
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=${PREFIX}
 build-commands:
diff --git a/strata/xfce/libxfce4util.morph b/strata/xfce/libxfce4util.def
index 60a59126..2c43c1f3 100644
--- a/strata/xfce/libxfce4util.morph
+++ b/strata/xfce/libxfce4util.def
@@ -1,5 +1,4 @@
 name: libxfce4util
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/thunar.morph b/strata/xfce/thunar.def
index 51f76ac5..65508220 100644
--- a/strata/xfce/thunar.morph
+++ b/strata/xfce/thunar.def
@@ -1,5 +1,4 @@
 name: thunar
-kind: chunk
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
diff --git a/strata/xfce/tumbler.morph b/strata/xfce/tumbler.def
index fe27a783..6e14d136 100644
--- a/strata/xfce/tumbler.morph
+++ b/strata/xfce/tumbler.def
@@ -1,5 +1,4 @@
 name: tumbler
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/xfce4-appfinder.morph b/strata/xfce/xfce4-appfinder.def
index f8d1fcbe..b05629af 100644
--- a/strata/xfce/xfce4-appfinder.morph
+++ b/strata/xfce/xfce4-appfinder.def
@@ -1,5 +1,4 @@
 name: xfce4-appfinder
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=${PREFIX}
 build-commands:
diff --git a/strata/xfce/xfce4-panel.morph b/strata/xfce/xfce4-panel.def
index fe85e172..3f567833 100644
--- a/strata/xfce/xfce4-panel.morph
+++ b/strata/xfce/xfce4-panel.def
@@ -1,5 +1,4 @@
 name: xfce4-panel
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/xfce4-session.morph b/strata/xfce/xfce4-session.def
index 87ffac22..ba9983af 100644
--- a/strata/xfce/xfce4-session.morph
+++ b/strata/xfce/xfce4-session.def
@@ -1,5 +1,4 @@
 name: xfce4-session
-kind: chunk
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
diff --git a/strata/xfce/xfce4-settings.morph b/strata/xfce/xfce4-settings.def
index 6063dbc1..abec9332 100644
--- a/strata/xfce/xfce4-settings.morph
+++ b/strata/xfce/xfce4-settings.def
@@ -1,5 +1,4 @@
 name: xfce4-settings
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/xfconf.morph b/strata/xfce/xfconf.def
index cfbe741b..405a286b 100644
--- a/strata/xfce/xfconf.morph
+++ b/strata/xfce/xfconf.def
@@ -1,5 +1,4 @@
 name: xfconf
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix=${PREFIX}
 build-commands:
diff --git a/strata/xfce/xfdesktop.morph b/strata/xfce/xfdesktop.def
index 4af5a905..449fe804 100644
--- a/strata/xfce/xfdesktop.morph
+++ b/strata/xfce/xfdesktop.def
@@ -1,5 +1,4 @@
 name: xfdesktop
-kind: chunk
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
 build-commands:
diff --git a/strata/xfce/xfwm4.morph b/strata/xfce/xfwm4.def
index 0c4e2273..128da114 100644
--- a/strata/xfce/xfwm4.morph
+++ b/strata/xfce/xfwm4.def
@@ -1,5 +1,4 @@
 name: xfwm4
-kind: chunk
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
 - ./autogen.sh --prefix="$PREFIX" --enable-debug=yes
diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.def
index b8e67888..84b1234e 100644
--- a/strata/xorg-util-macros-common.morph
+++ b/strata/xorg-util-macros-common.def
@@ -1,13 +1,11 @@
 name: xorg-util-macros-common
-kind: stratum
 build-depends:
-- morph: strata/core.morph
-chunks:
+- name: core
+contents:
 - name: xorg-util-macros
   repo: upstream:xorg-util-macros
   ref: 9a54b858601bd305de2737b06e609084a2a114c2
   unpetrify-ref: util-macros-1.19.0
-  build-depends: []
 - name: xcb-pthread-stubs
   repo: upstream:xcb-pthread-stubs
   ref: 431d2c0be218d878b9dd3862e4232243c599df4b