Delete genivi-staging and reorder morph contents

60 files changed, 1954 insertions, 1989 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index 0c89cba4..4aaba633 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -1,84 +1,84 @@
-name: audio-bluetooth
-description: Components required for audio and bluetooth.
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: libatomic_ops
+- build-depends: []
+  name: libatomic_ops
+  ref: baserock/morph
   repo: upstream:libatomic_ops
+- build-depends: []
+  name: alsa-lib
   ref: baserock/morph
-  build-depends: []
-- name: alsa-lib
   repo: upstream:alsa-lib
+- build-depends:
+  - alsa-lib
+  name: alsa-utils
   ref: baserock/morph
-  build-depends: []
-- name: alsa-utils
   repo: upstream:alsa-utils
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - alsa-lib
-- name: bluez
-  repo: upstream:bluez
+  name: bluez
   ref: baserock/genivi/baseline
-  build-depends:
-  - alsa-lib
-- name: bluez-tools
+  repo: upstream:bluez
+- build-depends: []
+  name: bluez-tools
+  ref: baserock/morph
   repo: upstream:bluez-tools
+- build-depends: []
+  name: libical
   ref: baserock/morph
-  build-depends: []
-- name: libical
   repo: upstream:libical
+- build-depends:
+  - bluez
+  - libical
+  name: obexd
   ref: baserock/morph
-  build-depends: []
-- name: obexd
   repo: upstream:obexd
+- build-depends: []
+  name: speex
   ref: baserock/morph
-  build-depends:
-  - bluez
-  - libical
-- name: speex
   repo: upstream:speex
+- build-depends:
+  - bluez
+  - speex
+  name: nohands
   ref: baserock/morph
-  build-depends: []
-- name: nohands
   repo: upstream:nohands
+- build-depends: []
+  name: mobile-broadband-provider-info
   ref: baserock/morph
-  build-depends:
-  - bluez
-  - speex
-- name: mobile-broadband-provider-info
   repo: upstream:mobile-broadband-provider-info
+- build-depends:
+  - mobile-broadband-provider-info
+  - bluez
+  name: ofono
   ref: baserock/morph
-  build-depends: []
-- name: ofono
   repo: upstream:ofono
+- build-depends: []
+  name: json-c
   ref: baserock/morph
-  build-depends:
-  - mobile-broadband-provider-info
-  - bluez
-- name: json-c
   repo: upstream:json-c
+- build-depends: []
+  name: libsndfile
   ref: baserock/morph
-  build-depends: []
-- name: libsndfile
   repo: upstream:libsndfile
-  ref: baserock/morph
-  build-depends: []
-- name: pulseaudio
-  repo: upstream:pulseaudio
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - libsndfile
   - libatomic_ops
   - speex
   - json-c
   - alsa-lib
   - bluez
+  name: pulseaudio
+  ref: baserock/morph
+  repo: upstream:pulseaudio
+description: Components required for audio and bluetooth.
+kind: stratum
+name: audio-bluetooth
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index a317f6a0..6944e2cc 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -1,25 +1,25 @@
-name: base-system-armv7-highbank
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: The set of strata required to have a minimal system for an ARM highbank
   system.
 kind: system
-arch: armv7
+name: base-system-armv7-highbank
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-armv7-highbank
   repo: baserock:baserock/morphs
+- morph: bsp-armv7-highbank
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index b64845fb..f20cfa8a 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -1,25 +1,25 @@
-name: base-system-armv7-versatile
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: The set of strata required to have a minimal system for an ARM versatile
   system.
 kind: system
-arch: armv7
+name: base-system-armv7-versatile
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: bsp-armv7-versatile
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph
index ce86b415..ba347c30 100644
--- a/base-system-armv7b-highbank.morph
+++ b/base-system-armv7b-highbank.morph
@@ -1,25 +1,25 @@
-name: base-system-armv7b-highbank
+arch: armv7b
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: The set of strata required to have a minimal system for an ARM highbank
   system.
 kind: system
-arch: armv7b
+name: base-system-armv7b-highbank
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-armv7b-highbank
   repo: baserock:baserock/morphs
+- morph: bsp-armv7b-highbank
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/base-system-armv7b-vexpress-tc2.morph b/base-system-armv7b-vexpress-tc2.morph
index a7154ffa..66dba656 100644
--- a/base-system-armv7b-vexpress-tc2.morph
+++ b/base-system-armv7b-vexpress-tc2.morph
@@ -1,24 +1,24 @@
-name: base-system-armv7b-vexpress-tc2
+arch: armv7b
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A small system for Versatile TC2 boards system.
 kind: system
-arch: armv7b
+name: base-system-armv7b-vexpress-tc2
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-armv7b-vexpress-tc2
   repo: baserock:baserock/morphs
+- morph: bsp-armv7b-vexpress-tc2
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 643ec94e..f825becc 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -1,25 +1,25 @@
-name: base-system-x86_32-generic
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: The set of strata required to have a minimal system for a 32-bit x86
   system.
 kind: system
-arch: x86_32
+name: base-system-x86_32-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-x86_32-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_32-generic
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 89e7f397..73806329 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -1,25 +1,25 @@
-name: base-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: The set of strata required to have a minimal system for a 64-bit x86
   system.
 kind: system
-arch: x86_64
+name: base-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph
index a3eaf2dc..8e504c4e 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank.morph
@@ -1,12 +1,12 @@
-name: bsp-armv7-highbank
-description: The platform dependent components required to boot an ARM highbank board.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
-  repo: upstream:linux
+- build-depends: []
+  name: linux
   ref: baserock/arm/highbank
-  build-depends: []
+  repo: upstream:linux
+description: The platform dependent components required to boot an ARM highbank board.
+kind: stratum
+name: bsp-armv7-highbank
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 5b2afdee..ca22a212 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -1,13 +1,13 @@
-name: bsp-armv7-versatile
-description: The platform dependent components required to boot an ARM versatile development
-  board.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
-  repo: upstream:linux
+- build-depends: []
+  name: linux
   ref: baserock/arm/versatile
-  build-depends: []
+  repo: upstream:linux
+description: The platform dependent components required to boot an ARM versatile development
+  board.
+kind: stratum
+name: bsp-armv7-versatile
diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph
index 0a921f9d..d3f14f33 100644
--- a/bsp-armv7b-highbank.morph
+++ b/bsp-armv7b-highbank.morph
@@ -1,12 +1,12 @@
-name: bsp-armv7b-highbank
-description: The platform dependent components required to boot an ARM highbank board.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
-  repo: upstream:linux
+- build-depends: []
+  name: linux
   ref: baserock/arm/highbank-be
-  build-depends: []
+  repo: upstream:linux
+description: The platform dependent components required to boot an ARM highbank board.
+kind: stratum
+name: bsp-armv7b-highbank
diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2.morph
index 0aabf9d5..7eacca97 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/bsp-armv7b-vexpress-tc2.morph
@@ -1,12 +1,12 @@
-name: bsp-armv7b-vexpress-tc2
-description: The platform dependent components required to boot Versatile TC2 board
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
-  repo: upstream:linux
+- build-depends: []
+  name: linux
   ref: baserock/liw/tc2
-  build-depends: []
+  repo: upstream:linux
+description: The platform dependent components required to boot Versatile TC2 board
+kind: stratum
+name: bsp-armv7b-vexpress-tc2
diff --git a/bsp-imx53.morph b/bsp-imx53.morph
index 99dc3ff1..fa2b317d 100644
--- a/bsp-imx53.morph
+++ b/bsp-imx53.morph
@@ -1,13 +1,13 @@
-name: bsp-imx53
-description: The platform dependent components required to boot an i.MX 53 ARM development
-  board.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
-  repo: upstream:linux
+- build-depends: []
+  name: linux
   ref: baserock/morph
-  build-depends: []
+  repo: upstream:linux
+description: The platform dependent components required to boot an i.MX 53 ARM development
+  board.
+kind: stratum
+name: bsp-imx53
diff --git a/bsp-wandboard.morph b/bsp-wandboard.morph
index 0692f768..88a4e163 100644
--- a/bsp-wandboard.morph
+++ b/bsp-wandboard.morph
@@ -1,17 +1,17 @@
-name: bsp-wandboard
-description: The platform dependent components required to boot an wandboard ARM board.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: u-boot
-  repo: upstream:u-boot
+- build-depends: []
+  name: u-boot
   ref: baserock/morph
-  build-depends: []
-- name: linux
-  repo: upstream:linux
-  ref: baserock/liw/wandboard_bsp
-  build-depends:
+  repo: upstream:u-boot
+- build-depends:
   - u-boot
+  name: linux
+  ref: baserock/liw/wandboard_bsp
+  repo: upstream:linux
+description: The platform dependent components required to boot an wandboard ARM board.
+kind: stratum
+name: bsp-wandboard
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index 536c3ffd..7b861ceb 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -1,22 +1,22 @@
-name: bsp-x86_32-generic
-description: The set of platform specific components required for booting a 32-bit
-  x86 based system.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
+- build-depends: []
+  name: linux
+  ref: baserock/morph
   repo: upstream:linux
+- build-depends: []
+  name: nasm
   ref: baserock/morph
-  build-depends: []
-- name: nasm
   repo: upstream:nasm
+- build-depends:
+  - nasm
+  name: syslinux
   ref: baserock/morph
-  build-depends: []
-- name: syslinux
   repo: upstream:syslinux
-  ref: baserock/morph
-  build-depends:
-  - nasm
+description: The set of platform specific components required for booting a 32-bit
+  x86 based system.
+kind: stratum
+name: bsp-x86_32-generic
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index 4f2ad85b..4ece9562 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -1,22 +1,22 @@
-name: bsp-x86_64-generic
-description: The set of platform specific components required for booting a 64-bit
-  x86 based system.
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: linux
+- build-depends: []
+  name: linux
+  ref: baserock/morph
   repo: upstream:linux
+- build-depends: []
+  name: nasm
   ref: baserock/morph
-  build-depends: []
-- name: nasm
   repo: upstream:nasm
+- build-depends:
+  - nasm
+  name: syslinux
   ref: baserock/morph
-  build-depends: []
-- name: syslinux
   repo: upstream:syslinux
-  ref: baserock/morph
-  build-depends:
-  - nasm
+description: The set of platform specific components required for booting a 64-bit
+  x86 based system.
+kind: stratum
+name: bsp-x86_64-generic
diff --git a/build-essential.morph b/build-essential.morph
index bba9a0a2..c13572f3 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -1,319 +1,301 @@
-name: build-essential
-description: Toolchain stratum
-kind: stratum
-
 chunks:
-    # Stage 1: build a minimal cross compiler with the host's tools.
-    #
-    # Starting with a cross compiler ensures that (a) nothing from the host
-    # can leak into the build-essential artifacts, and (b) cross-compiling
-    # build-essential is fully tested and supported, since we always use the
-    # cross code paths.
-
-    - name: stage1-binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends: []
-
-    - name: stage1-gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-
-    # Stage 2: cross-build the whole of build-essential, using the host's tools
-    # but the cross-compiler toolchain.
-    #
-    # Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
-    # but because stage 2 GCC is also built to *run* on the bootstrap machine
-    # it can only execute inside the stage 3 chroot (due to being built against
-    # a libc with a non-standard prefix).
-
-    - name: stage2-linux-api-headers
-      repo: upstream:linux
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-
-    - name: stage2-eglibc
-      repo: upstream:eglibc2
-      ref: baserock/2.15-build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-linux-api-headers
-
-    - name: stage2-binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-gcc-fixed-headers
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-          - stage2-gcc-fixed-headers
 
-    - name: stage2-busybox
-      repo: upstream:busybox
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
+# Stage 1: build a minimal cross compiler with the host's tools.
+#
+# Starting with a cross compiler ensures that (a) nothing from the host
+# can leak into the build-essential artifacts, and (b) cross-compiling
+# build-essential is fully tested and supported, since we always use the
+# cross code paths.
 
-    - name: stage2-fhs-dirs
-      repo: baserock:baserock/fhs-dirs
-      ref: master
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends: []
+- build-depends: []
+  build-mode: bootstrap
+  name: stage1-binutils
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:binutils-redhat
+- build-depends:
+  - stage1-binutils
+  build-mode: bootstrap
+  name: stage1-gcc
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:gcc-tarball
 
-    - name: stage2-gawk
-      repo: upstream:gawk
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
+# Stage 2: cross-build the whole of build-essential, using the host's tools
+# but the cross-compiler toolchain.
+#
+# Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
+# but because stage 2 GCC is also built to *run* on the bootstrap machine
+# it can only execute inside the stage 3 chroot (due to being built against
+# a libc with a non-standard prefix).
 
-    - name: stage2-make
-      repo: upstream:make
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  build-mode: bootstrap
+  name: stage2-linux-api-headers
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:linux
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-linux-api-headers
+  build-mode: bootstrap
+  name: stage2-eglibc
+  prefix: /tools
+  ref: baserock/2.15-build-essential
+  repo: upstream:eglibc2
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-binutils
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:binutils-redhat
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-gcc-fixed-headers
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:gcc-tarball
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  - stage2-gcc-fixed-headers
+  build-mode: bootstrap
+  name: stage2-gcc
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:gcc-tarball
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-busybox
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:busybox
+- build-depends: []
+  build-mode: bootstrap
+  name: stage2-fhs-dirs
+  prefix: /tools
+  ref: master
+  repo: baserock:baserock/fhs-dirs
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-gawk
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:gawk
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-make
+  prefix: /tools
+  ref: baserock/build-essential
+  repo: upstream:make
+- build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-linux-api-headers
+  - stage2-eglibc
+  build-mode: bootstrap
+  name: stage2-reset-specs
+  prefix: /tools
+  ref: baserock/2.15-build-essential
+  repo: upstream:eglibc2
 
-    - name: stage2-reset-specs
-      repo: upstream:eglibc2
-      ref: baserock/2.15-build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-linux-api-headers
-          - stage2-eglibc
+# Stage 3: build the whole of build-essential again, this time using a
+# staging area containing only the output of stage 2. The result of this
+# build is fully reproducible.
+#
+# We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
+# to run on a host *-bootstrap-* while stage 3 chunks are native-built for
+# a *-baserock-* machine. This works, because the cross build was all for
+# 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
+# /tools/bin during stage 2 but in stage 3 it becomes a real directory
+# again.
 
-    # Stage 3: build the whole of build-essential again, this time using a
-    # staging area containing only the output of stage 2. The result of this
-    # build is fully reproducible.
-    #
-    # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
-    # to run on a host *-bootstrap-* while stage 3 chunks are native-built for
-    # a *-baserock-* machine. This works, because the cross build was all for
-    # 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
-    # /tools/bin during stage 2 but in stage 3 it becomes a real directory
-    # again.
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  build-mode: staging
+  name: fhs-dirs
+  prefix: /usr
+  ref: master
+  repo: baserock:baserock/fhs-dirs
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  build-mode: staging
+  name: linux-api-headers
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:linux
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - linux-api-headers
+  build-mode: staging
+  name: eglibc
+  prefix: /usr
+  ref: baserock/2.15-build-essential
+  repo: upstream:eglibc2
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  build-mode: staging
+  name: zlib
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:zlib
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  - zlib
+  build-mode: staging
+  name: binutils
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:binutils-redhat
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  build-mode: staging
+  name: busybox
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:busybox
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  build-mode: staging
+  name: gawk
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:gawk
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  - zlib
+  build-mode: staging
+  name: gcc
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:gcc-tarball
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  build-mode: staging
+  name: make
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:make
 
-    - name: fhs-dirs
-      repo: baserock:baserock/fhs-dirs
-      ref: master
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
+# Extras that need to be in build-essential but don't need bootstrapping.
 
-    - name: linux-api-headers
-      repo: upstream:linux
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-
-    - name: eglibc
-      repo: upstream:eglibc2
-      ref: baserock/2.15-build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - linux-api-headers
-
-    - name: zlib
-      repo: upstream:zlib
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-
-    - name: binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-          - zlib
-
-    - name: busybox
-      repo: upstream:busybox
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-
-    - name: gawk
-      repo: upstream:gawk
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-
-    - name: gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-          - zlib
-
-    - name: make
-      repo: upstream:make
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-
-    # Extras that need to be in build-essential but don't need bootstrapping.
-
-    - name: ccache
-      repo: upstream:ccache
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - stage2-reset-specs
-          - eglibc
-          - zlib
+- build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-eglibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - eglibc
+  - zlib
+  build-mode: staging
+  name: ccache
+  prefix: /usr
+  ref: baserock/build-essential
+  repo: upstream:ccache
+description: Toolchain stratum
+kind: stratum
+name: build-essential
diff --git a/cloudinit-support.morph b/cloudinit-support.morph
index 1bb04ef0..078d9415 100644
--- a/cloudinit-support.morph
+++ b/cloudinit-support.morph
@@ -1,48 +1,48 @@
-name: cloudinit-support
-description: A stratum with cloudinit to fit a system in the OpenStack cloud.
-kind: stratum
 build-depends:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: configobj
+- build-depends: []
+  name: configobj
+  ref: baserock/morph
   repo: upstream:configobj
+- build-depends: []
+  name: python-requests
   ref: baserock/morph
-  build-depends: []
-- name: python-requests
   repo: upstream:python-requests
+- build-depends: []
+  name: python-prettytable
   ref: baserock/morph
-  build-depends: []
-- name: python-prettytable
   repo: upstream:python-prettytable
+- build-depends: []
+  name: python-json-patch
   ref: baserock/morph
-  build-depends: []
-- name: python-json-patch
   repo: upstream:python-json-patch
+- build-depends:
+  - python-json-patch
+  name: python-json-pointer
   ref: baserock/morph
-  build-depends: []
-- name: python-json-pointer
   repo: upstream:python-json-pointer
+- build-depends: []
+  name: python-cheetah
   ref: baserock/morph
-  build-depends:
-  - python-json-patch
-- name: python-cheetah
   repo: upstream:python-cheetah
-  ref: baserock/morph
-  build-depends: []
-- name: cloud-init
-  repo: upstream:cloud-init
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - configobj
   - python-requests
   - python-prettytable
   - python-json-pointer
   - python-cheetah
+  name: cloud-init
+  ref: baserock/morph
+  repo: upstream:cloud-init
+description: A stratum with cloudinit to fit a system in the OpenStack cloud.
+kind: stratum
+name: cloudinit-support
diff --git a/connectivity.morph b/connectivity.morph
index 41f0c260..89455fc6 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -1,31 +1,31 @@
-name: connectivity
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: libnl
-  repo: upstream:libnl
+- build-depends: []
+  name: libnl
   ref: baserock/morph
-  build-depends: []
-- name: wpa_supplicant
-  repo: upstream:hostap
-  ref: baserock/genivi/morph
-  build-depends:
+  repo: upstream:libnl
+- build-depends:
   - libnl
-- name: iptables
+  name: wpa_supplicant
+  ref: baserock/genivi/morph
+  repo: upstream:hostap
+- build-depends: []
+  name: iptables
+  ref: baserock/morph
   repo: upstream:iptables
+- build-depends:
+  - iptables
+  name: connman
   ref: baserock/morph
-  build-depends: []
-- name: connman
   repo: upstream:connman
-  ref: baserock/morph
-  build-depends:
-  - iptables
+kind: stratum
+name: connectivity
diff --git a/core.morph b/core.morph
index 1905a450..6815ae18 100644
--- a/core.morph
+++ b/core.morph
@@ -1,138 +1,131 @@
-name: core
-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
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: build-essential
   ref: master
-  morph: build-essential
+  repo: baserock:baserock/morphs
 chunks:
-- name: cmake
-  repo: upstream:cmake
+- build-depends: []
+  name: cmake
   ref: baserock/morph
-  build-depends: []
-- name: gdbm
+  repo: upstream:cmake
+- build-depends: []
+  name: gdbm
+  ref: baserock/build-essential
   repo: upstream:gdbm
+- build-depends: []
+  name: gettext
   ref: baserock/build-essential
-  build-depends: []
-- name: gettext
   repo: upstream:gettext
+- build-depends: []
+  name: m4
   ref: baserock/build-essential
-  build-depends: []
-- name: m4
   repo: upstream:m4
-  ref: baserock/build-essential
-  build-depends: []
-- name: mini-utils
-  repo: baserock:baserock/mini-utils
+- build-depends: []
+  name: mini-utils
   ref: master
-  build-depends: []
-- name: ncurses
+  repo: baserock:baserock/mini-utils
+- build-depends: []
+  name: ncurses
+  ref: baserock/morph
   repo: upstream:ncurses
+- build-depends:
+  - gdbm
+  name: perl
   ref: baserock/morph
-  build-depends: []
-- name: perl
   repo: upstream:perl
-  ref: baserock/morph
-  build-depends:
-  - gdbm
-- name: pkg-config
-  repo: upstream:pkg-config
+- build-depends: []
+  name: pkg-config
   ref: baserock/build-essential
-  build-depends: []
-- name: texinfo-tarball
-  repo: upstream:texinfo-tarball
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:pkg-config
+- build-depends:
   - ncurses
-- name: autoconf
-  repo: upstream:autoconf
-  ref: baserock/build-essential
-  build-depends:
+  name: texinfo-tarball
+  ref: baserock/morph
+  repo: upstream:texinfo-tarball
+- build-depends:
   - m4
   - perl
-- name: automake
-  repo: upstream:automake
-  ref: baserock/morph
-  build-depends:
+  name: autoconf
+  ref: baserock/build-essential
+  repo: upstream:autoconf
+- build-depends:
   - autoconf
   - perl
   - texinfo-tarball
-- name: bash
-  repo: upstream:bash
+  name: automake
   ref: baserock/morph
-  build-depends: []
-- name: error-perl-tarball
-  repo: upstream:error-perl-tarball
+  repo: upstream:automake
+- build-depends: []
+  name: bash
   ref: baserock/morph
-  build-depends:
+  repo: upstream:bash
+- build-depends:
   - perl
-- name: flex
-  repo: upstream:flex
-  ref: baserock/build-essential
-  build-depends:
+  name: error-perl-tarball
+  ref: baserock/morph
+  repo: upstream:error-perl-tarball
+- build-depends:
   - m4
-- name: openssl-new
+  name: flex
+  ref: baserock/build-essential
+  repo: upstream:flex
+- build-depends:
+  - perl
+  name: openssl-new
+  ref: baserock/morph
   repo: upstream:openssl-new
+- build-depends: []
+  name: bzip2
   ref: baserock/morph
-  build-depends:
-  - perl
-- name: bzip2
   repo: upstream:bzip2
-  ref: baserock/morph
-  build-depends: []
-- name: cpython
-  repo: upstream:cpython
-  ref: baserock/morph-2.7
-  build-depends:
+- build-depends:
   - openssl-new
   - bzip2
-- name: libtool
-  repo: upstream:libtool
-  ref: baserock/build-essential
-  build-depends:
+  name: cpython
+  ref: baserock/morph-2.7
+  repo: upstream:cpython
+- build-depends:
   - bash
-- name: gtk-doc-stub
-  repo: upstream:gtk-doc-stub
-  ref: baserock/morph
-  build-depends:
+  name: libtool
+  ref: baserock/build-essential
+  repo: upstream:libtool
+- build-depends:
   - autoconf
   - automake
   - libtool
-- name: libxml2
-  repo: upstream:libxml2
+  name: gtk-doc-stub
   ref: baserock/morph
-  build-depends:
+  repo: upstream:gtk-doc-stub
+- build-depends:
   - autoconf
   - automake
   - cpython
   - libtool
-- name: curl
-  repo: upstream:curl
+  name: libxml2
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libxml2
+- build-depends:
   - autoconf
   - automake
   - libtool
   - openssl-new
-- name: libexpat
-  repo: upstream:libexpat
+  name: curl
   ref: baserock/morph
-  build-depends:
+  repo: upstream:curl
+- build-depends:
   - autoconf
   - automake
   - libtool
-- name: XML-Parser
-  repo: upstream:XML-Parser
+  name: libexpat
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libexpat
+- build-depends:
   - libexpat
   - libxml2
   - perl
-- name: git
-  repo: upstream:git
+  name: XML-Parser
   ref: baserock/morph
-  build-depends:
+  repo: upstream:XML-Parser
+- build-depends:
   - autoconf
   - cpython
   - curl
@@ -140,10 +133,10 @@ chunks:
   - gettext
   - libexpat
   - openssl-new
-- name: bison
-  repo: upstream:bison
+  name: git
   ref: baserock/morph
-  build-depends:
+  repo: upstream:git
+- build-depends:
   - autoconf
   - automake
   - bash
@@ -151,54 +144,61 @@ chunks:
   - gettext
   - git
   - mini-utils
-- name: gperf
-  repo: upstream:gperf
+  name: bison
   ref: baserock/morph
-  build-depends: []
-- name: intltool
-  repo: upstream:intltool
+  repo: upstream:bison
+- build-depends: []
+  name: gperf
   ref: baserock/morph
-  build-depends:
+  repo: upstream:gperf
+- build-depends:
   - XML-Parser
   - autoconf
   - automake
   - perl
-- name: util-linux
-  repo: upstream:util-linux
+  name: intltool
   ref: baserock/morph
-  build-depends:
+  repo: upstream:intltool
+- build-depends:
   - autoconf
   - automake
   - gettext
   - git
   - libtool
   - pkg-config
-- name: xz
-  repo: upstream:xz
+  name: util-linux
   ref: baserock/morph
-  build-depends:
+  repo: upstream:util-linux
+- build-depends:
   - autoconf
   - automake
   - gettext
   - libtool
-- name: nano
-  repo: upstream:nano-tarball
+  name: xz
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xz
+- build-depends:
   - ncurses
-- name: bc
-  repo: upstream:bc-tarball
+  name: nano
   ref: baserock/morph
-  build-depends:
+  repo: upstream:nano-tarball
+- build-depends:
   - flex
   - texinfo-tarball
-- name: python-setuptools
-  repo: upstream:python-setuptools
+  name: bc
   ref: baserock/morph
-  build-depends:
+  repo: upstream:bc-tarball
+- build-depends:
   - cpython
-- name: pyyaml
-  repo: upstream:pyyaml
+  name: python-setuptools
   ref: baserock/morph
-  build-depends:
+  repo: upstream:python-setuptools
+- build-depends:
   - python-setuptools
+  name: pyyaml
+  ref: baserock/morph
+  repo: upstream:pyyaml
+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
+kind: stratum
+name: core
diff --git a/cross-bootstrap-system-x86_64-generic.morph b/cross-bootstrap-system-x86_64-generic.morph
index 7cb0482b..a24771ae 100644
--- a/cross-bootstrap-system-x86_64-generic.morph
+++ b/cross-bootstrap-system-x86_64-generic.morph
@@ -1,14 +1,14 @@
-name: cross-bootstrap-system-x86_64-generic
+arch: x86_64
 description: A system that produces the minimum needed to build a devel system
 kind: system
-arch: x86_64
+name: cross-bootstrap-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: cross-bootstrap
   repo: baserock:baserock/morphs
+- morph: cross-bootstrap
   ref: master
+  repo: baserock:baserock/morphs
diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph
index b9c3cf68..8d46e096 100644
--- a/cross-bootstrap.morph
+++ b/cross-bootstrap.morph
@@ -1,61 +1,61 @@
-name: cross-bootstrap
-description: The minimal development tools to build a baserock devel system
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: groff
+- build-depends: []
+  name: groff
+  ref: baserock/morph
   repo: upstream:groff
+- build-depends:
+  - groff
+  name: openssh
   ref: baserock/morph
-  build-depends: []
-- name: openssh
   repo: upstream:openssh
+- build-depends: []
+  name: python-ttystatus
   ref: baserock/morph
-  build-depends:
-  - groff
-- name: python-ttystatus
   repo: upstream:python-ttystatus
+- build-depends: []
+  name: python-coveragepy
   ref: baserock/morph
-  build-depends: []
-- name: python-coveragepy
   repo: upstream:python-coveragepy
+- build-depends:
+  - python-coveragepy
+  name: python-coverage-test-runner
   ref: baserock/morph
-  build-depends: []
-- name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
+- build-depends:
+  - python-coverage-test-runner
+  name: cliapp
   ref: baserock/morph
-  build-depends:
-  - python-coveragepy
-- name: cliapp
   repo: upstream:cliapp
+- build-depends: []
+  name: python-markdown
   ref: baserock/morph
-  build-depends:
-  - python-coverage-test-runner
-- name: python-markdown
   repo: upstream:python-markdown
-  ref: baserock/morph
-  build-depends: []
-- name: cmdtest
-  repo: upstream:cmdtest
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - cliapp
   - python-ttystatus
   - python-markdown
-- name: linux-user-chroot
-  repo: upstream:linux-user-chroot
+  name: cmdtest
   ref: baserock/morph
-  build-depends: []
-- name: morph
-  repo: baserock:baserock/morph
-  ref: master
-  build-depends:
+  repo: upstream:cmdtest
+- build-depends: []
+  name: linux-user-chroot
+  ref: baserock/morph
+  repo: upstream:linux-user-chroot
+- build-depends:
   - cliapp
   - cmdtest
   - python-coverage-test-runner
-- name: rsync
-  repo: upstream:rsync
+  name: morph
+  ref: master
+  repo: baserock:baserock/morph
+- build-depends: []
+  name: rsync
   ref: baserock/morph
-  build-depends: []
+  repo: upstream:rsync
+description: The minimal development tools to build a baserock devel system
+kind: stratum
+name: cross-bootstrap
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index 64a7cb79..eec28c1e 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -1,52 +1,52 @@
-name: devel-system-armv7-highbank
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the ARM highbank
   architecture.
 kind: system
-arch: armv7
+name: devel-system-armv7-highbank
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-armv7-highbank
   repo: baserock:baserock/morphs
+- morph: bsp-armv7-highbank
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: genivi-x-armv7-versatile
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index ba000a9f..ef79c9d2 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -1,52 +1,52 @@
-name: devel-system-armv7-versatile
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the ARM versatile
   architecture.
 kind: system
-arch: armv7
+name: devel-system-armv7-versatile
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: bsp-armv7-versatile
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: genivi-x-armv7-versatile
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
index e9d67277..ff5e893d 100644
--- a/devel-system-armv7-wandboard.morph
+++ b/devel-system-armv7-wandboard.morph
@@ -1,51 +1,51 @@
-name: devel-system-armv7-wandboard
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the Wandboard.
 kind: system
-arch: armv7
+name: devel-system-armv7-wandboard
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-wandboard
   repo: baserock:baserock/morphs
+- morph: bsp-wandboard
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: genivi-x-armv7-versatile
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index a0b22513..5dc74409 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -1,52 +1,52 @@
-name: devel-system-armv7b-highbank
+arch: armv7b
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the ARM highbank
   architecture.
 kind: system
-arch: armv7b
+name: devel-system-armv7b-highbank
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-armv7b-highbank
   repo: baserock:baserock/morphs
+- morph: bsp-armv7b-highbank
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: genivi-x-armv7-versatile
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 0524e1ae..bc057f5d 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -1,55 +1,55 @@
-name: devel-system-x86_32-generic
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the 32-bit x86
   architecture.
 kind: system
-arch: x86_32
+name: devel-system-x86_32-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-x86_32-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_32-generic
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: genivi-x-x86_64-generic
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-- morph: glanceclient
   repo: baserock:baserock/morphs
+- morph: glanceclient
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 68defd28..b7300877 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -1,55 +1,55 @@
-name: devel-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the 64-bit x86
   architecture.
 kind: system
-arch: x86_64
+name: devel-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: genivi-x-x86_64-generic
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-- morph: glanceclient
   repo: baserock:baserock/morphs
+- morph: glanceclient
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/enlightenment.morph b/enlightenment.morph
index f8aae602..0eb47e68 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -1,67 +1,67 @@
-name: enlightenment
-description: Enlightenment Desktop and Window Manager
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-  morph: tools
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-  morph: x-x86_64-generic
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: lua
   ref: master
-  morph: lua
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-  morph: audio-bluetooth
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: multimedia-gstreamer-0.10
   ref: master
-  morph: multimedia-gstreamer-0.10
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-  morph: connectivity
+  repo: baserock:baserock/morphs
 chunks:
-- name: efl
-  repo: upstream:enlightenment/efl
-  ref: baserock/morph
-  build-depends: []
-- name: elementary
-  repo: upstream:enlightenment/elementary
+- build-depends: []
+  name: efl
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/efl
+- build-depends:
   - efl
-- name: evas_generic_loaders
-  repo: upstream:enlightenment/evas_generic_loaders
+  name: elementary
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/elementary
+- build-depends:
   - efl
-- name: enlightenment
-  repo: upstream:enlightenment/enlightenment
+  name: evas_generic_loaders
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/evas_generic_loaders
+- build-depends:
   - efl
   - elementary
-- name: imlib2
-  repo: upstream:enlightenment/imlib2
+  name: enlightenment
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/enlightenment
+- build-depends:
   - efl
   - elementary
   - enlightenment
-- name: libast
-  repo: upstream:enlightenment/libast
+  name: imlib2
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/imlib2
+- build-depends:
   - efl
   - elementary
   - enlightenment
   - imlib2
-- name: eterm
-  repo: upstream:enlightenment/eterm
+  name: libast
   ref: baserock/morph
-  build-depends:
+  repo: upstream:enlightenment/libast
+- build-depends:
   - efl
   - elementary
   - enlightenment
   - libast
   - imlib2
+  name: eterm
+  ref: baserock/morph
+  repo: upstream:enlightenment/eterm
+description: Enlightenment Desktop and Window Manager
+kind: stratum
+name: enlightenment
diff --git a/foundation.morph b/foundation.morph
index 329fb35b..143670b8 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -1,101 +1,101 @@
-name: foundation
-kind: stratum
-description: Basic userland runtime system
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: attr
+- build-depends: []
+  name: attr
+  ref: baserock/morph
   repo: upstream:attr
+- build-depends: []
+  name: groff
   ref: baserock/morph
-  build-depends: []
-- name: groff
   repo: upstream:groff
+- build-depends: []
+  name: kmod
   ref: baserock/morph
-  build-depends: []
-- name: kmod
   repo: upstream:kmod
+- build-depends:
+  - attr
+  name: libcap2
   ref: baserock/morph
-  build-depends: []
-- name: libcap2
   repo: upstream:libcap2
+- build-depends: []
+  name: libffi
   ref: baserock/morph
-  build-depends:
-  - attr
-- name: libffi
   repo: upstream:libffi
+- build-depends: []
+  name: libusbx
   ref: baserock/morph
-  build-depends: []
-- name: libusbx
   repo: upstream:libusbx
+- build-depends: []
+  name: pciutils
   ref: baserock/morph
-  build-depends: []
-- name: pciutils
   repo: upstream:pciutils
+- build-depends:
+  - libusbx
+  name: usbutils
   ref: baserock/morph
-  build-depends: []
-- name: usbutils
   repo: upstream:usbutils
+- build-depends:
+  - libffi
+  name: glib
   ref: baserock/morph
-  build-depends:
-  - libusbx
-- name: glib
   repo: upstream:glib
+- build-depends:
+  - glib
+  name: gobject-introspection
   ref: baserock/morph
-  build-depends:
-  - libffi
-- name: gobject-introspection
   repo: upstream:gobject-introspection
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - glib
-- name: dbus-pre
-  repo: upstream:dbus
+  name: dbus-pre
   ref: baserock/build-essential
-  build-depends:
-  - glib
-- name: systemd
-  repo: upstream:systemd
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:dbus
+- build-depends:
   - dbus-pre
   - gobject-introspection
   - kmod
   - libcap2
   - pciutils
   - usbutils
-- name: lzo
-  repo: upstream:lzo
+  name: systemd
   ref: baserock/morph
-  build-depends: []
-- name: btrfs-progs
-  repo: upstream:btrfs-progs
+  repo: upstream:systemd
+- build-depends: []
+  name: lzo
   ref: baserock/morph
-  build-depends:
+  repo: upstream:lzo
+- build-depends:
   - attr
   - lzo
-- name: dbus
-  repo: upstream:dbus
-  ref: baserock/build-essential
-  build-depends:
+  name: btrfs-progs
+  ref: baserock/morph
+  repo: upstream:btrfs-progs
+- build-depends:
   - glib
   - systemd
-- name: help2man
+  name: dbus
+  ref: baserock/build-essential
+  repo: upstream:dbus
+- build-depends: []
+  name: help2man
+  ref: baserock/morph
   repo: upstream:help2man
+- build-depends: []
+  name: libxslt
   ref: baserock/morph
-  build-depends: []
-- name: libxslt
   repo: upstream:libxslt
+- build-depends:
+  - groff
+  name: openssh
   ref: baserock/morph
-  build-depends: []
-- name: openssh
   repo: upstream:openssh
-  ref: baserock/morph
-  build-depends:
-  - groff
-- name: tbdiff
-  repo: baserock:baserock/tbdiff
-  ref: master
-  build-depends:
+- build-depends:
   - attr
+  name: tbdiff
+  ref: master
+  repo: baserock:baserock/tbdiff
+description: Basic userland runtime system
+kind: stratum
+name: foundation
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index b9fa2f86..de0601e1 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -1,49 +1,49 @@
-name: genivi-baseline-system-armv7-versatile
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
 description: A GENIVI baseline system for an ARMv7 system.
 kind: system
-arch: armv7
+name: genivi-baseline-system-armv7-versatile
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: bsp-armv7-versatile
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: genivi-x-armv7-versatile
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
+  repo: baserock:baserock/morphs
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index f95af5e4..f5a678b6 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -1,49 +1,49 @@
-name: genivi-baseline-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
 description: A GENIVI baseline system for a 64-bit x86 system.
 kind: system
-arch: x86_64
+name: genivi-baseline-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: genivi-x-x86_64-generic
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
+  repo: baserock:baserock/morphs
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
index 22b01bd4..39b5efa8 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation.morph
@@ -1,23 +1,23 @@
-name: genivi-foundation
-description: Basic components needed by the GENIVI baseline.
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: dbus-glib
-  repo: upstream:dbus-glib
+- build-depends: []
+  name: dbus-glib
   ref: baserock/morph
-  build-depends: []
-- name: fuse
+  repo: upstream:dbus-glib
+- build-depends: []
+  name: fuse
+  ref: baserock/genivi/morph
   repo: upstream:fuse
+- build-depends: []
+  name: linuxquota
   ref: baserock/genivi/morph
-  build-depends: []
-- name: linuxquota
   repo: upstream:linuxquota
-  ref: baserock/genivi/morph
-  build-depends: []
+description: Basic components needed by the GENIVI baseline.
+kind: stratum
+name: genivi-foundation
diff --git a/genivi-staging.morph b/genivi-staging.morph
deleted file mode 100644
index a2dc9910..00000000
--- a/genivi-staging.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: genivi-staging
-kind: stratum
-build-depends: []
-chunks:
-- name: linux-api-headers
-  repo: upstream:linux
-  ref: baserock/genivi/baseline
-  build-depends: []
-- name: mpfr
-  repo: upstream:mpfr
-  ref: baserock/morph
-  build-depends: []
-- name: mpc
-  repo: upstream:mpc
-  ref: baserock/morph
-  build-depends:
-  - mpfr
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
index 69132c54..17c4d507 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile.morph
@@ -1,24 +1,24 @@
-name: genivi-wayland-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: wayland-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: wayland-armv7-versatile
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: layer_management-wayland
-  repo: upstream:layer_management
+- build-depends: []
+  name: layer_management-wayland
   ref: baserock/genivi/baseline
-  build-depends: []
+  repo: upstream:layer_management
+description: Software components designed by genivi, for genivi.
+kind: stratum
+name: genivi-wayland-armv7-versatile
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph
index 277319d4..72690ca2 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/genivi-wayland-x86_64-generic.morph
@@ -1,24 +1,24 @@
-name: genivi-wayland-x86_64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: wayland-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: wayland-x86_64-generic
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: layer_management-wayland
-  repo: upstream:layer_management
+- build-depends: []
+  name: layer_management-wayland
   ref: baserock/genivi/baseline
-  build-depends: []
+  repo: upstream:layer_management
+description: Software components designed by genivi, for genivi.
+kind: stratum
+name: genivi-wayland-x86_64-generic
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index 2aa5ee53..34b52f7a 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -1,24 +1,24 @@
-name: genivi-x-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: x-armv7-versatile
   repo: baserock:baserock/morphs
+- morph: x-armv7-versatile
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: layer_management
-  repo: upstream:layer_management
+- build-depends: []
+  name: layer_management
   ref: baserock/genivi/baseline
-  build-depends: []
+  repo: upstream:layer_management
+description: Software components designed by genivi, for genivi.
+kind: stratum
+name: genivi-x-armv7-versatile
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index 643e051d..b3f475ef 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic.morph
@@ -1,24 +1,24 @@
-name: genivi-x-x86_64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: layer_management
-  repo: upstream:layer_management
+- build-depends: []
+  name: layer_management
   ref: baserock/genivi/baseline
-  build-depends: []
+  repo: upstream:layer_management
+description: Software components designed by genivi, for genivi.
+kind: stratum
+name: genivi-x-x86_64-generic
diff --git a/genivi.morph b/genivi.morph
index 84a09927..6b14901f 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -1,44 +1,44 @@
-name: genivi
-kind: stratum
-description: Software components designed by genivi, for genivi.
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: DLT-daemon
-  repo: upstream:DLT-daemon
+- build-depends: []
+  name: DLT-daemon
   ref: baserock/morphs
-  build-depends: []
-- name: sqlite3
+  repo: upstream:DLT-daemon
+- build-depends: []
+  name: sqlite3
+  ref: baserock/morph
   repo: upstream:sqlite3
+- build-depends:
+  - DLT-daemon
+  name: node-startup-controller
   ref: baserock/morph
-  build-depends: []
-- name: node-startup-controller
   repo: upstream:node-startup-controller
+- build-depends: []
+  name: googletest
   ref: baserock/morph
-  build-depends:
-  - DLT-daemon
-- name: googletest
   repo: upstream:googletest
+- build-depends:
+  - googletest
+  name: googlemock
   ref: baserock/morph
-  build-depends: []
-- name: googlemock
   repo: upstream:googlemock
-  ref: baserock/morph
-  build-depends:
-  - googletest
-- name: audiomanager
-  repo: upstream:audiomanager
-  ref: baserock/genivi/baseline
-  build-depends:
+- build-depends:
   - DLT-daemon
   - sqlite3
   - googletest
   - googlemock
+  name: audiomanager
+  ref: baserock/genivi/baseline
+  repo: upstream:audiomanager
+description: Software components designed by genivi, for genivi.
+kind: stratum
+name: genivi
diff --git a/glanceclient.morph b/glanceclient.morph
index 0f8247e5..0ed5edb3 100644
--- a/glanceclient.morph
+++ b/glanceclient.morph
@@ -1,86 +1,80 @@
-name: glanceclient
-description: A stratum with glanceclient to let the Openstack deployment.
-kind: stratum
 build-depends:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: six
+- build-depends: []
+  name: six
+  ref: baserock/morph
   repo: upstream:six
+- build-depends: []
+  name: jsonschema
   ref: baserock/morph
-  build-depends: []
-- name: jsonschema
   repo: upstream:jsonschema
+- build-depends: []
+  name: python-json-pointer
   ref: baserock/morph
-  build-depends: []
-- name: python-json-pointer
   repo: upstream:python-json-pointer
+- build-depends: []
+  name: python-json-patch
   ref: baserock/morph
-  build-depends: []
-- name: python-json-patch
   repo: upstream:python-json-patch
-  ref: baserock/morph
-  build-depends: []
-- name: warlock
-  repo: upstream:warlock
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - six
   - jsonschema
   - python-json-pointer
   - python-json-patch
-- name: python-prettytable
+  name: warlock
+  ref: baserock/morph
+  repo: upstream:warlock
+- build-depends: []
+  name: python-prettytable
+  ref: baserock/morph
   repo: upstream:python-prettytable
+- build-depends: []
+  name: pbr
   ref: baserock/morph
-  build-depends: []
-- name: pbr
   repo: upstream:pbr
+- build-depends: []
+  name: argparse
   ref: baserock/morph
-  build-depends: []
-- name: argparse
   repo: upstream:argparse
+- build-depends: []
+  name: pyopenssl
   ref: baserock/morph
-  build-depends: []
-- name: pyopenssl
   repo: upstream:pyopenssl
+- build-depends: []
+  name: pyiso8601
   ref: baserock/morph
-  build-depends: []
-- name: pyiso8601
   repo: upstream:pyiso8601
+- build-depends: []
+  name: python-requests
   ref: baserock/morph
-  build-depends: []
-- name: python-requests
   repo: upstream:python-requests
+- build-depends: []
+  name: simplejson
   ref: baserock/morph
-  build-depends: []
-- name: simplejson
   repo: upstream:simplejson
+- build-depends: []
+  name: netaddr
   ref: baserock/morph
-  build-depends: []
-- name: netaddr
   repo: upstream:netaddr
+- build-depends: []
+  name: pytz
   ref: baserock/morph
-  build-depends: []
-- name: pytz
   repo: upstream:pytz
-  ref: baserock/morph
-  build-depends: []
-- name: babel
-  repo: upstream:babel
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - pytz
-- name: python-keystoneclient
-  repo: upstream:python-keystoneclient
+  name: babel
   ref: baserock/morph
-  build-depends:
+  repo: upstream:babel
+- build-depends:
   - pbr
   - pyiso8601
   - python-prettytable
@@ -89,13 +83,19 @@ chunks:
   - six
   - netaddr
   - babel
-- name: python-glanceclient
-  repo: upstream:python-glanceclient
+  name: python-keystoneclient
   ref: baserock/morph
-  build-depends:
+  repo: upstream:python-keystoneclient
+- build-depends:
   - python-prettytable
   - pbr
   - argparse
   - pyopenssl
   - python-keystoneclient
   - warlock
+  name: python-glanceclient
+  ref: baserock/morph
+  repo: upstream:python-glanceclient
+description: A stratum with glanceclient to let the Openstack deployment.
+kind: stratum
+name: glanceclient
diff --git a/gtk2.morph b/gtk2.morph
index 8375ac09..3f54500f 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -1,94 +1,94 @@
-name: gtk2
-description: the gtk2 stratum
-kind: stratum
 build-depends:
 - morph: genivi-foundation
-  repo: baserock:baserock/morphs
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: shared-mime-info
-  repo: upstream:shared-mime-info
+- build-depends: []
+  name: shared-mime-info
   ref: baserock/morph
-  build-depends: []
-- name: gnome-common
-  repo: upstream:gnome-common
+  repo: upstream:shared-mime-info
+- build-depends: []
+  name: gnome-common
   ref: 3.7.4
-  build-depends: []
-- name: libtiff
-  repo: upstream:libtiff
+  repo: upstream:gnome-common
+- build-depends: []
+  name: libtiff
   ref: Release-v4-0-3
-  build-depends: []
-- name: libcroco
-  repo: upstream:libcroco
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:libtiff
+- build-depends:
   - gnome-common
-- name: gdk-pixbuf
-  repo: upstream:gdk-pixbuf
+  name: libcroco
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libcroco
+- build-depends:
   - libtiff
-- name: atk
-  repo: upstream:atk
-  ref: ATK_2_9_3
-  build-depends:
+  name: gdk-pixbuf
+  ref: baserock/morph
+  repo: upstream:gdk-pixbuf
+- build-depends:
   - gnome-common
-- name: at-spi2-core
-  repo: upstream:at-spi2-core
+  name: atk
+  ref: ATK_2_9_3
+  repo: upstream:atk
+- build-depends: []
+  name: at-spi2-core
   ref: AT_SPI2_CORE_2_9_5
-  build-depends: []
-- name: at-spi2-atk
-  repo: upstream:at-spi2-atk
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:at-spi2-core
+- build-depends:
   - at-spi2-core
   - atk
-- name: cairo
-  repo: upstream:cairo
+  name: at-spi2-atk
+  ref: baserock/morph
+  repo: upstream:at-spi2-atk
+- build-depends: []
+  name: cairo
   ref: 1.12.14
-  build-depends: []
-- name: colm
-  repo: upstream:colm
+  repo: upstream:cairo
+- build-depends: []
+  name: colm
   ref: master
-  build-depends: []
-- name: ragel
-  repo: upstream:ragel
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:colm
+- build-depends:
   - colm
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: 0.9.19
-  build-depends:
+  name: ragel
+  ref: baserock/morph
+  repo: upstream:ragel
+- build-depends:
   - ragel
-- name: pango
-  repo: upstream:pango
-  ref: baserock/xfce-build
-  build-depends:
+  name: harfbuzz
+  ref: 0.9.19
+  repo: upstream:harfbuzz
+- build-depends:
   - cairo
   - harfbuzz
-- name: gtk+
-  repo: upstream:gtk+
+  name: pango
   ref: baserock/xfce-build
-  build-depends:
+  repo: upstream:pango
+- build-depends:
   - pango
   - gdk-pixbuf
   - cairo
   - atk
   - at-spi2-atk
-- name: librsvg
-  repo: upstream:librsvg
-  ref: baserock/morph
-  build-depends:
+  name: gtk+
+  ref: baserock/xfce-build
+  repo: upstream:gtk+
+- build-depends:
   - cairo
   - gdk-pixbuf
   - gnome-common
   - gtk+
   - libcroco
   - pango
+  name: librsvg
+  ref: baserock/morph
+  repo: upstream:librsvg
+description: the gtk2 stratum
+kind: stratum
+name: gtk2
diff --git a/lua.morph b/lua.morph
index a30b4562..29321af1 100644
--- a/lua.morph
+++ b/lua.morph
@@ -1,12 +1,12 @@
-name: lua
-kind: stratum
-description: Interpreter for the lua scripting language.
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-  morph: tools
+  repo: baserock:baserock/morphs
 chunks:
-- name: lua
-  repo: upstream:lua
+- build-depends: []
+  name: lua
   ref: baserock/5.1-morph
-  build-depends: []
+  repo: upstream:lua
+description: Interpreter for the lua scripting language.
+kind: stratum
+name: lua
diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph
index 9389520e..f58833ca 100644
--- a/multimedia-gstreamer-0.10.morph
+++ b/multimedia-gstreamer-0.10.morph
@@ -1,35 +1,35 @@
-name: multimedia-gstreamer-0.10
-kind: stratum
-description: Codecs
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: orc
-  repo: upstream:orc
+- build-depends: []
+  name: orc
   ref: baserock/morph
-  build-depends: []
-- name: gstreamer
-  repo: upstream:gstreamer
-  ref: baserock/morph/0.10
-  build-depends:
+  repo: upstream:orc
+- build-depends:
   - orc
-- name: gstreamer-plugins-base
-  repo: upstream:gstreamer-plugins-base
+  name: gstreamer
   ref: baserock/morph/0.10
-  build-depends:
+  repo: upstream:gstreamer
+- build-depends:
   - gstreamer
-- name: gstreamer-plugins-good
-  repo: upstream:gstreamer-plugins-good
+  name: gstreamer-plugins-base
   ref: baserock/morph/0.10
-  build-depends:
+  repo: upstream:gstreamer-plugins-base
+- build-depends:
   - gstreamer
   - gstreamer-plugins-base
   - orc
+  name: gstreamer-plugins-good
+  ref: baserock/morph/0.10
+  repo: upstream:gstreamer-plugins-good
+description: Codecs
+kind: stratum
+name: multimedia-gstreamer-0.10
diff --git a/multimedia.morph b/multimedia.morph
index 1df108b6..5c83fa90 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -1,23 +1,23 @@
-name: multimedia
-kind: stratum
-description: Codecs
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: orc
-  repo: upstream:orc
+- build-depends: []
+  name: orc
   ref: baserock/morph
-  build-depends: []
-- name: gstreamer
-  repo: upstream:gstreamer
-  ref: baserock/genivi/baseline
-  build-depends:
+  repo: upstream:orc
+- build-depends:
   - orc
+  name: gstreamer
+  ref: baserock/genivi/baseline
+  repo: upstream:gstreamer
+description: Codecs
+kind: stratum
+name: multimedia
diff --git a/nfs.morph b/nfs.morph
index c0b1ee46..fe14b2f1 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -1,38 +1,38 @@
-name: nfs
-kind: stratum
-description: NFS utilities
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: core
   ref: master
-  morph: core
+  repo: baserock:baserock/morphs
 chunks:
-- name: libevent
-  repo: upstream:libevent
+- build-depends: []
+  name: libevent
   ref: release-2.0.20-stable
-  build-depends: []
-- name: sqlite3
-  repo: upstream:sqlite3
+  repo: upstream:libevent
+- build-depends: []
+  name: sqlite3
   ref: baserock/morph
-  build-depends: []
-- name: tcp-wrappers
-  repo: upstream:tcp-wrappers
+  repo: upstream:sqlite3
+- build-depends: []
+  name: tcp-wrappers
   ref: baserock/fedora-patches
-  build-depends: []
-- name: ti-rpc
-  repo: upstream:ti-rpc
-  ref: baserock/master
-  build-depends: []
-- name: rpcbind
-  repo: upstream:rpcbind
+  repo: upstream:tcp-wrappers
+- build-depends: []
+  name: ti-rpc
   ref: baserock/master
-  build-depends:
+  repo: upstream:ti-rpc
+- build-depends:
   - ti-rpc
   - tcp-wrappers
-- name: nfs-utils
-  repo: upstream:nfs-utils
+  name: rpcbind
   ref: baserock/master
-  build-depends:
+  repo: upstream:rpcbind
+- build-depends:
   - libevent
   - sqlite3
   - tcp-wrappers
   - ti-rpc
+  name: nfs-utils
+  ref: baserock/master
+  repo: upstream:nfs-utils
+description: NFS utilities
+kind: stratum
+name: nfs
diff --git a/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph
index 01178ea8..95c05ef6 100644
--- a/openstack-client-base-system-x86_32-generic.morph
+++ b/openstack-client-base-system-x86_32-generic.morph
@@ -1,29 +1,29 @@
-name: openstack-client-base-system-x86_32-generic
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
 description: The set of strata required to have a minimal system for a 32-bit x86
   system suitable in OpenStack.
 kind: system
-arch: x86_32
+name: openstack-client-base-system-x86_32-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-x86_32-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_32-generic
   ref: master
-- morph: cloudinit-support
   repo: baserock:baserock/morphs
+- morph: cloudinit-support
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vdaboot
+  repo: baserock:baserock/morphs
diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph
index d8309373..ccfe30d2 100644
--- a/openstack-client-base-system-x86_64-generic.morph
+++ b/openstack-client-base-system-x86_64-generic.morph
@@ -1,29 +1,29 @@
-name: openstack-client-base-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
 description: The set of strata required to have a minimal system for a 64-bit x86
   system suitable in OpenStack.
 kind: system
-arch: x86_64
+name: openstack-client-base-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: cloudinit-support
   repo: baserock:baserock/morphs
+- morph: cloudinit-support
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vdaboot
+  repo: baserock:baserock/morphs
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 4183c784..9075ae3f 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -1,55 +1,55 @@
-name: qt4-devel-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the 64-bit x86
   architecture.
 kind: system
-arch: x86_64
+name: qt4-devel-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: multimedia-gstreamer-0.10
   repo: baserock:baserock/morphs
+- morph: multimedia-gstreamer-0.10
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: qt4-tools
   repo: baserock:baserock/morphs
+- morph: qt4-tools
   ref: master
-- morph: qt4-sdk
   repo: baserock:baserock/morphs
+- morph: qt4-sdk
   ref: master
-- morph: lua
   repo: baserock:baserock/morphs
+- morph: lua
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: enlightenment
   repo: baserock:baserock/morphs
+- morph: enlightenment
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/qt4-sdk.morph b/qt4-sdk.morph
index 6b1ff1a6..9c3a89a8 100644
--- a/qt4-sdk.morph
+++ b/qt4-sdk.morph
@@ -1,12 +1,12 @@
-name: qt4-sdk
-description: Qt4 Desktop Environment, IDE and Example Apps
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: qt4-tools
   ref: master
-  morph: qt4-tools
+  repo: baserock:baserock/morphs
 chunks:
-- name: qt-creator
-  repo: upstream:qt-creator
+- build-depends: []
+  name: qt-creator
   ref: baserock/morph/2.7
-  build-depends: []
+  repo: upstream:qt-creator
+description: Qt4 Desktop Environment, IDE and Example Apps
+kind: stratum
+name: qt4-sdk
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 241ac9c0..c40d3c53 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -1,38 +1,38 @@
-name: qt4-tools
-description: Qt4 Development Libraries and Tools
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-  morph: tools
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-  morph: x-x86_64-generic
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: multimedia-gstreamer-0.10
   ref: master
-  morph: multimedia-gstreamer-0.10
+  repo: baserock:baserock/morphs
 chunks:
-- name: icu
+- build-depends: []
+  name: icu
+  ref: baserock/morph
   repo: upstream:icu
+- build-depends: []
+  name: sqlite3
   ref: baserock/morph
-  build-depends: []
-- name: sqlite3
   repo: upstream:sqlite3
-  ref: baserock/morph
-  build-depends: []
-- name: ruby-1.8
-  repo: upstream:ruby
+- build-depends: []
+  name: ruby-1.8
   ref: baserock/morph/ruby_1_8_7
-  build-depends: []
-- name: ruby-1.9
   repo: upstream:ruby
-  ref: baserock/morph/ruby_1_9_3
-  build-depends:
+- build-depends:
   - ruby-1.8
-- name: qt4-tools
-  repo: upstream:qt4-tools
-  ref: baserock/morph
-  build-depends:
+  name: ruby-1.9
+  ref: baserock/morph/ruby_1_9_3
+  repo: upstream:ruby
+- build-depends:
   - icu
   - ruby-1.9
   - sqlite3
+  name: qt4-tools
+  ref: baserock/morph
+  repo: upstream:qt4-tools
+description: Qt4 Development Libraries and Tools
+kind: stratum
+name: qt4-tools
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 97b1d85f..3509ad50 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -1,55 +1,55 @@
-name: qt5-devel-system-x86_64-generic
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
 description: A system that is able to build other systems based on the 64-bit x86
   architecture.
 kind: system
-arch: x86_64
+name: qt5-devel-system-x86_64-generic
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: multimedia-gstreamer-0.10
   repo: baserock:baserock/morphs
+- morph: multimedia-gstreamer-0.10
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: qt5-tools
   repo: baserock:baserock/morphs
+- morph: qt5-tools
   ref: master
-- morph: qt5-sdk
   repo: baserock:baserock/morphs
+- morph: qt5-sdk
   ref: master
-- morph: lua
   repo: baserock:baserock/morphs
+- morph: lua
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: enlightenment
   repo: baserock:baserock/morphs
+- morph: enlightenment
   ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/qt5-sdk.morph b/qt5-sdk.morph
index 2db2f83b..9fa83f96 100644
--- a/qt5-sdk.morph
+++ b/qt5-sdk.morph
@@ -1,16 +1,16 @@
-name: qt5-sdk
-description: Qt5 Desktop Environment, IDE and Example Apps
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: qt5-tools
   ref: master
-  morph: qt5-tools
+  repo: baserock:baserock/morphs
 chunks:
-- name: qt-creator
-  repo: upstream:qt-creator
+- build-depends: []
+  name: qt-creator
   ref: baserock/morph/2.7
-  build-depends: []
-- name: snowshoe
-  repo: upstream:snowshoe
+  repo: upstream:qt-creator
+- build-depends: []
+  name: snowshoe
   ref: baserock/morph
-  build-depends: []
+  repo: upstream:snowshoe
+description: Qt5 Desktop Environment, IDE and Example Apps
+kind: stratum
+name: qt5-sdk
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 09c7e531..866e9fe8 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -1,156 +1,156 @@
-name: qt5-tools
-description: Qt5 Development Libraries and Tools
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-  morph: tools
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-  morph: x-x86_64-generic
-- repo: baserock:baserock/morphs
+  repo: baserock:baserock/morphs
+- morph: multimedia-gstreamer-0.10
   ref: master
-  morph: multimedia-gstreamer-0.10
+  repo: baserock:baserock/morphs
 chunks:
-- name: icu
+- build-depends: []
+  name: icu
+  ref: baserock/morph
   repo: upstream:icu
+- build-depends: []
+  name: sqlite3
   ref: baserock/morph
-  build-depends: []
-- name: sqlite3
   repo: upstream:sqlite3
-  ref: baserock/morph
-  build-depends: []
-- name: ruby-1.8
-  repo: upstream:ruby
+- build-depends: []
+  name: ruby-1.8
   ref: baserock/morph/ruby_1_8_7
-  build-depends: []
-- name: ruby-1.9
   repo: upstream:ruby
-  ref: baserock/morph/ruby_1_9_3
-  build-depends:
+- build-depends:
   - ruby-1.8
-- name: qtbase
-  repo: upstream:qt5/qtbase
-  ref: baserock/morph
-  build-depends:
+  name: ruby-1.9
+  ref: baserock/morph/ruby_1_9_3
+  repo: upstream:ruby
+- build-depends:
   - icu
   - sqlite3
-- name: qtsvg
-  repo: upstream:qt5/qtsvg
+  name: qtbase
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtbase
+- build-depends:
   - qtbase
-- name: qtjsbackend
-  repo: upstream:qt5/qtjsbackend
+  name: qtsvg
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtsvg
+- build-depends:
   - qtbase
-- name: qtscript
-  repo: upstream:qt5/qtscript
+  name: qtjsbackend
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtjsbackend
+- build-depends:
   - qtbase
   - qtjsbackend
-- name: qtdeclarative
-  repo: upstream:qt5/qtdeclarative
+  name: qtscript
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtscript
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtscript
-- name: qtquick1
-  repo: upstream:qt5/qtquick1
+  name: qtdeclarative
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtdeclarative
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtscript
-- name: qt3d
-  repo: upstream:qt5/qt3d
+  name: qtquick1
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtquick1
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtscript
   - qtdeclarative
-- name: qtquickcontrols
-  repo: upstream:qt5/qtquickcontrols
+  name: qt3d
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qt3d
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtdeclarative
-- name: qtsensors
-  repo: upstream:qt5/qtsensors
+  name: qtquickcontrols
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtquickcontrols
+- build-depends:
   - qtbase
-- name: qtserialport
-  repo: upstream:qt5/qtserialport
+  name: qtsensors
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtsensors
+- build-depends:
   - qtbase
-- name: qtx11extras
-  repo: upstream:qt5/qtx11extras
+  name: qtserialport
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtserialport
+- build-depends:
   - qtbase
-- name: qtwebkit
-  repo: upstream:qt5/qtwebkit
+  name: qtx11extras
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtx11extras
+- build-depends:
   - qtbase
   - sqlite3
   - icu
   - ruby-1.9
   - qtjsbackend
   - qtdeclarative
-- name: qtwebkit-examples
-  repo: upstream:qt5/qtwebkit-examples
+  name: qtwebkit
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtwebkit
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtdeclarative
   - qtwebkit
-- name: qtmultimedia
-  repo: upstream:qt5/qtmultimedia
+  name: qtwebkit-examples
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtwebkit-examples
+- build-depends:
   - qtbase
-- name: qtxmlpatterns
-  repo: upstream:qt5/qtxmlpatterns
+  name: qtmultimedia
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtmultimedia
+- build-depends:
   - qtbase
-- name: qtdoc
-  repo: upstream:qt5/qtdoc
+  name: qtxmlpatterns
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtxmlpatterns
+- build-depends:
   - qtbase
-- name: qtgraphicaleffects
-  repo: upstream:qt5/qtgraphicaleffects
+  name: qtdoc
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtdoc
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtdeclarative
-- name: qtimageformats
-  repo: upstream:qt5/qtimageformats
+  name: qtgraphicaleffects
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtgraphicaleffects
+- build-depends:
   - qtbase
-- name: qttools
-  repo: upstream:qt5/qttools
+  name: qtimageformats
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qtimageformats
+- build-depends:
   - qtbase
   - qtjsbackend
   - qtdeclarative
   - qtwebkit
-- name: qttranslations
-  repo: upstream:qt5/qttranslations
+  name: qttools
   ref: baserock/morph
-  build-depends:
+  repo: upstream:qt5/qttools
+- build-depends:
   - qtbase
   - qttools
+  name: qttranslations
+  ref: baserock/morph
+  repo: upstream:qt5/qttranslations
+description: Qt5 Development Libraries and Tools
+kind: stratum
+name: qt5-tools
diff --git a/tools.morph b/tools.morph
index c60581b7..9d01a50b 100644
--- a/tools.morph
+++ b/tools.morph
@@ -1,109 +1,109 @@
-name: tools
-description: Extra development tools included in the devel system
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-  morph: foundation
+  repo: baserock:baserock/morphs
 chunks:
-- name: patch
+- build-depends: []
+  name: patch
+  ref: baserock/morph
   repo: upstream:patch
+- build-depends: []
+  name: python-ttystatus
   ref: baserock/morph
-  build-depends: []
-- name: python-ttystatus
   repo: upstream:python-ttystatus
+- build-depends: []
+  name: python-coveragepy
   ref: baserock/morph
-  build-depends: []
-- name: python-coveragepy
   repo: upstream:python-coveragepy
+- build-depends:
+  - python-coveragepy
+  name: python-coverage-test-runner
   ref: baserock/morph
-  build-depends: []
-- name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
+- build-depends:
+  - python-coverage-test-runner
+  name: cliapp
   ref: baserock/morph
-  build-depends:
-  - python-coveragepy
-- name: cliapp
   repo: upstream:cliapp
+- build-depends: []
+  name: python-markdown
   ref: baserock/morph
-  build-depends:
-  - python-coverage-test-runner
-- name: python-markdown
   repo: upstream:python-markdown
-  ref: baserock/morph
-  build-depends: []
-- name: cmdtest
-  repo: upstream:cmdtest
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - cliapp
   - python-ttystatus
   - python-markdown
-- name: coreutils
-  repo: upstream:coreutils
+  name: cmdtest
   ref: baserock/morph
-  build-depends:
+  repo: upstream:cmdtest
+- build-depends:
   - patch
-- name: distcc
+  name: coreutils
+  ref: baserock/morph
+  repo: upstream:coreutils
+- build-depends: []
+  name: distcc
+  ref: baserock/morph
   repo: upstream:distcc
+- build-depends: []
+  name: e2fsprogs
   ref: baserock/morph
-  build-depends: []
-- name: e2fsprogs
   repo: upstream:e2fsprogs
+- build-depends: []
+  name: file
   ref: baserock/morph
-  build-depends: []
-- name: file
   repo: upstream:file
+- build-depends: []
+  name: gdb
   ref: baserock/morph
-  build-depends: []
-- name: gdb
   repo: upstream:gdb
+- build-depends: []
+  name: less
   ref: baserock/morph
-  build-depends: []
-- name: less
   repo: upstream:less
+- build-depends: []
+  name: linux-user-chroot
   ref: baserock/morph
-  build-depends: []
-- name: linux-user-chroot
   repo: upstream:linux-user-chroot
+- build-depends: []
+  name: lsof
   ref: baserock/morph
-  build-depends: []
-- name: lsof
   repo: upstream:lsof
-  ref: baserock/morph
-  build-depends: []
-- name: morph
-  repo: baserock:baserock/morph
-  ref: master
-  build-depends:
+- build-depends:
   - cliapp
   - cmdtest
   - python-coverage-test-runner
-- name: pv
+  name: morph
+  ref: master
+  repo: baserock:baserock/morph
+- build-depends: []
+  name: pv
+  ref: baserock/morph
   repo: upstream:pv
+- build-depends: []
+  name: rsync
   ref: baserock/morph
-  build-depends: []
-- name: rsync
   repo: upstream:rsync
+- build-depends: []
+  name: strace
   ref: baserock/morph
-  build-depends: []
-- name: strace
   repo: upstream:strace
-  ref: baserock/morph
-  build-depends: []
-- name: vala
-  repo: upstream:vala
+- build-depends: []
+  name: vala
   ref: baserock/bootstrap
-  build-depends: []
-- name: vim
+  repo: upstream:vala
+- build-depends: []
+  name: vim
+  ref: baserock/morph
   repo: upstream:vim
+- build-depends: []
+  name: screen
   ref: baserock/morph
-  build-depends: []
-- name: screen
   repo: upstream:screen
+- build-depends: []
+  name: u-boot
   ref: baserock/morph
-  build-depends: []
-- name: u-boot
   repo: upstream:u-boot
-  ref: baserock/morph
-  build-depends: []
+description: Extra development tools included in the devel system
+kind: stratum
+name: tools
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index f6ad8afb..a44fccdd 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -1,30 +1,30 @@
-name: wayland-armv7-versatile
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: libxkbcommon
-  repo: upstream:xorg-lib-libxkbcommon
+- build-depends: []
+  name: libxkbcommon
   ref: baserock/morph
-  build-depends: []
-- name: wayland
-  repo: upstream:wayland
-  ref: baserock/genivi/wayland
-  build-depends:
+  repo: upstream:xorg-lib-libxkbcommon
+- build-depends:
   - libxkbcommon
-- name: mesa-wayland
-  repo: upstream:mesa
-  ref: baserock/genivi/baseline-armv7-versatile
-  build-depends:
+  name: wayland
+  ref: baserock/genivi/wayland
+  repo: upstream:wayland
+- build-depends:
   - wayland
+  name: mesa-wayland
+  ref: baserock/genivi/baseline-armv7-versatile
+  repo: upstream:mesa
+kind: stratum
+name: wayland-armv7-versatile
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 0de02ad4..19e496c1 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -1,30 +1,30 @@
-name: wayland-x86_64-generic
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: libxkbcommon
-  repo: upstream:xorg-lib-libxkbcommon
+- build-depends: []
+  name: libxkbcommon
   ref: baserock/morph
-  build-depends: []
-- name: wayland
-  repo: upstream:wayland
-  ref: baserock/genivi/wayland
-  build-depends:
+  repo: upstream:xorg-lib-libxkbcommon
+- build-depends:
   - libxkbcommon
-- name: mesa-wayland
-  repo: upstream:mesa
-  ref: baserock/genivi/morph
-  build-depends:
+  name: wayland
+  ref: baserock/genivi/wayland
+  repo: upstream:wayland
+- build-depends:
   - wayland
+  name: mesa-wayland
+  ref: baserock/genivi/morph
+  repo: upstream:mesa
+kind: stratum
+name: wayland-x86_64-generic
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index 98c06bc2..555e01d8 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -1,94 +1,89 @@
-name: x-armv7-versatile
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: mesa-x
-  repo: upstream:mesa
+- build-depends: []
+  name: mesa-x
   ref: baserock/genivi/baseline-armv7-versatile
-  build-depends: []
-- name: xorg-lib-libxkbfile
+  repo: upstream:mesa
+- build-depends: []
+  name: xorg-lib-libxkbfile
+  ref: baserock/morph
   repo: upstream:xorg-lib-libxkbfile
+- build-depends: []
+  name: pixman
   ref: baserock/morph
-  build-depends: []
-- name: pixman
   repo: upstream:pixman
+- build-depends: []
+  name: xorg-font-util
   ref: baserock/morph
-  build-depends: []
-- name: xorg-font-util
   repo: upstream:xorg-font-util
+- build-depends:
+  - xorg-font-util
+  name: xorg-lib-libfontenc
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
+- build-depends: []
+  name: freetype2
   ref: baserock/morph
-  build-depends:
-  - xorg-font-util
-- name: freetype2
   repo: upstream:freetype2
-  ref: baserock/morph
-  build-depends: []
-- name: fontconfig
-  repo: upstream:fontconfig
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - freetype2
-- name: xorg-lib-libXfont
-  repo: upstream:xorg-lib-libXfont
+  name: fontconfig
   ref: baserock/morph
-  build-depends:
+  repo: upstream:fontconfig
+- build-depends:
   - freetype2
   - xorg-lib-libfontenc
-- name: xorg-lib-libICE
-  repo: upstream:xorg-lib-libICE
+  name: xorg-lib-libXfont
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libSM
-  repo: upstream:xorg-lib-libSM
+  repo: upstream:xorg-lib-libXfont
+- build-depends: []
+  name: xorg-lib-libICE
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libICE
+- build-depends:
   - xorg-lib-libICE
-- name: xorg-lib-libXt
-  repo: upstream:xorg-lib-libXt
+  name: xorg-lib-libSM
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libSM
+- build-depends:
   - xorg-lib-libSM
-- name: xorg-lib-libXmu
-  repo: upstream:xorg-lib-libXmu
+  name: xorg-lib-libXt
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXt
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXpm
-  repo: upstream:xorg-lib-libXpm
+  name: xorg-lib-libXmu
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXmu
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXaw
-  repo: upstream:xorg-lib-libXaw
+  name: xorg-lib-libXpm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXpm
+- build-depends:
   - xorg-lib-libXmu
   - xorg-lib-libXpm
   - xorg-lib-libXt
-- name: libsha1
-  repo: upstream:libsha1
+  name: xorg-lib-libXaw
   ref: baserock/morph
-  build-depends: []
-- name: xserver
-  repo: upstream:xserver
+  repo: upstream:xorg-lib-libXaw
+- build-depends: []
+  name: libsha1
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libsha1
+- build-depends:
   - libsha1
   - mesa-x
   - pixman
@@ -100,63 +95,68 @@ chunks:
   - xorg-lib-libXt
   - xorg-lib-libfontenc
   - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
-  repo: upstream:xorg-driver-xf86-video-cirrus
+  name: xserver
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xserver
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-fbdev
-  repo: upstream:xorg-driver-xf86-video-fbdev
+  name: xorg-driver-xf86-video-cirrus
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-cirrus
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-vesa
-  repo: upstream:xorg-driver-xf86-video-vesa
+  name: xorg-driver-xf86-video-fbdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-fbdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-evdev
-  repo: upstream:xorg-driver-xf86-input-evdev
+  name: xorg-driver-xf86-video-vesa
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-vesa
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-keyboard
-  repo: upstream:xorg-driver-xf86-input-keyboard
+  name: xorg-driver-xf86-input-evdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-evdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-mouse
-  repo: upstream:xorg-driver-xf86-input-mouse
+  name: xorg-driver-xf86-input-keyboard
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-keyboard
+- build-depends:
   - xserver
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
+  name: xorg-driver-xf86-input-mouse
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-mouse
+- build-depends:
   - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
+  name: xorg-app-xkbcomp
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xkbcomp
+- build-depends:
   - xorg-app-xkbcomp
-- name: xorg-app-xinit
-  repo: upstream:xorg-app-xinit
+  name: xkeyboard-config
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libXft
-  repo: upstream:xorg-lib-libXft
+  repo: upstream:xkeyboard-config
+- build-depends: []
+  name: xorg-app-xinit
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xinit
+- build-depends:
   - fontconfig
   - freetype2
-- name: xcb-util
-  repo: upstream:xcb-util
+  name: xorg-lib-libXft
   ref: baserock/morph
-  build-depends: []
-- name: xterm
-  repo: upstream:xterm
+  repo: upstream:xorg-lib-libXft
+- build-depends: []
+  name: xcb-util
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xcb-util
+- build-depends:
   - xorg-lib-libXaw
   - xorg-lib-libxkbfile
+  name: xterm
+  ref: baserock/morph
+  repo: upstream:xterm
+kind: stratum
+name: x-armv7-versatile
diff --git a/x-common.morph b/x-common.morph
index 586fb417..657708fd 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -1,185 +1,180 @@
-name: x-common
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: llvm
+- build-depends: []
+  name: llvm
+  ref: baserock/morph
   repo: upstream:llvm
+- build-depends: []
+  name: libpng
   ref: baserock/morph
-  build-depends: []
-- name: libpng
   repo: upstream:libpng
+- build-depends: []
+  name: libjpeg
   ref: baserock/morph
-  build-depends: []
-- name: libjpeg
   repo: upstream:libjpeg
+- build-depends: []
+  name: xorg-util-macros
   ref: baserock/morph
-  build-depends: []
-- name: xorg-util-macros
   repo: upstream:xorg-util-macros
+- build-depends:
+  - xorg-util-macros
+  name: xorg-proto-bigreqsproto
   ref: baserock/morph
-  build-depends: []
-- name: xorg-proto-bigreqsproto
   repo: upstream:xorg-proto-bigreqsproto
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-compositeproto
-  repo: upstream:xorg-proto-compositeproto
+  name: xorg-proto-compositeproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-compositeproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-damageproto
-  repo: upstream:xorg-proto-damageproto
+  name: xorg-proto-damageproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-damageproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-dmxproto
-  repo: upstream:xorg-proto-dmxproto
+  name: xorg-proto-dmxproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-dmxproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-fixesproto
-  repo: upstream:xorg-proto-fixesproto
+  name: xorg-proto-fixesproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-fixesproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-fontsproto
-  repo: upstream:xorg-proto-fontsproto
+  name: xorg-proto-fontsproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-fontsproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-glproto
-  repo: upstream:xorg-proto-glproto
+  name: xorg-proto-glproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-glproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-inputproto
-  repo: upstream:xorg-proto-inputproto
+  name: xorg-proto-inputproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-inputproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-kbproto
-  repo: upstream:xorg-proto-kbproto
+  name: xorg-proto-kbproto
   ref: baserock/morph
-  build-depends:
-  - xorg-util-macros
-- name: xorg-proto-xineramaproto
-  repo: upstream:xorg-proto-xineramaproto
-  ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-kbproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-randrproto
-  repo: upstream:xorg-proto-randrproto
+  name: xorg-proto-xineramaproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xineramaproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-recordproto
-  repo: upstream:xorg-proto-recordproto
+  name: xorg-proto-randrproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-randrproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-renderproto
-  repo: upstream:xorg-proto-renderproto
+  name: xorg-proto-recordproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-recordproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-resourceproto
-  repo: upstream:xorg-proto-resourceproto
+  name: xorg-proto-renderproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-renderproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-scrnsaverproto
-  repo: upstream:xorg-proto-scrnsaverproto
+  name: xorg-proto-resourceproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-resourceproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-videoproto
-  repo: upstream:xorg-proto-videoproto
+  name: xorg-proto-scrnsaverproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-scrnsaverproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xcmiscproto
-  repo: upstream:xorg-proto-xcmiscproto
+  name: xorg-proto-videoproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-videoproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xextproto
-  repo: upstream:xorg-proto-xextproto
+  name: xorg-proto-xcmiscproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xcmiscproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xf86bigfontproto
-  repo: upstream:xorg-proto-xf86bigfontproto
+  name: xorg-proto-xextproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xextproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xf86dgaproto
-  repo: upstream:xorg-proto-xf86dgaproto
+  name: xorg-proto-xf86bigfontproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xf86bigfontproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xf86driproto
-  repo: upstream:xorg-proto-xf86driproto
+  name: xorg-proto-xf86dgaproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xf86dgaproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-xf86vidmodeproto
-  repo: upstream:xorg-proto-xf86vidmodeproto
+  name: xorg-proto-xf86driproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xf86driproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-x11proto
-  repo: upstream:xorg-proto-x11proto
+  name: xorg-proto-xf86vidmodeproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-xf86vidmodeproto
+- build-depends:
   - xorg-util-macros
-- name: xorg-proto-dri2proto
-  repo: upstream:xorg-proto-dri2proto
+  name: xorg-proto-x11proto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-x11proto
+- build-depends:
   - xorg-util-macros
-- name: xcb-pthread-stubs
-  repo: upstream:xcb-pthread-stubs
+  name: xorg-proto-dri2proto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-dri2proto
+- build-depends:
   - xorg-util-macros
-- name: xcb-proto
-  repo: upstream:xcb-proto
+  name: xcb-pthread-stubs
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xcb-pthread-stubs
+- build-depends:
   - xorg-util-macros
-- name: xorg-lib-libXau
-  repo: upstream:xorg-lib-libXau
+  name: xcb-proto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xcb-proto
+- build-depends:
   - xorg-proto-x11proto
   - xorg-util-macros
-- name: xcb-libxcb
-  repo: upstream:xcb-libxcb
+  name: xorg-lib-libXau
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXau
+- build-depends:
   - xcb-proto
   - xcb-pthread-stubs
   - xorg-lib-libXau
   - xorg-util-macros
-- name: xorg-lib-libxtrans
-  repo: upstream:xorg-lib-libxtrans
+  name: xcb-libxcb
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xcb-libxcb
+- build-depends:
   - xorg-util-macros
-- name: xorg-lib-libX11
-  repo: upstream:xorg-lib-libX11
+  name: xorg-lib-libxtrans
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libxtrans
+- build-depends:
   - xcb-libxcb
   - xorg-lib-libXau
   - xorg-lib-libxtrans
@@ -191,68 +186,68 @@ chunks:
   - xorg-proto-xextproto
   - xorg-proto-xf86bigfontproto
   - xorg-util-macros
-- name: xorg-lib-libpciaccess
-  repo: upstream:xorg-lib-libpciaccess
+  name: xorg-lib-libX11
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libX11
+- build-depends:
   - xorg-util-macros
-- name: drm
-  repo: upstream:drm
+  name: xorg-lib-libpciaccess
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libpciaccess
+- build-depends:
   - xcb-pthread-stubs
   - xorg-lib-libpciaccess
-- name: xorg-lib-libXext
-  repo: upstream:xorg-lib-libXext
+  name: drm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:drm
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXau
   - xorg-proto-x11proto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-lib-libXi
-  repo: upstream:xorg-lib-libXi
+  name: xorg-lib-libXext
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXext
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-proto-inputproto
   - xorg-proto-x11proto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-util-makedepend
-  repo: upstream:xorg-util-makedepend
+  name: xorg-lib-libXi
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXi
+- build-depends:
   - xorg-proto-x11proto
   - xorg-util-macros
-- name: xorg-lib-libXfixes
-  repo: upstream:xorg-lib-libXfixes
+  name: xorg-util-makedepend
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-util-makedepend
+- build-depends:
   - xorg-lib-libXext
   - xorg-proto-fixesproto
   - xorg-util-macros
-- name: xorg-lib-libXcomposite
-  repo: upstream:xorg-lib-libXcomposite
+  name: xorg-lib-libXfixes
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXfixes
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXfixes
   - xorg-proto-compositeproto
   - xorg-util-macros
-- name: xorg-lib-libXrender
-  repo: upstream:xorg-lib-libXrender
+  name: xorg-lib-libXcomposite
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXcomposite
+- build-depends:
   - xorg-lib-libX11
   - xorg-proto-renderproto
   - xorg-util-macros
-- name: xorg-lib-libXrandr
-  repo: upstream:xorg-lib-libXrandr
+  name: xorg-lib-libXrender
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXrender
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-lib-libXrender
@@ -260,28 +255,28 @@ chunks:
   - xorg-proto-renderproto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-lib-libXinerama
-  repo: upstream:xorg-lib-libXinerama
+  name: xorg-lib-libXrandr
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXrandr
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-proto-xextproto
   - xorg-proto-xineramaproto
   - xorg-util-macros
-- name: xorg-lib-libdmx
-  repo: upstream:xorg-lib-libdmx
+  name: xorg-lib-libXinerama
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXinerama
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-proto-dmxproto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-lib-libXtst
-  repo: upstream:xorg-lib-libXtst
+  name: xorg-lib-libdmx
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libdmx
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-lib-libXi
@@ -289,50 +284,55 @@ chunks:
   - xorg-proto-recordproto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-lib-libXRes
-  repo: upstream:xorg-lib-libXRes
+  name: xorg-lib-libXtst
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXtst
+- build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
   - xorg-proto-resourceproto
   - xorg-proto-xextproto
   - xorg-util-macros
-- name: xorg-lib-libXdamage
-  repo: upstream:xorg-lib-libXdamage
+  name: xorg-lib-libXRes
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXRes
+- build-depends:
   - xorg-lib-libXfixes
   - xorg-proto-damageproto
   - xorg-util-macros
-- name: xorg-lib-libXcursor
-  repo: upstream:xorg-lib-libXcursor
+  name: xorg-lib-libXdamage
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXdamage
+- build-depends:
   - xorg-util-macros
   - xorg-lib-libXrender
   - xorg-lib-libXfixes
   - xorg-proto-fixesproto
   - xorg-lib-libXau
   - xorg-lib-libX11
-- name: xorg-proto-printproto
-  repo: upstream:xorg-proto-printproto
+  name: xorg-lib-libXcursor
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXcursor
+- build-depends:
   - xorg-util-macros
-- name: xorg-lib-libXp
-  repo: upstream:xorg-lib-libXp
+  name: xorg-proto-printproto
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-proto-printproto
+- build-depends:
   - xorg-proto-printproto
   - xorg-proto-xextproto
   - xorg-lib-libXext
   - xorg-lib-libX11
-- name: xorg-lib-libXScrnSaver
-  repo: upstream:xorg-lib-libXScrnSaver
+  name: xorg-lib-libXp
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXp
+- build-depends:
   - xorg-proto-scrnsaverproto
   - xorg-proto-xextproto
   - xorg-lib-libXext
   - xorg-lib-libX11
+  name: xorg-lib-libXScrnSaver
+  ref: baserock/morph
+  repo: upstream:xorg-lib-libXScrnSaver
+kind: stratum
+name: x-common
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index d5f2e0b5..6ec5c724 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -1,98 +1,93 @@
-name: x-x86_64-generic
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: mesa-x
-  repo: upstream:mesa
+- build-depends: []
+  name: mesa-x
   ref: baserock/genivi/morph
-  build-depends: []
-- name: xorg-lib-libxkbfile
+  repo: upstream:mesa
+- build-depends: []
+  name: xorg-lib-libxkbfile
+  ref: baserock/morph
   repo: upstream:xorg-lib-libxkbfile
+- build-depends: []
+  name: pixman
   ref: baserock/morph
-  build-depends: []
-- name: pixman
   repo: upstream:pixman
+- build-depends: []
+  name: xorg-font-util
   ref: baserock/morph
-  build-depends: []
-- name: xorg-font-util
   repo: upstream:xorg-font-util
+- build-depends:
+  - xorg-font-util
+  name: xorg-lib-libfontenc
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
+- build-depends: []
+  name: freetype2
   ref: baserock/morph
-  build-depends:
-  - xorg-font-util
-- name: freetype2
   repo: upstream:freetype2
+- build-depends:
+  - freetype2
+  name: fontconfig
   ref: baserock/morph
-  build-depends: []
-- name: fontconfig
   repo: upstream:fontconfig
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - freetype2
-- name: xorg-lib-libXfont
+  - xorg-lib-libfontenc
+  name: xorg-lib-libXfont
+  ref: baserock/morph
   repo: upstream:xorg-lib-libXfont
+- build-depends: []
+  name: freefont-otf
   ref: baserock/morph
-  build-depends:
-  - freetype2
-  - xorg-lib-libfontenc
-- name: freefont-otf
   repo: upstream:freefont-otf
+- build-depends: []
+  name: xorg-lib-libICE
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libICE
   repo: upstream:xorg-lib-libICE
-  ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libSM
-  repo: upstream:xorg-lib-libSM
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - xorg-lib-libICE
-- name: xorg-lib-libXt
-  repo: upstream:xorg-lib-libXt
+  name: xorg-lib-libSM
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libSM
+- build-depends:
   - xorg-lib-libSM
-- name: xorg-lib-libXmu
-  repo: upstream:xorg-lib-libXmu
+  name: xorg-lib-libXt
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXt
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXpm
-  repo: upstream:xorg-lib-libXpm
+  name: xorg-lib-libXmu
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXmu
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXaw
-  repo: upstream:xorg-lib-libXaw
+  name: xorg-lib-libXpm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXpm
+- build-depends:
   - xorg-lib-libXmu
   - xorg-lib-libXpm
   - xorg-lib-libXt
-- name: libsha1
-  repo: upstream:libsha1
+  name: xorg-lib-libXaw
   ref: baserock/morph
-  build-depends: []
-- name: xserver
-  repo: upstream:xserver
+  repo: upstream:xorg-lib-libXaw
+- build-depends: []
+  name: libsha1
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libsha1
+- build-depends:
   - libsha1
   - mesa-x
   - pixman
@@ -104,81 +99,86 @@ chunks:
   - xorg-lib-libXt
   - xorg-lib-libfontenc
   - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
-  repo: upstream:xorg-driver-xf86-video-cirrus
+  name: xserver
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xserver
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-fbdev
-  repo: upstream:xorg-driver-xf86-video-fbdev
+  name: xorg-driver-xf86-video-cirrus
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-cirrus
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-vesa
-  repo: upstream:xorg-driver-xf86-video-vesa
+  name: xorg-driver-xf86-video-fbdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-fbdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-evdev
-  repo: upstream:xorg-driver-xf86-input-evdev
+  name: xorg-driver-xf86-video-vesa
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-vesa
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-keyboard
-  repo: upstream:xorg-driver-xf86-input-keyboard
+  name: xorg-driver-xf86-input-evdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-evdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-mouse
-  repo: upstream:xorg-driver-xf86-input-mouse
+  name: xorg-driver-xf86-input-keyboard
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-keyboard
+- build-depends:
   - xserver
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
+  name: xorg-driver-xf86-input-mouse
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-mouse
+- build-depends:
   - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
+  name: xorg-app-xkbcomp
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xkbcomp
+- build-depends:
   - xorg-app-xkbcomp
-- name: xorg-app-xinit
-  repo: upstream:xorg-app-xinit
+  name: xkeyboard-config
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libXft
-  repo: upstream:xorg-lib-libXft
+  repo: upstream:xkeyboard-config
+- build-depends: []
+  name: xorg-app-xinit
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xinit
+- build-depends:
   - fontconfig
   - freetype2
-- name: xcb-util
+  name: xorg-lib-libXft
+  ref: baserock/morph
+  repo: upstream:xorg-lib-libXft
+- build-depends: []
+  name: xcb-util
+  ref: baserock/morph
   repo: upstream:xcb-util
+- build-depends: []
+  name: util-wm
   ref: baserock/morph
-  build-depends: []
-- name: util-wm
   repo: upstream:util-wm
+- build-depends: []
+  name: util-keysyms
   ref: baserock/morph
-  build-depends: []
-- name: util-keysyms
   repo: upstream:util-keysyms
-  ref: baserock/morph
-  build-depends: []
-- name: util-image
-  repo: upstream:util-image
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - xcb-util
-- name: xterm
-  repo: upstream:xterm
+  name: util-image
   ref: baserock/morph
-  build-depends:
+  repo: upstream:util-image
+- build-depends:
   - xorg-lib-libXaw
   - xorg-lib-libxkbfile
-- name: xorg-app-xauth
-  repo: upstream:xorg-app-xauth
+  name: xterm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xterm
+- build-depends:
   - xorg-lib-libXmu
+  name: xorg-app-xauth
+  ref: baserock/morph
+  repo: upstream:xorg-app-xauth
+kind: stratum
+name: x-x86_64-generic
diff --git a/xfce-system.morph b/xfce-system.morph
index bb66eb48..63f7452e 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -1,58 +1,58 @@
-name: xfce-system
-description: A GENIVI devel with XFCE
-kind: system
 arch: x86_64
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A GENIVI devel with XFCE
 disk-size: 2G
+kind: system
+name: xfce-system
 strata:
 - morph: build-essential
-  repo: baserock:baserock/morphs
   ref: master
-- morph: core
   repo: baserock:baserock/morphs
+- morph: core
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: bsp-x86_64-generic
   ref: master
-- morph: connectivity
   repo: baserock:baserock/morphs
+- morph: connectivity
   ref: master
-- morph: audio-bluetooth
   repo: baserock:baserock/morphs
+- morph: audio-bluetooth
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
-- morph: x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
-- morph: multimedia
   repo: baserock:baserock/morphs
+- morph: multimedia
   ref: master
-- morph: genivi
   repo: baserock:baserock/morphs
+- morph: genivi
   ref: master
-- morph: genivi-x-x86_64-generic
   repo: baserock:baserock/morphs
+- morph: genivi-x-x86_64-generic
   ref: master
-- morph: gtk2
   repo: baserock:baserock/morphs
+- morph: gtk2
   ref: baserock/xfce-build-rebase-2
-- morph: tools
   repo: baserock:baserock/morphs
+- morph: tools
   ref: master
-- morph: xfce
   repo: baserock:baserock/morphs
+- morph: xfce
   ref: baserock/xfce-build-rebase-2
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
+  repo: baserock:baserock/morphs
diff --git a/xfce.morph b/xfce.morph
index b85ecce7..e720cc01 100644
--- a/xfce.morph
+++ b/xfce.morph
@@ -1,132 +1,132 @@
-name: xfce
-description: xfce stratum
-kind: stratum
 build-depends:
-- repo: baserock:baserock/morphs
-  morph: genivi-x-x86_64-generic
+- morph: genivi-x-x86_64-generic
   ref: master
-- morph: gtk2
   repo: baserock:baserock/morphs
+- morph: gtk2
   ref: baserock/xfce-build-rebase-2
-- repo: baserock:baserock/morphs
-  morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+- morph: x-x86_64-generic
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: xfce-dev-tools
-  repo: upstream:xfce/xfce4-dev-tools
-  ref: baserock/morph
-  build-depends: []
-- name: libxfce4util
-  repo: upstream:xfce/libxfce4util
+- build-depends: []
+  name: xfce-dev-tools
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfce4-dev-tools
+- build-depends:
   - xfce-dev-tools
-- name: xfconf
-  repo: upstream:xfce/xfconf
+  name: libxfce4util
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/libxfce4util
+- build-depends:
   - xfce-dev-tools
   - libxfce4util
-- name: libxfce4ui
-  repo: upstream:xfce/libxfce4ui
+  name: xfconf
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfconf
+- build-depends:
   - xfce-dev-tools
   - libxfce4util
   - xfconf
-- name: garcon
-  repo: upstream:xfce/garcon
+  name: libxfce4ui
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/libxfce4ui
+- build-depends:
   - libxfce4util
-- name: perl-uri
-  repo: upstream:libwww-perl/uri
+  name: garcon
   ref: baserock/morph
-  build-depends: []
-- name: exo
-  repo: upstream:xfce/exo
+  repo: upstream:xfce/garcon
+- build-depends: []
+  name: perl-uri
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libwww-perl/uri
+- build-depends:
   - libxfce4util
   - libxfce4ui
   - perl-uri
-- name: libwnck
-  repo: upstream:libwnck
-  ref: baserock/xfce-build
-  build-depends: []
-- name: xfce4-panel
-  repo: upstream:xfce/xfce4-panel
+  name: exo
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/exo
+- build-depends: []
+  name: libwnck
+  ref: baserock/xfce-build
+  repo: upstream:libwnck
+- build-depends:
   - libxfce4ui
   - garcon
   - exo
   - libwnck
-- name: thunar
-  repo: upstream:xfce/thunar
+  name: xfce4-panel
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfce4-panel
+- build-depends:
   - libxfce4ui
   - exo
   - garcon
   - libwnck
-- name: xfce4-settings
-  repo: upstream:xfce/xfce4-settings
+  name: thunar
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/thunar
+- build-depends:
   - xfce-dev-tools
   - xfconf
   - exo
   - libxfce4ui
   - garcon
-- name: iceauth
-  repo: upstream:iceauth
+  name: xfce4-settings
   ref: baserock/morph
-  build-depends: []
-- name: xfce4-session
-  repo: upstream:xfce/xfce4-session
+  repo: upstream:xfce/xfce4-settings
+- build-depends: []
+  name: iceauth
   ref: baserock/morph
-  build-depends:
+  repo: upstream:iceauth
+- build-depends:
   - iceauth
   - exo
   - xfce-dev-tools
   - libxfce4ui
   - libwnck
-- name: gtk-xfce-engine-2
-  repo: upstream:xfce/gtk-xfce-engine
+  name: xfce4-session
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfce4-session
+- build-depends:
   - xfce-dev-tools
-- name: xfdesktop
-  repo: upstream:xfce/xfdesktop
+  name: gtk-xfce-engine-2
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/gtk-xfce-engine
+- build-depends:
   - exo
   - libxfce4ui
   - xfconf
   - libwnck
-- name: xfwm4
-  repo: upstream:xfce/xfwm4
+  name: xfdesktop
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfdesktop
+- build-depends:
   - exo
   - libxfce4util
   - libxfce4ui
   - xfconf
   - libwnck
-- name: xfce4-appfinder
-  repo: upstream:xfce/xfce4-appfinder
+  name: xfwm4
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfwm4
+- build-depends:
   - exo
   - libxfce4ui
   - garcon
-- name: tumbler
-  repo: upstream:xfce/tumbler
+  name: xfce4-appfinder
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xfce/xfce4-appfinder
+- build-depends:
   - xfce-dev-tools
-- name: elementary-xfce
-  repo: upstream:elementary-xfce
+  name: tumbler
   ref: baserock/morph
-  build-depends: []
+  repo: upstream:xfce/tumbler
+- build-depends: []
+  name: elementary-xfce
+  ref: baserock/morph
+  repo: upstream:elementary-xfce
+description: xfce stratum
+kind: stratum
+name: xfce