Move systems/strata into subdirs

154 files changed, 1188 insertions, 847 deletions

diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
deleted file mode 100644
index ab535ea0..00000000
--- a/base-system-x86_32-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-description: The set of strata required to have a basic system for a 32-bit x86
-  system.
-kind: system
-name: base-system-x86_32-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: cloudinit-support
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
deleted file mode 100644
index 36332d42..00000000
--- a/base-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-description: The set of strata required to have a minimal system for a 64-bit x86
-  system.
-kind: system
-name: base-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: cloudinit-support
diff --git a/cross-bootstrap-system-armv7lhf-generic.morph b/cross-bootstrap-system-armv7lhf-generic.morph
deleted file mode 100644
index 6195bd1a..00000000
--- a/cross-bootstrap-system-armv7lhf-generic.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-arch: armv7lhf
-description: A system that produces the minimum needed to build a devel system
-kind: system
-name: cross-bootstrap-system-armv7lhf-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
diff --git a/cross-bootstrap-system-ppc64-generic.morph b/cross-bootstrap-system-ppc64-generic.morph
deleted file mode 100644
index 9a05a90b..00000000
--- a/cross-bootstrap-system-ppc64-generic.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-arch: ppc64
-description: A system that produces the minimum needed to build a devel system
-kind: system
-name: cross-bootstrap-system-ppc64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
diff --git a/cross-bootstrap-system-x86_64-generic.morph b/cross-bootstrap-system-x86_64-generic.morph
deleted file mode 100644
index 6c7986e8..00000000
--- a/cross-bootstrap-system-x86_64-generic.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-arch: x86_64
-description: A system that produces the minimum needed to build a devel system
-kind: system
-name: cross-bootstrap-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
diff --git a/cxmanage-system-x86_64-generic.morph b/cxmanage-system-x86_64-generic.morph
deleted file mode 100644
index cf9ac809..00000000
--- a/cxmanage-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: cxmanage-system-x86_64-generic
-description: A baserock development system with calxeda management tools added
-kind: system
-arch: x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: cxmanage
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- fstab
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
deleted file mode 100644
index a4ebd37e..00000000
--- a/devel-system-armv7-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-armv7-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
deleted file mode 100644
index 2fc3e585..00000000
--- a/devel-system-armv7-versatile.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-armv7-versatile
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-versatile
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
deleted file mode 100644
index 08aeb4af..00000000
--- a/devel-system-armv7-wandboard.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the Wandboard.
-kind: system
-name: devel-system-armv7-wandboard
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-wandboard
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
deleted file mode 100644
index bbb50976..00000000
--- a/devel-system-armv7b-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7b
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-armv7b-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph
deleted file mode 100644
index 7a9fd2cd..00000000
--- a/devel-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-armv7lhf-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7lhf-jetson.morph b/devel-system-armv7lhf-jetson.morph
deleted file mode 100644
index 4d07ef5d..00000000
--- a/devel-system-armv7lhf-jetson.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the NVIDIA Jetson TK1.
-kind: system
-name: devel-system-armv7lhf-jetson
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
-- morph: bsp-jetson-devel
diff --git a/devel-system-armv7lhf-wandboard.morph b/devel-system-armv7lhf-wandboard.morph
deleted file mode 100644
index c9b7c8a5..00000000
--- a/devel-system-armv7lhf-wandboard.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the Wandboard.
-kind: system
-name: devel-system-armv7lhf-wandboard
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-wandboard
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
deleted file mode 100644
index cbe42301..00000000
--- a/devel-system-ppc64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: ppc64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit PowerPc
-  architecture.
-kind: system
-name: devel-system-ppc64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-ppc64-generic
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-x86_32-chroot.morph b/devel-system-x86_32-chroot.morph
deleted file mode 100644
index baca2904..00000000
--- a/devel-system-x86_32-chroot.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-x86_32-chroot
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
-- morph: bsp-x86_both-tools
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
deleted file mode 100644
index 5eac853a..00000000
--- a/devel-system-x86_32-generic.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-description: A system that is able to build other systems based on the 32-bit x86
-  architecture.
-kind: system
-name: devel-system-x86_32-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: tools
-- morph: openstack-clients
-- morph: cloudinit-support
diff --git a/devel-system-x86_64-chroot.morph b/devel-system-x86_64-chroot.morph
deleted file mode 100644
index 50c757ea..00000000
--- a/devel-system-x86_64-chroot.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- 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
-name: devel-system-x86_64-chroot
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
-- morph: bsp-x86_both-tools
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
deleted file mode 100644
index 2100221e..00000000
--- a/devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-description: A system that is able to build other systems based on the 64-bit x86
-  architecture.
-kind: system
-name: devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: openstack-clients
-- morph: cloudinit-support
diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
deleted file mode 100644
index a346ad2d..00000000
--- a/devel-system-x86_64-vagrant.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vagrant
-description: A system that is able to build other systems based on the 64-bit x86
-  architecture.  This adds the virtualbox guest additions and vagrant configuration too
-kind: system
-name: devel-system-x86_64-vagrant
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: virtualbox-guest-x86_64
diff --git a/distbuild-system-armv7lhf-highbank.morph b/distbuild-system-armv7lhf-highbank.morph
deleted file mode 100644
index fdad7cc7..00000000
--- a/distbuild-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for armv7lhf highbank
-kind: system
-name: distbuild-system-armv7lhf-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-armv7lhf-jetson.morph b/distbuild-system-armv7lhf-jetson.morph
deleted file mode 100644
index 4bc4102a..00000000
--- a/distbuild-system-armv7lhf-jetson.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for armv7lhf jetson
-kind: system
-name: distbuild-system-armv7lhf-jetson
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-jetson-devel
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-ppc64.morph b/distbuild-system-ppc64.morph
deleted file mode 100644
index 5c09b89e..00000000
--- a/distbuild-system-ppc64.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: ppc64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for ppc64
-kind: system
-name: distbuild-system-ppc64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-ppc64-generic
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-x86_32.morph b/distbuild-system-x86_32.morph
deleted file mode 100644
index 49a7458a..00000000
--- a/distbuild-system-x86_32.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for x86_32
-kind: system
-name: distbuild-system-x86_32
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-x86_64.morph b/distbuild-system-x86_64.morph
deleted file mode 100644
index 52d91626..00000000
--- a/distbuild-system-x86_64.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for x86_64
-kind: system
-name: distbuild-system-x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/example-distbuild-cluster.morph b/example-distbuild-cluster.morph
index 736a5beb..d7c52a0f 100644
--- a/example-distbuild-cluster.morph
+++ b/example-distbuild-cluster.morph
@@ -10,7 +10,7 @@ description: |
   workers to authenticate with the Trove to give them read access to
   all source repositories.
 systems:
-- morph: distbuild-system-x86_64-generic
+- morph: systems/distbuild-system-x86_64-generic.morph
   deploy-defaults:
     TROVE_ID: $MY_TROVE
     CONTROLLERHOST: build-controller
diff --git a/genivi-baseline-system-armv7lhf-versatile.morph b/genivi-baseline-system-armv7lhf-versatile.morph
deleted file mode 100644
index 31185c94..00000000
--- a/genivi-baseline-system-armv7lhf-versatile.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
-description: A GENIVI baseline system for an ARMv7 system.
-kind: system
-name: genivi-baseline-system-armv7lhf-versatile
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-armv7-versatile
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: multimedia
-- morph: genivi
-- morph: wayland-armv7-versatile
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
deleted file mode 100644
index 7b08a895..00000000
--- a/genivi-baseline-system-x86_64-generic.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-description: A GENIVI baseline system for a 64-bit x86 system.
-kind: system
-name: genivi-baseline-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: multimedia
-- morph: genivi
-- morph: wayland-x86_64-generic
diff --git a/gitlab-ci-runner-cluster.morph b/gitlab-ci-runner-cluster.morph
index fe6e3451..fd79039a 100644
--- a/gitlab-ci-runner-cluster.morph
+++ b/gitlab-ci-runner-cluster.morph
@@ -1,7 +1,7 @@
 kind: cluster
 name: gitlab-ci-runner-cluster
 systems:
-- morph: gitlab-ci-runner
+- morph: systems/gitlab-ci-runner.morph
   deploy-defaults:
       AUTOSTART: no
       DISK_SIZE: 6G
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph
deleted file mode 100644
index 9845dcce..00000000
--- a/gitlab-ci-runner.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system to run build tests as part of GitLab CI
-  architecture.
-kind: system
-name: gitlab-ci-runner
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: databases
-- morph: webtools
-- morph: ruby
-- morph: nfs
diff --git a/gitlab-cluster.morph b/gitlab-cluster.morph
index d40bf8f8..fadb9857 100644
--- a/gitlab-cluster.morph
+++ b/gitlab-cluster.morph
@@ -14,7 +14,7 @@ description: |
   need to define a GITLAB_EMAIL, that is the email that mail from your GitLab
   instance will appear to be from.
 systems:
-- morph: gitlab-server
+- morph: systems/gitlab-server.morph
   deploy-defaults:
       AUTOSTART: no
       DISK_SIZE: 10G
@@ -33,7 +33,7 @@ systems:
       CI_PORT: 81
       UNICORN_CI_PORT: 8081
       INSTALL_FILES: gitlab-server/manifest
-- morph: gitlab-ci-runner
+- morph: systems/gitlab-ci-runner.morph
   deploy-defaults:
       AUTOSTART: no
       DISK_SIZE: 10G
diff --git a/gitlab-server-cluster.morph b/gitlab-server-cluster.morph
index 09ff4869..40853dee 100644
--- a/gitlab-server-cluster.morph
+++ b/gitlab-server-cluster.morph
@@ -1,7 +1,7 @@
 kind: cluster
 name: gitlab-server-cluster
 systems:
-- morph: gitlab-server
+- morph: systems/gitlab-server.morph
   deploy-defaults:
       AUTOSTART: no
       DISK_SIZE: 6G
diff --git a/gitlab-server.morph b/gitlab-server.morph
deleted file mode 100644
index 6142b8c6..00000000
--- a/gitlab-server.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- gitlab
-description: system which hosts a gitlab server
-kind: system
-name: gitlab-server
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: nfs
-- morph: databases
-- morph: webtools
-- morph: ruby
-- morph: gitlab
diff --git a/image-package-example.morph b/image-package-example.morph
index eeb5b3f2..898a6400 100644
--- a/image-package-example.morph
+++ b/image-package-example.morph
@@ -3,7 +3,7 @@ kind: cluster
 description: |
   Packaged system and script for installing it, for deferred instantiation.
 systems:
-- morph: base-system-x86_32-generic
+- morph: systems/base-system-x86_32-generic.morph
   deploy:
     imgpkg:
       type: image-package
diff --git a/initramfs-test.morph b/initramfs-test.morph
index 9e69207d..afc94961 100644
--- a/initramfs-test.morph
+++ b/initramfs-test.morph
@@ -1,7 +1,7 @@
 name: initramfs-test
 kind: cluster
 systems:
-- morph: base-system-x86_64-generic
+- morph: systems/base-system-x86_64-generic.morph
   deploy:
     system:
       type: rawdisk
@@ -10,7 +10,7 @@ systems:
       HOSTNAME: initramfs-system
       INITRAMFS_PATH: boot/initramfs.gz
   subsystems:
-  - morph: initramfs-x86_64
+  - morph: systems/initramfs-x86_64.morph
     deploy:
       initramfs:
         type: initramfs
diff --git a/minimal-system-deploy.morph b/minimal-system-deploy.morph
index f6213c39..9733139d 100644
--- a/minimal-system-deploy.morph
+++ b/minimal-system-deploy.morph
@@ -3,7 +3,7 @@ kind: cluster
 description: |
   Deploy a minimal system to a system running KVM
 systems:
-- morph: minimal-system-x86_32-generic
+- morph: systems/minimal-system-x86_32-generic.morph
   deploy:
     vm:
       type: kvm
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
deleted file mode 100644
index 0018fbdf..00000000
--- a/nodejs-system-x86_64.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- 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
-name: nodejs-system-x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: nodejs
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
deleted file mode 100644
index 7a45c0fe..00000000
--- a/qt4-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- 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
-name: qt4-devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: qt4-tools
-- morph: qt4-sdk
-- morph: lua
-- morph: connectivity
-- morph: enlightenment
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
deleted file mode 100644
index 2c75333f..00000000
--- a/qt5-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- 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
-name: qt5-devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: qt5-tools
-- morph: qt5-sdk
-- morph: lua
-- morph: connectivity
-- morph: enlightenment
diff --git a/release.morph b/release.morph
index 12b03693..37defb09 100644
--- a/release.morph
+++ b/release.morph
@@ -7,41 +7,41 @@ description: |
   you can deploy the systems yourself, if you are making a Baserock release
   then the script should be used.
 systems:
-- morph: devel-system-x86_32-chroot
+- morph: systems/devel-system-x86_32-chroot.morph
   deploy:
     devel-system-x86_32-chroot:
       type: tar
       location: devel-system-x86_32-chroot.tar
-- morph: devel-system-x86_32-generic
+- morph: systems/devel-system-x86_32-generic.morph
   deploy:
     devel-system-x86_32-generic:
       type: rawdisk
       location: devel-system-x86_32-generic.img
       DISK_SIZE: 4G
-- morph: devel-system-x86_64-chroot
+- morph: systems/devel-system-x86_64-chroot.morph
   deploy:
     devel-system-x86_64-chroot:
       type: tar
       location: devel-system-x86_64-chroot.tar
-- morph: devel-system-x86_64-generic
+- morph: systems/devel-system-x86_64-generic.morph
   deploy:
     devel-system-x86_64-generic:
       type: rawdisk
       location: devel-system-x86_64-generic.img
       DISK_SIZE: 4G
-- morph: devel-system-armv7lhf-wandboard
+- morph: systems/devel-system-armv7lhf-wandboard.morph
   deploy:
     release:
       type: tar
       location: devel-system-armv7lhf-wandboard.tar
-- morph: genivi-baseline-system-x86_64-generic
+- morph: systems/genivi-baseline-system-x86_64-generic.morph
   deploy:
     genivi-baseline-system-x86_64-generic:
       type: rawdisk
       location: genivi-baseline-system-x86_64-generic.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
-- morph: genivi-baseline-system-armv7lhf-versatile
+- morph: systems/genivi-baseline-system-armv7lhf-versatile.morph
   deploy:
     genivi-baseline-system-armv7lhf-versatile:
       type: rawdisk
diff --git a/sdk-example-cluster.morph b/sdk-example-cluster.morph
index da0a6fff..f71d093d 100644
--- a/sdk-example-cluster.morph
+++ b/sdk-example-cluster.morph
@@ -31,7 +31,7 @@ description: |
 
   See the documentation of the sdk.write extension for more information.
 systems:
-- morph: armv7lhf-cross-toolchain-system-x86_32-generic
+- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
   deploy:
     sdk:
       type: sdk
@@ -39,7 +39,7 @@ systems:
       PREFIX: /usr
       TARGET: armv7lhf-baserock-linux-gnueabi
   subsystems:
-  - morph: devel-system-armv7lhf-highbank
+  - morph: systems/devel-system-armv7lhf-highbank.morph
     deploy:
       sysroot:
         type: sysroot
diff --git a/ansible.morph b/strata/ansible.morph
index 00f04750..e92cb9b7 100644
--- a/ansible.morph
+++ b/strata/ansible.morph
@@ -2,7 +2,7 @@ name: ansible
 kind: stratum
 description: A stratum with ansible and its dependencies
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: paramiko
   repo: upstream:paramiko
diff --git a/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 37553c6c..c8e18090 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -2,7 +2,7 @@ name: armv7lhf-cross-toolchain
 kind: stratum
 description: Stratum for building an armv7lhf cross compiler for your native system.
 build-depends:
-- morph: build-essential
+- morph: strata/build-essential.morph
 chunks:
 - name: armv7lhf-cross-binutils
   repo: upstream:binutils-redhat
diff --git a/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index ffb7d5ff..13b8d22d 100644
--- a/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -2,7 +2,7 @@ name: audio-bluetooth
 kind: stratum
 description: Components required for audio and bluetooth.
 build-depends:
-- morph: genivi-foundation
+- morph: strata/genivi-foundation.morph
 chunks:
 - name: libatomic_ops
   repo: upstream:libatomic_ops
diff --git a/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph
index 88922e27..0df7cbc2 100644
--- a/bsp-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank.morph
@@ -2,7 +2,7 @@ name: bsp-armv7-highbank
 kind: stratum
 description: The platform dependent components required to boot an ARM highbank board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-armv7-highbank
   repo: upstream:linux
diff --git a/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph
index cc1298f1..7cb29e35 100644
--- a/bsp-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The platform dependent components required to boot an ARM versatile development
   board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-armv7-versatile
   repo: upstream:linux
diff --git a/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph
index 0a94bcc1..ad56dce8 100644
--- a/bsp-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank.morph
@@ -2,7 +2,7 @@ name: bsp-armv7b-highbank
 kind: stratum
 description: The platform dependent components required to boot an ARM highbank board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-armv7b-highbank
   repo: upstream:linux
diff --git a/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph
index d8abde2d..2c77c3ca 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2.morph
@@ -2,7 +2,7 @@ name: bsp-armv7b-vexpress-tc2
 kind: stratum
 description: The platform dependent components required to boot Versatile TC2 board
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-armv7b-vexpress-tc2
   repo: upstream:linux
diff --git a/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index 77ef4a74..5644201b 100644
--- a/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The platform dependent components required to boot an NVIDIA Jetson TK1 development image
   board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: u-boot
   repo: upstream:u-boot
diff --git a/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph
index fdafb86f..3cbf161d 100644
--- a/bsp-ppc64-generic.morph
+++ b/strata/bsp-ppc64-generic.morph
@@ -2,7 +2,7 @@ name: bsp-ppc64-generic
 kind: stratum
 description: The platform dependent components required to boot a ppc64 board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-ppc64
   repo: upstream:linux
diff --git a/bsp-wandboard.morph b/strata/bsp-wandboard.morph
index cab25125..e6cb2bf1 100644
--- a/bsp-wandboard.morph
+++ b/strata/bsp-wandboard.morph
@@ -2,7 +2,7 @@ name: bsp-wandboard
 kind: stratum
 description: The platform dependent components required to boot an wandboard ARM board.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: u-boot
   repo: upstream:u-boot
diff --git a/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
index 625f854c..1a35c8a6 100644
--- a/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The set of platform specific components required for booting a 32-bit
   x86 based system.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-x86-32-generic
   repo: upstream:linux
diff --git a/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index ea7ab404..6c604230 100644
--- a/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The set of platform specific components required for booting a 64-bit
   x86 based system.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: linux-x86-64-generic
   repo: upstream:linux
diff --git a/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index 60b8bcd0..eb697d15 100644
--- a/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The set of platform specific components required for configuring a bootable
   x86 based system.
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: nasm
   repo: upstream:nasm
diff --git a/build-essential.morph b/strata/build-essential.morph
index 2f8d798b..2f8d798b 100644
--- a/build-essential.morph
+++ b/strata/build-essential.morph
diff --git a/ceph-service.morph b/strata/ceph-service.morph
index 92ecb417..006f39a0 100644
--- a/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -1,7 +1,7 @@
 name: ceph-service
 kind: stratum
 build-depends:
-- morph: foundation
+- morph: strata/foundation.morph
 chunks:
 - name: nspr
   repo: upstream:nspr-hg
diff --git a/cloudinit-support.morph b/strata/cloudinit-support.morph
index 1790ab8c..c657144f 100644
--- a/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -2,9 +2,9 @@ name: cloudinit-support
 kind: stratum
 description: A stratum with cloudinit to fit a system in the OpenStack cloud.
 build-depends:
-- morph: build-essential
-- morph: core
-- morph: foundation
+- morph: strata/build-essential.morph
+- morph: strata/core.morph
+- morph: strata/foundation.morph
 chunks:
 - name: configobj
   repo: upstream:configobj
diff --git a/connectivity.morph b/strata/connectivity.morph
index 69512392..8d316f0b 100644
--- a/connectivity.morph
+++ b/strata/connectivity.morph
@@ -1,7 +1,7 @@
 name: connectivity
 kind: stratum
 build-depends:
-- morph: genivi-foundation
+- morph: strata/genivi-foundation.morph
 chunks:
 - name: libnl
   repo: upstream:libnl
diff --git a/core.morph b/strata/core.morph
index 16d874a7..8c722ccf 100644
--- a/core.morph
+++ b/strata/core.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: Core components of a Baserock base system that are build tools required
   for the BSP and Foundation strata, but a step above build-essential
 build-depends:
-- morph: build-essential
+- morph: strata/build-essential.morph
 chunks:
 - name: sqlite3
   repo: upstream:sqlite3
diff --git a/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index eb5374fd..d712bf0a 100644
--- a/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -2,7 +2,7 @@ name: cross-bootstrap
 kind: stratum
 description: The minimal development tools to build a baserock devel system
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: six
   repo: upstream:six
diff --git a/cross-tools.morph b/strata/cross-tools.morph
index 2fb4d59d..c3e35e6d 100644
--- a/cross-tools.morph
+++ b/strata/cross-tools.morph
@@ -2,7 +2,7 @@ name: cross-tools
 kind: stratum
 description: Tools used together with cross compilers
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: patchelf
   repo: upstream:patchelf
diff --git a/cxmanage.morph b/strata/cxmanage.morph
index b8c0ad07..5a1d540c 100644
--- a/cxmanage.morph
+++ b/strata/cxmanage.morph
@@ -2,7 +2,7 @@ name: cxmanage
 kind: stratum
 description: All the tools for calxeda management
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: ipmitool
   repo: upstream:ipmitool
diff --git a/databases.morph b/strata/databases.morph
index c824b9b1..48367890 100644
--- a/databases.morph
+++ b/strata/databases.morph
@@ -2,8 +2,8 @@ name: databases
 kind: stratum
 description: some popular databases
 build-depends:
-- morph: tools
-- morph: nfs
+- morph: strata/tools.morph
+- morph: strata/nfs.morph
 chunks:
 - name: readline
   repo: upstream:readline
diff --git a/distbuild.morph b/strata/distbuild.morph
index 9a2d1087..36306d9c 100644
--- a/distbuild.morph
+++ b/strata/distbuild.morph
@@ -2,9 +2,9 @@ name: distbuild
 kind: stratum
 description: Morph distributed build software
 build-depends:
-- morph: foundation
-- morph: core
-- morph: tools
+- morph: strata/foundation.morph
+- morph: strata/core.morph
+- morph: strata/tools.morph
 chunks:
 - name: bottle
   repo: upstream:bottle
diff --git a/enlightenment.morph b/strata/enlightenment.morph
index d5ab5330..a711ec14 100644
--- a/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -2,12 +2,12 @@ name: enlightenment
 kind: stratum
 description: Enlightenment Desktop and Window Manager
 build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: lua
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: connectivity
+- morph: strata/tools.morph
+- morph: strata/x-x86_64-generic.morph
+- morph: strata/lua.morph
+- morph: strata/audio-bluetooth.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
+- morph: strata/connectivity.morph
 chunks:
 - name: efl
   repo: upstream:enlightenment/efl
diff --git a/erlang.morph b/strata/erlang.morph
index bf553eb9..13641bc0 100644
--- a/erlang.morph
+++ b/strata/erlang.morph
@@ -2,7 +2,7 @@ name: erlang
 kind: stratum
 description: stratum for erlang/otp and stuff
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: erlang
   repo: upstream:erlang
diff --git a/foundation.morph b/strata/foundation.morph
index 2392bdac..f3169fd3 100644
--- a/foundation.morph
+++ b/strata/foundation.morph
@@ -2,7 +2,7 @@ name: foundation
 kind: stratum
 description: Basic userland runtime system
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: attr
   repo: upstream:attr
diff --git a/genivi-foundation.morph b/strata/genivi-foundation.morph
index fa29487e..aabd1d92 100644
--- a/genivi-foundation.morph
+++ b/strata/genivi-foundation.morph
@@ -2,7 +2,7 @@ name: genivi-foundation
 kind: stratum
 description: Basic components needed by the GENIVI baseline.
 build-depends:
-- morph: foundation
+- morph: strata/foundation.morph
 chunks:
 - name: dbus-glib
   repo: upstream:dbus-glib
diff --git a/genivi-wayland-armv7-versatile.morph b/strata/genivi-wayland-armv7-versatile.morph
index 13d08834..b61d861a 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/strata/genivi-wayland-armv7-versatile.morph
@@ -2,11 +2,11 @@ name: genivi-wayland-armv7-versatile
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: genivi
-- morph: wayland-armv7-versatile
+- morph: strata/core.morph
+- morph: strata/foundation.morph
+- morph: strata/genivi-foundation.morph
+- morph: strata/genivi.morph
+- morph: strata/wayland-armv7-versatile.morph
 chunks:
 - name: layer_management-wayland
   repo: upstream:layer_management
diff --git a/genivi-wayland-x86_64-generic.morph b/strata/genivi-wayland-x86_64-generic.morph
index 6ff3aa66..eedbecc2 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/strata/genivi-wayland-x86_64-generic.morph
@@ -2,11 +2,11 @@ name: genivi-wayland-x86_64-generic
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: genivi
-- morph: wayland-x86_64-generic
+- morph: strata/core.morph
+- morph: strata/foundation.morph
+- morph: strata/genivi-foundation.morph
+- morph: strata/genivi.morph
+- morph: strata/wayland-x86_64-generic.morph
 chunks:
 - name: layer_management-wayland
   repo: upstream:layer_management
diff --git a/genivi-x-armv7-versatile.morph b/strata/genivi-x-armv7-versatile.morph
index cd308bb8..880cf828 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/strata/genivi-x-armv7-versatile.morph
@@ -2,8 +2,8 @@ name: genivi-x-armv7-versatile
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: genivi
-- morph: x-armv7-versatile
+- morph: strata/genivi.morph
+- morph: strata/x-armv7-versatile.morph
 chunks:
 - name: layer_management
   repo: upstream:layer_management
diff --git a/genivi-x-ppc64-generic.morph b/strata/genivi-x-ppc64-generic.morph
index 9843341b..5676c88c 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/strata/genivi-x-ppc64-generic.morph
@@ -2,8 +2,8 @@ name: genivi-x-ppc64-generic
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: genivi
-- morph: x-ppc64-generic
+- morph: strata/genivi.morph
+- morph: strata/x-ppc64-generic.morph
 chunks:
 - name: layer_management
   repo: upstream:layer_management
diff --git a/genivi-x-x86_64-generic.morph b/strata/genivi-x-x86_64-generic.morph
index 45929b17..9fe941bd 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/strata/genivi-x-x86_64-generic.morph
@@ -2,8 +2,8 @@ name: genivi-x-x86_64-generic
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: genivi
-- morph: x-x86_64-generic
+- morph: strata/genivi.morph
+- morph: strata/x-x86_64-generic.morph
 chunks:
 - name: layer_management
   repo: upstream:layer_management
diff --git a/genivi.morph b/strata/genivi.morph
index caf7ff99..e56228e2 100644
--- a/genivi.morph
+++ b/strata/genivi.morph
@@ -2,7 +2,7 @@ name: genivi
 kind: stratum
 description: Software components designed by genivi, for genivi.
 build-depends:
-- morph: genivi-foundation
+- morph: strata/genivi-foundation.morph
 chunks:
 - name: DLT-daemon
   repo: upstream:DLT-daemon
diff --git a/gitlab.morph b/strata/gitlab.morph
index bc345e1e..f1fbd296 100644
--- a/gitlab.morph
+++ b/strata/gitlab.morph
@@ -2,7 +2,7 @@ name: gitlab
 kind: stratum
 description: gitlab components for server, ci etc
 build-depends:
-- morph: ruby
+- morph: strata/ruby.morph
 chunks:
 - name: gitlab-ce
   repo: upstream:gitlab/gitlab-ce
diff --git a/gtk2.morph b/strata/gtk2.morph
index 82afb7e6..ef28f5bc 100644
--- a/gtk2.morph
+++ b/strata/gtk2.morph
@@ -2,9 +2,9 @@ name: gtk2
 kind: stratum
 description: the gtk2 stratum
 build-depends:
-- morph: genivi-foundation
-- morph: x-common
-- morph: x-x86_64-generic
+- morph: strata/genivi-foundation.morph
+- morph: strata/x-common.morph
+- morph: strata/x-x86_64-generic.morph
 chunks:
 - name: shared-mime-info
   repo: upstream:shared-mime-info
diff --git a/initramfs-utils.morph b/strata/initramfs-utils.morph
index d59dcec7..e1951b92 100644
--- a/initramfs-utils.morph
+++ b/strata/initramfs-utils.morph
@@ -2,7 +2,7 @@ name: initramfs-utils
 kind: stratum
 description: stratum for initramfs
 build-depends:
-- morph: build-essential
+- morph: strata/build-essential.morph
 chunks:
 # A more minimal initramfs would be a single executable as /init,
 # statically linked against musl.
diff --git a/lua.morph b/strata/lua.morph
index 8ad1dfec..ba75266e 100644
--- a/lua.morph
+++ b/strata/lua.morph
@@ -2,7 +2,7 @@ name: lua
 kind: stratum
 description: Interpreter for the lua scripting language.
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: lua
   repo: upstream:lua
diff --git a/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index c7a44e87..ae5fe656 100644
--- a/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -2,9 +2,9 @@ name: multimedia-gstreamer-0.10
 kind: stratum
 description: Codecs
 build-depends:
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
+- morph: strata/core.morph
+- morph: strata/foundation.morph
+- morph: strata/audio-bluetooth.morph
 chunks:
 - name: orc
   repo: upstream:orc
diff --git a/multimedia.morph b/strata/multimedia.morph
index 9d7621c5..fed824e9 100644
--- a/multimedia.morph
+++ b/strata/multimedia.morph
@@ -2,7 +2,7 @@ name: multimedia
 kind: stratum
 description: Codecs
 build-depends:
-- morph: audio-bluetooth
+- morph: strata/audio-bluetooth.morph
 chunks:
 - name: orc
   repo: upstream:orc
diff --git a/nfs.morph b/strata/nfs.morph
index e0e5f2a1..b4711d51 100644
--- a/nfs.morph
+++ b/strata/nfs.morph
@@ -2,7 +2,7 @@ name: nfs
 kind: stratum
 description: NFS utilities
 build-depends:
-- morph: foundation
+- morph: strata/foundation.morph
 chunks:
 - name: libevent
   repo: upstream:libevent
diff --git a/nodejs.morph b/strata/nodejs.morph
index aece2d2a..f8955a01 100644
--- a/nodejs.morph
+++ b/strata/nodejs.morph
@@ -2,7 +2,7 @@ name: nodejs
 kind: stratum
 description: Stratum for nodejs related stuff
 build-depends:
-- morph: core
+- morph: strata/core.morph
 chunks:
 - name: node
   repo: upstream:node
diff --git a/openstack-clients.morph b/strata/openstack-clients.morph
index fc130872..4c41a4f3 100644
--- a/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -2,7 +2,7 @@ name: openstack-clients
 kind: stratum
 description: A stratum with OpenStack clients, for OpenStack deployments.
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: jsonschema
   repo: upstream:jsonschema
diff --git a/qt4-sdk.morph b/strata/qt4-sdk.morph
index 88c0974d..4d4b02b4 100644
--- a/qt4-sdk.morph
+++ b/strata/qt4-sdk.morph
@@ -2,7 +2,7 @@ name: qt4-sdk
 kind: stratum
 description: Qt4 Desktop Environment, IDE and Example Apps
 build-depends:
-- morph: qt4-tools
+- morph: strata/qt4-tools.morph
 chunks:
 - name: qt-creator
   repo: upstream:qt-creator
diff --git a/qt4-tools.morph b/strata/qt4-tools.morph
index 3c148283..84a6a13e 100644
--- a/qt4-tools.morph
+++ b/strata/qt4-tools.morph
@@ -2,9 +2,9 @@ name: qt4-tools
 kind: stratum
 description: Qt4 Development Libraries and Tools
 build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
+- morph: strata/tools.morph
+- morph: strata/x-x86_64-generic.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
 chunks:
 - name: icu
   repo: upstream:icu
diff --git a/qt5-sdk.morph b/strata/qt5-sdk.morph
index b26d2271..9139946b 100644
--- a/qt5-sdk.morph
+++ b/strata/qt5-sdk.morph
@@ -2,7 +2,7 @@ name: qt5-sdk
 kind: stratum
 description: Qt5 Desktop Environment, IDE and Example Apps
 build-depends:
-- morph: qt5-tools
+- morph: strata/qt5-tools.morph
 chunks:
 - name: qt-creator
   repo: upstream:qt-creator
diff --git a/qt5-tools.morph b/strata/qt5-tools.morph
index 39a8264b..7771a1e4 100644
--- a/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -2,9 +2,9 @@ name: qt5-tools
 kind: stratum
 description: Qt5 Development Libraries and Tools
 build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
+- morph: strata/tools.morph
+- morph: strata/x-x86_64-generic.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
 chunks:
 - name: icu
   repo: upstream:icu
diff --git a/ruby.morph b/strata/ruby.morph
index c9eccd89..ddb011e4 100644
--- a/ruby.morph
+++ b/strata/ruby.morph
@@ -2,7 +2,7 @@ name: ruby
 kind: stratum
 description: ruby and things from ruby world
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: ruby-1.8
   repo: upstream:ruby
diff --git a/tools.morph b/strata/tools.morph
index efc5051c..3eec0472 100644
--- a/tools.morph
+++ b/strata/tools.morph
@@ -2,7 +2,7 @@ name: tools
 kind: stratum
 description: Extra development tools included in the devel system
 build-depends:
-- morph: foundation
+- morph: strata/foundation.morph
 chunks:
 - name: six
   repo: upstream:six
diff --git a/trove.morph b/strata/trove.morph
index 91ecaaa5..2d6a41c8 100644
--- a/trove.morph
+++ b/strata/trove.morph
@@ -2,7 +2,7 @@ name: trove
 kind: stratum
 description: Trove software
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: bottle
   repo: upstream:bottle
diff --git a/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph
index 4babc6da..da04fe80 100644
--- a/virtualbox-guest-x86_64.morph
+++ b/strata/virtualbox-guest-x86_64.morph
@@ -3,10 +3,10 @@ kind: stratum
 description: |
   VirtualBox Guest Additions for x86_64
 build-depends:
-- morph: tools
-- morph: bsp-x86_64-generic
-- morph: x-common
-- morph: x-x86_64-generic
+- morph: strata/tools.morph
+- morph: strata/bsp-x86_64-generic.morph
+- morph: strata/x-common.morph
+- morph: strata/x-x86_64-generic.morph
 chunks:
 - name: yasm
   repo: upstream:yasm
diff --git a/virtualization.morph b/strata/virtualization.morph
index 33e662b4..9a198918 100644
--- a/virtualization.morph
+++ b/strata/virtualization.morph
@@ -2,7 +2,7 @@ name: virtualization
 kind: stratum
 description: virtualization for baserock
 build-depends:
-- morph: connectivity
+- morph: strata/connectivity.morph
 chunks:
 - name: yajl
   repo: upstream:yajl
diff --git a/wayland-armv7-versatile.morph b/strata/wayland-armv7-versatile.morph
index 3980c170..14fc343a 100644
--- a/wayland-armv7-versatile.morph
+++ b/strata/wayland-armv7-versatile.morph
@@ -1,7 +1,7 @@
 name: wayland-armv7-versatile
 kind: stratum
 build-depends:
-- morph: x-common
+- morph: strata/x-common.morph
 chunks:
 - name: libxkbcommon
   repo: upstream:xorg-lib-libxkbcommon
diff --git a/wayland-x86_64-generic.morph b/strata/wayland-x86_64-generic.morph
index 353b953b..61265f75 100644
--- a/wayland-x86_64-generic.morph
+++ b/strata/wayland-x86_64-generic.morph
@@ -1,7 +1,7 @@
 name: wayland-x86_64-generic
 kind: stratum
 build-depends:
-- morph: x-common
+- morph: strata/x-common.morph
 chunks:
 - name: libxkbcommon
   repo: upstream:xorg-lib-libxkbcommon
diff --git a/webtools.morph b/strata/webtools.morph
index 523dde2b..a3bf98f6 100644
--- a/webtools.morph
+++ b/strata/webtools.morph
@@ -2,7 +2,7 @@ name: webtools
 kind: stratum
 description: pip, node and other fun things
 build-depends:
-- morph: tools
+- morph: strata/tools.morph
 chunks:
 - name: icu
   repo: upstream:icu
diff --git a/x-armv7-versatile.morph b/strata/x-armv7-versatile.morph
index 3fcf1ea5..a033c109 100644
--- a/x-armv7-versatile.morph
+++ b/strata/x-armv7-versatile.morph
@@ -1,7 +1,7 @@
 name: x-armv7-versatile
 kind: stratum
 build-depends:
-- morph: x-common
+- morph: strata/x-common.morph
 chunks:
 - name: mesa-x
   repo: upstream:mesa
diff --git a/x-common.morph b/strata/x-common.morph
index 77ba793b..028f7d78 100644
--- a/x-common.morph
+++ b/strata/x-common.morph
@@ -1,7 +1,7 @@
 name: x-common
 kind: stratum
 build-depends:
-- morph: genivi-foundation
+- morph: strata/genivi-foundation.morph
 chunks:
 - name: llvm
   repo: upstream:llvm
diff --git a/x-ppc64-generic.morph b/strata/x-ppc64-generic.morph
index ee24f566..a6bbb3a0 100644
--- a/x-ppc64-generic.morph
+++ b/strata/x-ppc64-generic.morph
@@ -1,7 +1,7 @@
 name: x-ppc64-generic
 kind: stratum
 build-depends:
-- morph: x-common
+- morph: strata/x-common.morph
 chunks:
 - name: mesa-x
   repo: upstream:mesa
diff --git a/x-x86_64-generic.morph b/strata/x-x86_64-generic.morph
index c19356c7..4349f2f5 100644
--- a/x-x86_64-generic.morph
+++ b/strata/x-x86_64-generic.morph
@@ -1,7 +1,7 @@
 name: x-x86_64-generic
 kind: stratum
 build-depends:
-- morph: x-common
+- morph: strata/x-common.morph
 chunks:
 - name: mesa-x
   repo: upstream:mesa
diff --git a/xfce.morph b/strata/xfce.morph
index 1e7a1f41..5e47ec13 100644
--- a/xfce.morph
+++ b/strata/xfce.morph
@@ -2,9 +2,9 @@ name: xfce
 kind: stratum
 description: xfce stratum
 build-depends:
-- morph: genivi-x-x86_64-generic
-- morph: gtk2
-- morph: x-x86_64-generic
+- morph: strata/genivi-x-x86_64-generic.morph
+- morph: strata/gtk2.morph
+- morph: strata/x-x86_64-generic.morph
 chunks:
 - name: xfce-dev-tools
   repo: upstream:xfce/xfce4-dev-tools
diff --git a/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
index 1c9ae41d..a3b8b192 100644
--- a/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
@@ -3,9 +3,12 @@ kind: system
 arch: x86_32
 description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
 strata:
-- morph: build-essential
-- morph: armv7lhf-cross-toolchain
-- morph: cross-tools
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: armv7lhf-cross-toolchain
+  morph: strata/armv7lhf-cross-toolchain.morph
+- name: cross-tools
+  morph: strata/cross-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph
index 43f5bf87..2aeacffe 100644
--- a/armv7lhf-cross-toolchain-system-x86_64-generic.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph
@@ -3,9 +3,12 @@ kind: system
 arch: x86_64
 description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
 strata:
-- morph: build-essential
-- morph: armv7lhf-cross-toolchain
-- morph: cross-tools
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: armv7lhf-cross-toolchain
+  morph: strata/armv7lhf-cross-toolchain.morph
+- name: cross-tools
+  morph: strata/cross-tools.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
index 9573866c..33714de4 100644
--- a/base-system-armv7-highbank.morph
+++ b/systems/base-system-armv7-highbank.morph
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
 kind: system
 name: base-system-armv7-highbank
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-highbank
+  morph: strata/bsp-armv7-highbank.morph
diff --git a/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph
index 31e3bf3a..ae96711d 100644
--- a/base-system-armv7-versatile.morph
+++ b/systems/base-system-armv7-versatile.morph
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM vers
 kind: system
 name: base-system-armv7-versatile
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-versatile
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-versatile
+  morph: strata/bsp-armv7-versatile.morph
diff --git a/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph
index 75c69f85..16142e98 100644
--- a/base-system-armv7b-highbank.morph
+++ b/systems/base-system-armv7b-highbank.morph
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
 kind: system
 name: base-system-armv7b-highbank
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-highbank
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7b-highbank
+  morph: strata/bsp-armv7b-highbank.morph
diff --git a/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph
index bdd63a00..071d61d2 100644
--- a/base-system-armv7b-vexpress-tc2.morph
+++ b/systems/base-system-armv7b-vexpress-tc2.morph
@@ -9,7 +9,11 @@ description: A small system for Versatile TC2 boards system.
 kind: system
 name: base-system-armv7b-vexpress-tc2
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-vexpress-tc2
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7b-vexpress-tc2
+  morph: strata/bsp-armv7b-vexpress-tc2.morph
diff --git a/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph
index 7a8fa323..39f74b20 100644
--- a/base-system-armv7lhf-highbank.morph
+++ b/systems/base-system-armv7lhf-highbank.morph
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
 kind: system
 name: base-system-armv7lhf-highbank
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-highbank
+  morph: strata/bsp-armv7-highbank.morph
diff --git a/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph
index c1589af3..a2f93f99 100644
--- a/base-system-ppc64-generic.morph
+++ b/systems/base-system-ppc64-generic.morph
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for a 64-bit pp
 kind: system
 name: base-system-ppc64-generic
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-ppc64-generic
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-ppc64-generic
+  morph: strata/bsp-ppc64-generic.morph
diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph
new file mode 100644
index 00000000..c600a58b
--- /dev/null
+++ b/systems/base-system-x86_32-generic.morph
@@ -0,0 +1,23 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+description: The set of strata required to have a basic system for a 32-bit x86
+  system.
+kind: system
+name: base-system-x86_32-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_32-generic
+  morph: strata/bsp-x86_32-generic.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph
new file mode 100644
index 00000000..6d9c00a8
--- /dev/null
+++ b/systems/base-system-x86_64-generic.morph
@@ -0,0 +1,23 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+description: The set of strata required to have a minimal system for a 64-bit x86
+  system.
+kind: system
+name: base-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
diff --git a/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 15188bcd..cd12f7f4 100644
--- a/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -4,11 +4,16 @@ description: The set of strata required to have a minimal system for a 64-bit x8
 kind: system
 arch: x86_64
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: ceph-service
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: ceph-service
+  morph: strata/ceph-service.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
new file mode 100644
index 00000000..0db65be7
--- /dev/null
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph
@@ -0,0 +1,11 @@
+arch: armv7lhf
+description: A system that produces the minimum needed to build a devel system
+kind: system
+name: cross-bootstrap-system-armv7lhf-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: cross-bootstrap
+  morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
new file mode 100644
index 00000000..6e34b203
--- /dev/null
+++ b/systems/cross-bootstrap-system-ppc64-generic.morph
@@ -0,0 +1,11 @@
+arch: ppc64
+description: A system that produces the minimum needed to build a devel system
+kind: system
+name: cross-bootstrap-system-ppc64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: cross-bootstrap
+  morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
new file mode 100644
index 00000000..5cc73927
--- /dev/null
+++ b/systems/cross-bootstrap-system-x86_64-generic.morph
@@ -0,0 +1,11 @@
+arch: x86_64
+description: A system that produces the minimum needed to build a devel system
+kind: system
+name: cross-bootstrap-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: cross-bootstrap
+  morph: strata/cross-bootstrap.morph
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
new file mode 100644
index 00000000..b871ba91
--- /dev/null
+++ b/systems/cxmanage-system-x86_64-generic.morph
@@ -0,0 +1,24 @@
+name: cxmanage-system-x86_64-generic
+description: A baserock development system with calxeda management tools added
+kind: system
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: cxmanage
+  morph: strata/cxmanage.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- fstab
diff --git a/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index aabf9ec1..2048f768 100644
--- a/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARM highb
 kind: system
 name: devel-system-armv7-chroot
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
new file mode 100644
index 00000000..592fd241
--- /dev/null
+++ b/systems/devel-system-armv7-highbank.morph
@@ -0,0 +1,24 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-armv7-highbank
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-highbank
+  morph: strata/bsp-armv7-highbank.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
new file mode 100644
index 00000000..7fe01b5d
--- /dev/null
+++ b/systems/devel-system-armv7-versatile.morph
@@ -0,0 +1,24 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-armv7-versatile
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-versatile
+  morph: strata/bsp-armv7-versatile.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
new file mode 100644
index 00000000..544c801c
--- /dev/null
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -0,0 +1,23 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the Wandboard.
+kind: system
+name: devel-system-armv7-wandboard
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-wandboard
+  morph: strata/bsp-wandboard.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 6a417ec6..577c2432 100644
--- a/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARMv7b
 kind: system
 name: devel-system-armv7b-chroot
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
new file mode 100644
index 00000000..258d0111
--- /dev/null
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -0,0 +1,24 @@
+arch: armv7b
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-armv7b-highbank
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7b-highbank
+  morph: strata/bsp-armv7b-highbank.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index f07fc777..60835b1e 100644
--- a/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARMv7lhf
 kind: system
 name: devel-system-armv7lhf-chroot
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
new file mode 100644
index 00000000..abccffab
--- /dev/null
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -0,0 +1,24 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-armv7lhf-highbank
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-highbank
+  morph: strata/bsp-armv7-highbank.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..b31a9268
--- /dev/null
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -0,0 +1,23 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the NVIDIA Jetson TK1.
+kind: system
+name: devel-system-armv7lhf-jetson
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: bsp-jetson-devel
+  morph: strata/bsp-jetson-devel.morph
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
new file mode 100644
index 00000000..4419c942
--- /dev/null
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -0,0 +1,23 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the Wandboard.
+kind: system
+name: devel-system-armv7lhf-wandboard
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-wandboard
+  morph: strata/bsp-wandboard.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index dfb2b7c8..19452977 100644
--- a/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the 64-bit Po
 kind: system
 name: devel-system-ppc64-chroot
 strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
new file mode 100644
index 00000000..4c82113c
--- /dev/null
+++ b/systems/devel-system-ppc64-generic.morph
@@ -0,0 +1,24 @@
+arch: ppc64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit PowerPc
+  architecture.
+kind: system
+name: devel-system-ppc64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-ppc64-generic
+  morph: strata/bsp-ppc64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
new file mode 100644
index 00000000..ea7ca64c
--- /dev/null
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -0,0 +1,24 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-x86_32-chroot
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: bsp-x86_both-tools
+  morph: strata/bsp-x86_both-tools.morph
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
new file mode 100644
index 00000000..2ee61a73
--- /dev/null
+++ b/systems/devel-system-x86_32-generic.morph
@@ -0,0 +1,27 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+description: A system that is able to build other systems based on the 32-bit x86
+  architecture.
+kind: system
+name: devel-system-x86_32-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_32-generic
+  morph: strata/bsp-x86_32-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
new file mode 100644
index 00000000..73770687
--- /dev/null
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -0,0 +1,24 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- 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
+name: devel-system-x86_64-chroot
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: bsp-x86_both-tools
+  morph: strata/bsp-x86_both-tools.morph
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
new file mode 100644
index 00000000..b53e4aad
--- /dev/null
+++ b/systems/devel-system-x86_64-generic.morph
@@ -0,0 +1,27 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture.
+kind: system
+name: devel-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
new file mode 100644
index 00000000..4476705c
--- /dev/null
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -0,0 +1,45 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vagrant
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture.  This adds the virtualbox guest additions and vagrant configuration too
+kind: system
+name: devel-system-x86_64-vagrant
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: genivi-x-x86_64-generic
+  morph: strata/genivi-x-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: virtualization
+  morph: strata/virtualization.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: virtualbox-guest-x86_64
+  morph: strata/virtualbox-guest-x86_64.morph
diff --git a/systems/distbuild-system-armv7lhf-highbank.morph b/systems/distbuild-system-armv7lhf-highbank.morph
new file mode 100644
index 00000000..1528d522
--- /dev/null
+++ b/systems/distbuild-system-armv7lhf-highbank.morph
@@ -0,0 +1,27 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for armv7lhf highbank
+kind: system
+name: distbuild-system-armv7lhf-highbank
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7-highbank
+  morph: strata/bsp-armv7-highbank.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: distbuild
+  morph: strata/distbuild.morph
diff --git a/systems/distbuild-system-armv7lhf-jetson.morph b/systems/distbuild-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..31e8adec
--- /dev/null
+++ b/systems/distbuild-system-armv7lhf-jetson.morph
@@ -0,0 +1,27 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for armv7lhf jetson
+kind: system
+name: distbuild-system-armv7lhf-jetson
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-jetson-devel
+  morph: strata/bsp-jetson-devel.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: distbuild
+  morph: strata/distbuild.morph
diff --git a/systems/distbuild-system-ppc64.morph b/systems/distbuild-system-ppc64.morph
new file mode 100644
index 00000000..75ee2516
--- /dev/null
+++ b/systems/distbuild-system-ppc64.morph
@@ -0,0 +1,27 @@
+arch: ppc64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for ppc64
+kind: system
+name: distbuild-system-ppc64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-ppc64-generic
+  morph: strata/bsp-ppc64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: distbuild
+  morph: strata/distbuild.morph
diff --git a/systems/distbuild-system-x86_32.morph b/systems/distbuild-system-x86_32.morph
new file mode 100644
index 00000000..155fbed3
--- /dev/null
+++ b/systems/distbuild-system-x86_32.morph
@@ -0,0 +1,27 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for x86_32
+kind: system
+name: distbuild-system-x86_32
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_32-generic
+  morph: strata/bsp-x86_32-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: distbuild
+  morph: strata/distbuild.morph
diff --git a/systems/distbuild-system-x86_64.morph b/systems/distbuild-system-x86_64.morph
new file mode 100644
index 00000000..260b9a77
--- /dev/null
+++ b/systems/distbuild-system-x86_64.morph
@@ -0,0 +1,27 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for x86_64
+kind: system
+name: distbuild-system-x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: distbuild
+  morph: strata/distbuild.morph
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
new file mode 100644
index 00000000..a63a285e
--- /dev/null
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -0,0 +1,35 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab
+description: A GENIVI baseline system for an ARMv7 system.
+kind: system
+name: genivi-baseline-system-armv7lhf-versatile
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-armv7-versatile
+  morph: strata/bsp-armv7-versatile.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: wayland-armv7-versatile
+  morph: strata/wayland-armv7-versatile.morph
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
new file mode 100644
index 00000000..0e8b32c5
--- /dev/null
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -0,0 +1,34 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+description: A GENIVI baseline system for a 64-bit x86 system.
+kind: system
+name: genivi-baseline-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: wayland-x86_64-generic
+  morph: strata/wayland-x86_64-generic.morph
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
new file mode 100644
index 00000000..9ffab070
--- /dev/null
+++ b/systems/gitlab-ci-runner.morph
@@ -0,0 +1,50 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system to run build tests as part of GitLab CI
+  architecture.
+kind: system
+name: gitlab-ci-runner
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: genivi-x-x86_64-generic
+  morph: strata/genivi-x-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: virtualization
+  morph: strata/virtualization.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: databases
+  morph: strata/databases.morph
+- name: webtools
+  morph: strata/webtools.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: nfs
+  morph: strata/nfs.morph
diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph
new file mode 100644
index 00000000..20feed59
--- /dev/null
+++ b/systems/gitlab-server.morph
@@ -0,0 +1,32 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- gitlab
+description: system which hosts a gitlab server
+kind: system
+name: gitlab-server
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: core
+  morph: strata/core.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: databases
+  morph: strata/databases.morph
+- name: webtools
+  morph: strata/webtools.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: gitlab
+  morph: strata/gitlab.morph
diff --git a/initramfs-x86_64.morph b/systems/initramfs-x86_64.morph
index 7daa81fd..a58eaf37 100644
--- a/initramfs-x86_64.morph
+++ b/systems/initramfs-x86_64.morph
@@ -4,7 +4,9 @@ kind: system
 arch: x86_64
 configuration-extensions: []
 strata:
-- morph: build-essential
+- name: build-essential
+  morph: strata/build-essential.morph
   artifacts:
   - build-essential-minimal
-- morph: initramfs-utils
+- name: initramfs-utils
+  morph: strata/initramfs-utils.morph
diff --git a/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic.morph
index b9e9b9e9..74624708 100644
--- a/minimal-system-x86_32-generic.morph
+++ b/systems/minimal-system-x86_32-generic.morph
@@ -10,10 +10,12 @@ description: The set of strata required to have a minimal system for a 32-bit x8
 kind: system
 name: minimal-system-x86_32-generic
 strata:
-- morph: build-essential
+- name: build-essential
+  morph: strata/build-essential.morph
   artifacts:
   - build-essential-minimal
-- morph: bsp-x86_32-generic
+- name: bsp-x86_32-generic
+  morph: strata/bsp-x86_32-generic.morph
   # Don't include kernel headers in the system
   artifacts:
   - bsp-x86_32-generic-runtime
diff --git a/minimal-system-x86_64-generic.morph b/systems/minimal-system-x86_64-generic.morph
index 9ead85e8..016c8bb2 100644
--- a/minimal-system-x86_64-generic.morph
+++ b/systems/minimal-system-x86_64-generic.morph
@@ -10,10 +10,12 @@ description: The set of strata required to have a minimal system for a 64-bit x8
 kind: system
 name: minimal-system-x86_64-generic
 strata:
-- morph: build-essential
+- name: build-essential
+  morph: strata/build-essential.morph
   artifacts:
   - build-essential-minimal
-- morph: bsp-x86_64-generic
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
   # Don't include kernel headers in the system
   artifacts:
   - bsp-x86_64-generic-runtime
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
new file mode 100644
index 00000000..525c6b73
--- /dev/null
+++ b/systems/nodejs-system-x86_64.morph
@@ -0,0 +1,44 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- 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
+name: nodejs-system-x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: genivi-x-x86_64-generic
+  morph: strata/genivi-x-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: virtualization
+  morph: strata/virtualization.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: nodejs
+  morph: strata/nodejs.morph
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
new file mode 100644
index 00000000..f7d92dc3
--- /dev/null
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -0,0 +1,40 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- 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
+name: qt4-devel-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: multimedia-gstreamer-0.10
+  morph: strata/multimedia-gstreamer-0.10.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: qt4-tools
+  morph: strata/qt4-tools.morph
+- name: qt4-sdk
+  morph: strata/qt4-sdk.morph
+- name: lua
+  morph: strata/lua.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: enlightenment
+  morph: strata/enlightenment.morph
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
new file mode 100644
index 00000000..ec008d6b
--- /dev/null
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -0,0 +1,40 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- 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
+name: qt5-devel-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: multimedia-gstreamer-0.10
+  morph: strata/multimedia-gstreamer-0.10.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-sdk
+  morph: strata/qt5-sdk.morph
+- name: lua
+  morph: strata/lua.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: enlightenment
+  morph: strata/enlightenment.morph
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
new file mode 100644
index 00000000..778692cc
--- /dev/null
+++ b/systems/trove-system-x86_64.morph
@@ -0,0 +1,31 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- trove
+- nfsboot-server
+- fstab
+- simple-network
+- install-files
+- cloud-init
+description: Trove server
+kind: system
+name: trove-system-x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: core
+  morph: strata/core.morph
+- name: tools
+  morph: strata/tools.morph
+- name: trove
+  morph: strata/trove.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
new file mode 100644
index 00000000..fd75d3b1
--- /dev/null
+++ b/systems/web-system-x86_64-generic.morph
@@ -0,0 +1,33 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: system with web tools
+kind: system
+name: web-system-x86_64-generic
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: core
+  morph: strata/core.morph
+- name: tools
+  morph: strata/tools.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: databases
+  morph: strata/databases.morph
+- name: webtools
+  morph: strata/webtools.morph
+- name: erlang
+  morph: strata/erlang.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: nodejs
+  morph: strata/nodejs.morph
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
new file mode 100644
index 00000000..06912391
--- /dev/null
+++ b/systems/xfce-system.morph
@@ -0,0 +1,41 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A GENIVI devel with XFCE
+kind: system
+name: xfce-system
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: genivi-foundation
+  morph: strata/genivi-foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-x86_64-generic
+  morph: strata/x-x86_64-generic.morph
+- name: multimedia
+  morph: strata/multimedia.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: genivi-x-x86_64-generic
+  morph: strata/genivi-x-x86_64-generic.morph
+- name: gtk2
+  morph: strata/gtk2.morph
+- name: tools
+  morph: strata/tools.morph
+- name: xfce
+  morph: strata/xfce.morph
diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph
deleted file mode 100644
index fb892d81..00000000
--- a/trove-system-x86_64.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- trove
-- nfsboot-server
-- fstab
-- simple-network
-- install-files
-- cloud-init
-description: Trove server
-kind: system
-name: trove-system-x86_64
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: trove
-- morph: nfs
-- morph: ansible
-- morph: cloudinit-support
diff --git a/trove.baserock.org-upgrade.morph b/trove.baserock.org-upgrade.morph
index 359bb3c2..284783e0 100644
--- a/trove.baserock.org-upgrade.morph
+++ b/trove.baserock.org-upgrade.morph
@@ -10,7 +10,7 @@ description: |
   Replace the value of gbo.VERSION_LABEL above with the current date.
   You can add letters if you need to upgrade multiple times in a day.
 systems:
-- morph: trove-system-x86_64
+- morph: systems/trove-system-x86_64.morph
   deploy:
     gbo:
       type: ssh-rsync
diff --git a/upgrade-devel.morph b/upgrade-devel.morph
index 408dfd01..3937521e 100644
--- a/upgrade-devel.morph
+++ b/upgrade-devel.morph
@@ -32,7 +32,7 @@ description: |
   On a base system, use 'diff -r' instead of 'git diff --no-index'. It will
   not be as colourful.
 systems:
-- morph: devel-system-x86_64-generic
+- morph: systems/devel-system-x86_64-generic.morph
   deploy:
     self:
       type: ssh-rsync
diff --git a/web-system-x86_64-generic.morph b/web-system-x86_64-generic.morph
deleted file mode 100644
index 836bb45e..00000000
--- a/web-system-x86_64-generic.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: system with web tools
-kind: system
-name: web-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: nfs
-- morph: databases
-- morph: webtools
-- morph: erlang
-- morph: ruby
-- morph: nodejs
diff --git a/xfce-system.morph b/xfce-system.morph
deleted file mode 100644
index b2fd7d2e..00000000
--- a/xfce-system.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A GENIVI devel with XFCE
-kind: system
-name: xfce-system
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: gtk2
-- morph: tools
-- morph: xfce