Move extensions into a subdirectory

Change-Id: I12e7c03b30da78da1eb220d2826ce0003d6efe2e

180 files changed, 498 insertions, 498 deletions

diff --git a/chef-system-x86_64-container.morph b/chef-system-x86_64-container.morph
index 3e81c73e..889eabea 100644
--- a/chef-system-x86_64-container.morph
+++ b/chef-system-x86_64-container.morph
@@ -3,12 +3,12 @@ kind: system
 arch: x86_64
 description: Minimal chef system suitable for running in a container
 configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
-- remove-gcc
+- extensions/set-hostname
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/busybox-init
+- extensions/remove-gcc
 strata:
 - name: build-essential
   morph: strata/build-essential.morph
diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph
index b4db22e0..f9cc04a2 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph
@@ -4,7 +4,7 @@ systems:
 - morph: systems/ceph-service-x86_64-generic.morph
   deploy:
       ceph-node-virtualbox-image:
-          type: virtualbox-ssh
+          type: extensions/virtualbox-ssh
           SYSTEM: systems/ceph-service-x86_64-generic.morph
           location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi
           # HOST_IPADDR and NETMASK should be set to the IP address and netmask of the virtualbox host on the host-only interface.
diff --git a/clusters/ci.morph b/clusters/ci.morph
index cb56328c..d37733ab 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -9,19 +9,19 @@ systems:
 - morph: systems/devel-system-x86_64-generic.morph
   deploy:
     devel-system-x86_64-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: devel-system-x86_64-generic.img
       DISK_SIZE: 4G
 - morph: systems/devel-system-x86_32-generic.morph
   deploy:
     devel-system-x86_32-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: devel-system-x86_32-generic.img
       DISK_SIZE: 4G
 - morph: systems/build-system-armv7lhf-jetson.morph
   deploy:
     build-system-armv7lhf-jetson:
-      type: rawdisk
+      type: extensions/rawdisk
       location: build-system-armv7lhf-jetson.img
       DISK_SIZE: 2G
       BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -33,14 +33,14 @@ systems:
 - morph: systems/weston-system-x86_64-generic.morph
   deploy:
     weston-system-x86_64-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: weston-system-x86_64-generic.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
 - morph: systems/weston-system-armv7lhf-jetson.morph
   deploy:
     weston-system-armv7lhf-jetson:
-      type: rawdisk
+      type: extensions/rawdisk
       location: weston-system-armv7lhf-jetson.img
       DISK_SIZE: 4G
       BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -52,14 +52,14 @@ systems:
 - morph: systems/genivi-baseline-system-x86_64-generic.morph
   deploy:
     genivi-baseline-system-x86_64-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: genivi-baseline-system-x86_64-generic.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
 - morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
   deploy:
     genivi-baseline-system-armv7lhf-jetson:
-      type: rawdisk
+      type: extensions/rawdisk
       location: genivi-baseline-system-armv7lhf-jetson.img
       DISK_SIZE: 4G
       BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -71,7 +71,7 @@ systems:
 - morph: systems/openstack-system-x86_64.morph
   deploy:
     openstack-system-x86_64:
-      type: rawdisk
+      type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 5G
       INSTALL_FILES: openstack/manifest
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph
index 513c16c5..b5cd11ef 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.morph
@@ -22,16 +22,16 @@ systems:
     WORKER_SSH_KEY: ssh-keys/worker.key
   deploy:
     build-controller:
-      type: nfsboot
+      type: extensions/nfsboot
       location: $MY_TROVE
       DISTBUILD_CONTROLLER: true
       HOSTNAME: build-controller
       WORKERS: build-node-1, build-node-2
     build-node-1:
-      type: nfsboot
+      type: extensions/nfsboot
       location: $MY_TROVE
       HOSTNAME: build-node-1
     build-node-2:
-      type: nfsboot
+      type: extensions/nfsboot
       location: $MY_TROVE
       HOSTNAME: build-node-2
diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph
index b1ea784f..2a512709 100644
--- a/clusters/example-swift-storage-cluster.morph
+++ b/clusters/example-swift-storage-cluster.morph
@@ -39,7 +39,7 @@ systems:
 
   deploy:
     node0:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://user@host/swift-storage-0/home/user/swift-storage-0.img
       DISK_SIZE: 10G
       RAM_SIZE: 1G
@@ -50,7 +50,7 @@ systems:
       MANAGEMENT_INTERFACE_IP_ADDRESS: <node0 management ip>
       ATTACH_DISKS: /dev/node0_sdb:/dev/node0_sdc:/dev/node0_sdd
     node1:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://user@host/swift-storage-1/home/user/swift-storage-1.img
       DISK_SIZE: 10G
       RAM_SIZE: 1G
diff --git a/clusters/hardware-deployment.morph b/clusters/hardware-deployment.morph
index c6b7dce9..674d6587 100644
--- a/clusters/hardware-deployment.morph
+++ b/clusters/hardware-deployment.morph
@@ -8,7 +8,7 @@ systems:
 - morph: systems/installer-system-x86_64.morph
   deploy:
     installer:
-      type: pxeboot
+      type: extensions/pxeboot
       location: AB:CD:EF:12:34:56:78   #MAC address.
       PXEBOOT_MODE: spawn-novlan
       PXEBOOT_DEPLOYER_INTERFACE: ens6
@@ -23,7 +23,7 @@ systems:
   - morph: systems/build-system-x86_64.morph
     deploy:
       to-install:
-        type: sysroot
+        type: extensions/sysroot
         location: /rootfs
         INITRAMFS_PATH: boot/initramfs.gz
         KERNEL_ARGS: console=ttyS1,9600 console=tty0
@@ -31,5 +31,5 @@ systems:
     - morph: systems/initramfs-x86_64.morph
       deploy:
         initramfs:
-          type: initramfs
+          type: extensions/initramfs
           location: boot/initramfs.gz
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph
index fd8487e2..ca79ec97 100644
--- a/clusters/image-package-example.morph
+++ b/clusters/image-package-example.morph
@@ -6,7 +6,7 @@ systems:
 - morph: systems/base-system-x86_32-generic.morph
   deploy:
     imgpkg:
-      type: image-package
+      type: extensions/image-package
       location: image-package-example.tar
       BOOTLOADER_BLOBS: /usr/share/syslinux/mbr.bin
-      INCLUDE_SCRIPTS: image-package-example/make-disk-image.sh.in:image-package-example/disk-install.sh.in:image-package-example/common.sh.in
+      INCLUDE_SCRIPTS: extensions/image-package-example/make-disk-image.sh.in:extensions/image-package-example/disk-install.sh.in:extensions/image-package-example/common.sh.in
diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.morph
index afc94961..dd7d91e1 100644
--- a/clusters/initramfs-test.morph
+++ b/clusters/initramfs-test.morph
@@ -4,7 +4,7 @@ systems:
 - morph: systems/base-system-x86_64-generic.morph
   deploy:
     system:
-      type: rawdisk
+      type: extensions/rawdisk
       location: initramfs-system-x86_64.img
       DISK_SIZE: 1G
       HOSTNAME: initramfs-system
@@ -13,5 +13,5 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       initramfs:
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
diff --git a/clusters/installer-build-system-x86_64.morph b/clusters/installer-build-system-x86_64.morph
index a9ebcaca..d9a2a28b 100644
--- a/clusters/installer-build-system-x86_64.morph
+++ b/clusters/installer-build-system-x86_64.morph
@@ -24,7 +24,7 @@ systems:
 - morph: systems/installer-system-x86_64.morph
   deploy:
     installer:
-      type: rawdisk
+      type: extensions/rawdisk
       location: installer-build-system-x86_64.img
       KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
       DISK_SIZE: 6G
@@ -36,17 +36,17 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       installer-initramfs:
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
   - morph: systems/build-system-x86_64.morph
     deploy:
       to-install:
-        type: sysroot
+        type: extensions/sysroot
         location: /rootfs
         INITRAMFS_PATH: boot/initramfs.gz
     subsystems:
     - morph: systems/initramfs-x86_64.morph
       deploy:
         to-install-initramfs:
-          type: initramfs
+          type: extensions/initramfs
           location: boot/initramfs.gz
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index 9fd5155b..e6ec97e0 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -14,5 +14,5 @@ systems:
     FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
   deploy:
     self:
-        type: ssh-rsync
+        type: extensions/ssh-rsync
         location: root@127.0.0.1
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index 6ef14888..915e14e7 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -18,7 +18,7 @@ systems:
     WORKER_SSH_KEY: ssh-keys/worker.key
   deploy:
     mason-openstack:
-      type: openstack
+      type: extensions/openstack
       location: openstack-auth-url (eg example.com:5000/v2.0)
       DISK_SIZE: 6G
       DISTBUILD_CONTROLLER: true
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 9717239d..21399ea0 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -11,7 +11,7 @@ systems:
 - morph: systems/trove-system-x86_64.morph
   deploy:
     red-box-v1-trove:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img
       AUTOSTART: true
       DISK_SIZE: 20G
@@ -44,7 +44,7 @@ systems:
     WORKER_SSH_KEY: ssh_keys/worker.key
   deploy:
     red-box-v1-controller:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://vm-user@vm-host/red-box-v1-controller/vm-path/red-box-v1-controller.img
       DISK_SIZE: 60G
       DISTBUILD_CONTROLLER: true
diff --git a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
index eea600cf..9647e7a7 100644
--- a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
+++ b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
@@ -4,7 +4,7 @@ systems:
 - morph: systems/minimal-system-armv5l-openbmc-aspeed.morph
   deploy:
     minimal-system-armv5l-openbmc-aspeed:
-      type: jffs2
+      type: extensions/jffs2
       location: minimal-system-armv5l-openbmc-aspeed.img
       ROOT_DEVICE: "/dev/mtdblock"
       BOOTLOADER_CONFIG_FORMAT: "extlinux"
diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph
index 06629ffc..cf8de54f 100644
--- a/clusters/minimal-system-deploy.morph
+++ b/clusters/minimal-system-deploy.morph
@@ -6,7 +6,7 @@ systems:
 - morph: systems/minimal-system-x86_32-generic.morph
   deploy:
     vm:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://192.168.122.1/tiny-x86_32/srv/VMs/tiny-x86_32.img
       DISK_SIZE: 512M
       HOSTNAME: tiny-x86_32
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index c8e5bc81..c46b1d9e 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -8,7 +8,7 @@ systems:
 - morph: systems/installer-system-armv8b64.morph
   deploy:
     installer:
-      type: pxeboot
+      type: extensions/pxeboot
       location: 14:58:d0:57:7f:42
       PXEBOOT_MODE: existing-server
       PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
@@ -44,7 +44,7 @@ systems:
   - morph: systems/devel-system-armv8b64.morph
     deploy:
       to-install:
-        type: sysroot
+        type: extensions/sysroot
         location: /rootfs
         HOSTNAME: baserock-c31n1
         DTB_PATH: boot/m400-1003.dtb
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index 2d32efb0..a16a3602 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -9,7 +9,7 @@ systems:
 - morph: systems/devel-system-armv8b64.morph
   deploy:
     netboot:
-      type: pxeboot
+      type: extensions/pxeboot
       location: 14:58:d0:57:7f:42
       PXEBOOT_MODE: existing-server
       PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 3286c72e..9fd7cee7 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -9,7 +9,7 @@ systems:
 - morph: systems/devel-system-armv8l64.morph
   deploy:
     netboot:
-      type: pxeboot
+      type: extensions/pxeboot
       location: 14:58:d0:57:7f:42
       PXEBOOT_MODE: existing-server
       PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph
index 588b6e81..37429283 100644
--- a/clusters/openstack-one-node-swift.morph
+++ b/clusters/openstack-one-node-swift.morph
@@ -40,7 +40,7 @@ systems:
 - morph: systems/openstack-system-x86_64.morph
   deploy:
     release:
-      type: rawdisk
+      type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 10G
       INSTALL_FILES: openstack/manifest swift/manifest
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index 037cd23c..d6b4c582 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -40,7 +40,7 @@ systems:
 - morph: systems/openstack-system-x86_64.morph
   deploy:
     release:
-      type: rawdisk
+      type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 10G
       INSTALL_FILES: openstack/manifest
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index 6285217a..afad454a 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -59,7 +59,7 @@ systems:
 - morph: systems/installer-system-x86_64.morph
   deploy:
     network-installer: &installer
-      type: rawdisk
+      type: extensions/rawdisk
       location: installer-openstack-network-x86_64.img
       KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
       DISK_SIZE: 6G
@@ -72,12 +72,12 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       network-initramfs: &initramfs
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
   - morph: systems/openstack-system-x86_64.morph
     deploy:
       network-to-install: &stack-node
-        type: sysroot
+        type: extensions/sysroot
         location: rootfs
         INSTALL_FILES: openstack/manifest
         INITRAMFS_PATH: boot/initramfs.gz
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index f05b0e9b..53d0b7b1 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -58,7 +58,7 @@ systems:
 - morph: systems/installer-system-x86_64.morph
   deploy:
     controller-installer: &installer
-      type: rawdisk
+      type: extensions/rawdisk
       location: installer-openstack-controller-x86_64.img
       KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
       DISK_SIZE: 6G
@@ -71,12 +71,12 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       controller-initramfs: &initramfs
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
   - morph: systems/openstack-system-x86_64.morph
     deploy:
       controller-to-install: &stack-node
-        type: sysroot
+        type: extensions/sysroot
         location: rootfs
         INSTALL_FILES: openstack/manifest
         INITRAMFS_PATH: boot/initramfs.gz
diff --git a/clusters/release.morph b/clusters/release.morph
index c5bfffca..1574bde6 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -10,23 +10,23 @@ systems:
 - morph: systems/build-system-x86_32-chroot.morph
   deploy:
     build-system-x86_32-chroot:
-      type: tar
+      type: extensions/tar
       location: build-system-x86_32-chroot.tar
 - morph: systems/build-system-x86_32.morph
   deploy:
     build-system-x86_32:
-      type: rawdisk
+      type: extensions/rawdisk
       location: build-system-x86_32.img
       DISK_SIZE: 6G
 - morph: systems/build-system-x86_64-chroot.morph
   deploy:
     build-system-x86_64-chroot:
-      type: tar
+      type: extensions/tar
       location: build-system-x86_64-chroot.tar
 - morph: systems/build-system-x86_64.morph
   deploy:
     build-system-x86_64:
-      type: rawdisk
+      type: extensions/rawdisk
       location: build-system-x86_64.img
       DISK_SIZE: 6G
       INITRAMFS_PATH: boot/initramfs.gz
@@ -34,12 +34,12 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       initramfs-build-system-x86_64:
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
 - morph: systems/build-system-armv7lhf-jetson.morph
   deploy:
     build-system-armv7lhf-jetson:
-      type: rawdisk
+      type: extensions/rawdisk
       location: build-system-armv7lhf-jetson.img
       DISK_SIZE: 2G
       BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -51,7 +51,7 @@ systems:
 - morph: systems/genivi-baseline-system-x86_64-generic.morph
   deploy:
     genivi-baseline-system-x86_64-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: genivi-baseline-system-x86_64-generic.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
@@ -60,12 +60,12 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       initramfs-genivi-baseline-system-x86_64-generic:
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
 - morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
   deploy:
     genivi-baseline-system-armv7lhf-jetson:
-      type: rawdisk
+      type: extensions/rawdisk
       location: genivi-baseline-system-armv7lhf-jetson.img
       DISK_SIZE: 4G
       BOOT_DEVICE: "/dev/mmcblk0p1"
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph
index 92e4a413..a4413c3b 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.morph
@@ -34,7 +34,7 @@ systems:
 - morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph
   deploy:
     sdk:
-      type: sdk
+      type: extensions/sdk
       location: armv7lhf-cross-toolchain-system-x86_64.sh
       PREFIX: /usr
       TARGET: armv7lhf-baserock-linux-gnueabi
@@ -42,5 +42,5 @@ systems:
   - morph: systems/devel-system-armv7lhf-highbank.morph
     deploy:
       sysroot:
-        type: sysroot
+        type: extensions/sysroot
         location: usr/armv7lhf-baserock-linux-gnueabi/sys-root
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph
index 2812f60e..81b1c901 100644
--- a/clusters/trove-example.morph
+++ b/clusters/trove-example.morph
@@ -50,9 +50,9 @@ systems:
     UPSTREAM_TROVE: ''
   deploy:
     initial:
-      type: kvm
+      type: extensions/kvm
       location: kvm+ssh://vm-user@vm-host/test-trove/vm-path/test-trove.img
       VERSION_LABEL: 1
     upgrade:
-      type: ssh-rsync
+      type: extensions/ssh-rsync
       location: test-trove
diff --git a/clusters/trove.baserock.org-upgrade.morph b/clusters/trove.baserock.org-upgrade.morph
index eaf939e1..e66fd6bc 100644
--- a/clusters/trove.baserock.org-upgrade.morph
+++ b/clusters/trove.baserock.org-upgrade.morph
@@ -13,7 +13,7 @@ systems:
 - morph: systems/trove-system-x86_64.morph
   deploy:
     gbo:
-      type: ssh-rsync
+      type: extensions/ssh-rsync
       location: root@git.baserock.org
       FSTAB_HOME: LABEL=homes /home auto defaults,noatime,rw 0 2
       HOSTNAME: firehose1
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph
index b7ce9bc0..3efbb36a 100644
--- a/clusters/upgrade-devel.morph
+++ b/clusters/upgrade-devel.morph
@@ -35,5 +35,5 @@ systems:
 - morph: systems/devel-system-x86_64-generic.morph
   deploy:
     self:
-      type: ssh-rsync
+      type: extensions/ssh-rsync
       location: root@127.0.0.1
diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph
index 3a6f29ef..65e35bd7 100644
--- a/clusters/weston-system-x86_64-generic-deploy.morph
+++ b/clusters/weston-system-x86_64-generic-deploy.morph
@@ -10,7 +10,7 @@ systems:
 - morph: systems/weston-system-x86_64-generic.morph
   deploy:
     weston-system-x86_64-generic:
-      type: rawdisk
+      type: extensions/rawdisk
       location: /weston-system-x86_64-generic.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
@@ -19,5 +19,5 @@ systems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
       initramfs:
-        type: initramfs
+        type: extensions/initramfs
         location: boot/initramfs.gz
diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph
index 1153d4b0..cca6db81 100644
--- a/clusters/zookeeper.morph
+++ b/clusters/zookeeper.morph
@@ -4,7 +4,7 @@ systems:
   - morph: systems/zookeeper-client-x86_64.morph
     deploy:
       my-client-system:
-        type: kvm
+        type: extensions/kvm
         location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img
         DISK_SIZE: 4G
         RAM_SIZE: 1G
@@ -13,7 +13,7 @@ systems:
   - morph: systems/zookeeper-server-x86_64.morph
     deploy:
       my-server-system:
-        type: kvm
+        type: extensions/kvm
         location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img
         DISK_SIZE: 4G
         RAM_SIZE: 1G
diff --git a/add-config-files.configure b/extensions/add-config-files.configure
index 2cf96fd1..2cf96fd1 100755
--- a/add-config-files.configure
+++ b/extensions/add-config-files.configure
diff --git a/busybox-init.configure b/extensions/busybox-init.configure
index c7dba3b9..c7dba3b9 100644
--- a/busybox-init.configure
+++ b/extensions/busybox-init.configure
diff --git a/ceph.configure b/extensions/ceph.configure
index c3cd92d1..c3cd92d1 100644
--- a/ceph.configure
+++ b/extensions/ceph.configure
diff --git a/cloud-init.configure b/extensions/cloud-init.configure
index aa83e0e2..aa83e0e2 100755
--- a/cloud-init.configure
+++ b/extensions/cloud-init.configure
diff --git a/distbuild-trove-nfsboot.check b/extensions/distbuild-trove-nfsboot.check
index 38c491e5..38c491e5 100755
--- a/distbuild-trove-nfsboot.check
+++ b/extensions/distbuild-trove-nfsboot.check
diff --git a/distbuild-trove-nfsboot.write b/extensions/distbuild-trove-nfsboot.write
index a5a5b094..a5a5b094 100755
--- a/distbuild-trove-nfsboot.write
+++ b/extensions/distbuild-trove-nfsboot.write
diff --git a/distbuild-trove-nfsboot.write.help b/extensions/distbuild-trove-nfsboot.write.help
index 62f1455c..62f1455c 100644
--- a/distbuild-trove-nfsboot.write.help
+++ b/extensions/distbuild-trove-nfsboot.write.help
diff --git a/distbuild.configure b/extensions/distbuild.configure
index 062aaecc..062aaecc 100644
--- a/distbuild.configure
+++ b/extensions/distbuild.configure
diff --git a/fstab.configure b/extensions/fstab.configure
index b9154eee..b9154eee 100755
--- a/fstab.configure
+++ b/extensions/fstab.configure
diff --git a/hosts b/extensions/hosts
index 5b97818d..5b97818d 100644
--- a/hosts
+++ b/extensions/hosts
diff --git a/hosts.configure b/extensions/hosts.configure
index 6b068d04..6b068d04 100755
--- a/hosts.configure
+++ b/extensions/hosts.configure
diff --git a/image-package-example/README b/extensions/image-package-example/README
index c1322f25..c1322f25 100644
--- a/image-package-example/README
+++ b/extensions/image-package-example/README
diff --git a/image-package-example/common.sh.in b/extensions/image-package-example/common.sh.in
index 9a7389a7..9a7389a7 100644
--- a/image-package-example/common.sh.in
+++ b/extensions/image-package-example/common.sh.in
diff --git a/image-package-example/disk-install.sh.in b/extensions/image-package-example/disk-install.sh.in
index bc8e0e67..bc8e0e67 100644
--- a/image-package-example/disk-install.sh.in
+++ b/extensions/image-package-example/disk-install.sh.in
diff --git a/image-package-example/make-disk-image.sh.in b/extensions/image-package-example/make-disk-image.sh.in
index 61264fa0..61264fa0 100644
--- a/image-package-example/make-disk-image.sh.in
+++ b/extensions/image-package-example/make-disk-image.sh.in
diff --git a/image-package.write b/extensions/image-package.write
index 15ceadcf..15ceadcf 100755
--- a/image-package.write
+++ b/extensions/image-package.write
diff --git a/initramfs.write b/extensions/initramfs.write
index 1059defa..1059defa 100755
--- a/initramfs.write
+++ b/extensions/initramfs.write
diff --git a/initramfs.write.help b/extensions/initramfs.write.help
index 54d3ae8c..54d3ae8c 100644
--- a/initramfs.write.help
+++ b/extensions/initramfs.write.help
diff --git a/install-essential-files.configure b/extensions/install-essential-files.configure
index 2779b0d4..2779b0d4 100755
--- a/install-essential-files.configure
+++ b/extensions/install-essential-files.configure
diff --git a/install-essential-files.configure.help b/extensions/install-essential-files.configure.help
index 9148aeff..9148aeff 100644
--- a/install-essential-files.configure.help
+++ b/extensions/install-essential-files.configure.help
diff --git a/install-files.configure b/extensions/install-files.configure
index 341cce61..341cce61 100755
--- a/install-files.configure
+++ b/extensions/install-files.configure
diff --git a/install-files.configure.help b/extensions/install-files.configure.help
index 991c26c8..991c26c8 100644
--- a/install-files.configure.help
+++ b/extensions/install-files.configure.help
diff --git a/installer.configure b/extensions/installer.configure
index a77dc851..a77dc851 100755
--- a/installer.configure
+++ b/extensions/installer.configure
diff --git a/jffs2.write b/extensions/jffs2.write
index 46b69a53..46b69a53 100644
--- a/jffs2.write
+++ b/extensions/jffs2.write
diff --git a/jffs2.write.help b/extensions/jffs2.write.help
index 059a354b..059a354b 100644
--- a/jffs2.write.help
+++ b/extensions/jffs2.write.help
diff --git a/kvm.check b/extensions/kvm.check
index 67cb3d38..67cb3d38 100755
--- a/kvm.check
+++ b/extensions/kvm.check
diff --git a/kvm.write b/extensions/kvm.write
index 0d0c095b..0d0c095b 100755
--- a/kvm.write
+++ b/extensions/kvm.write
diff --git a/kvm.write.help b/extensions/kvm.write.help
index 812a5309..812a5309 100644
--- a/kvm.write.help
+++ b/extensions/kvm.write.help
diff --git a/mason.configure b/extensions/mason.configure
index 1198ebd0..40fdfe46 100644
--- a/mason.configure
+++ b/extensions/mason.configure
@@ -39,19 +39,19 @@ set -e
 ROOT="$1"
 
 mkdir -p "$ROOT"/usr/lib/mason
-cp mason/mason.sh "$ROOT"/usr/lib/mason/mason.sh
-cp mason/mason-report.sh "$ROOT"/usr/lib/mason/mason-report.sh
-cp mason/os-init-script "$ROOT"/usr/lib/mason/os-init-script
+cp extensions/mason/mason.sh "$ROOT"/usr/lib/mason/mason.sh
+cp extensions/mason/mason-report.sh "$ROOT"/usr/lib/mason/mason-report.sh
+cp extensions/mason/os-init-script "$ROOT"/usr/lib/mason/os-init-script
 
-cp mason/mason.timer "$ROOT"/etc/systemd/system/mason.timer
+cp extensions/mason/mason.timer "$ROOT"/etc/systemd/system/mason.timer
 
-cp mason/mason.service "$ROOT"/etc/systemd/system/mason.service
+cp extensions/mason/mason.service "$ROOT"/etc/systemd/system/mason.service
 
 ##########################################################################
 # Set up httpd web server
 ##########################################################################
 
-cp mason/httpd.service "$ROOT"/etc/systemd/system/httpd.service
+cp extensions/mason/httpd.service "$ROOT"/etc/systemd/system/httpd.service
 
 mkdir -p "$ROOT"/srv/mason
 
@@ -68,9 +68,9 @@ mkdir -p "$ROOT"/var/mason
 mkdir -p "$ROOT/usr/share/mason-setup"
 mkdir -p "$ROOT/usr/lib/mason-setup"
 
-cp mason/share/* "$ROOT/usr/share/mason-setup"
-cp -r mason/ansible "$ROOT/usr/lib/mason-setup/"
-cp mason/mason-setup.service "$ROOT"/etc/systemd/system/mason-setup.service
+cp extensions/mason/share/* "$ROOT/usr/share/mason-setup"
+cp -r extensions/mason/ansible "$ROOT/usr/lib/mason-setup/"
+cp extensions/mason/mason-setup.service "$ROOT"/etc/systemd/system/mason-setup.service
 
 ln -s ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service
 
diff --git a/mason/ansible/hosts b/extensions/mason/ansible/hosts
index 5b97818d..5b97818d 100644
--- a/mason/ansible/hosts
+++ b/extensions/mason/ansible/hosts
diff --git a/mason/ansible/mason-setup.yml b/extensions/mason/ansible/mason-setup.yml
index d1528dbb..d1528dbb 100644
--- a/mason/ansible/mason-setup.yml
+++ b/extensions/mason/ansible/mason-setup.yml
diff --git a/mason/httpd.service b/extensions/mason/httpd.service
index 7572b732..7572b732 100644
--- a/mason/httpd.service
+++ b/extensions/mason/httpd.service
diff --git a/mason/mason-generator.sh b/extensions/mason/mason-generator.sh
index 187db72c..187db72c 100755
--- a/mason/mason-generator.sh
+++ b/extensions/mason/mason-generator.sh
diff --git a/mason/mason-report.sh b/extensions/mason/mason-report.sh
index 9c20b65b..9c20b65b 100755
--- a/mason/mason-report.sh
+++ b/extensions/mason/mason-report.sh
diff --git a/mason/mason-setup.service b/extensions/mason/mason-setup.service
index 60403bde..60403bde 100644
--- a/mason/mason-setup.service
+++ b/extensions/mason/mason-setup.service
diff --git a/mason/mason.service b/extensions/mason/mason.service
index d5c99498..d5c99498 100644
--- a/mason/mason.service
+++ b/extensions/mason/mason.service
diff --git a/mason/mason.sh b/extensions/mason/mason.sh
index dba99dfa..dba99dfa 100755
--- a/mason/mason.sh
+++ b/extensions/mason/mason.sh
diff --git a/mason/mason.timer b/extensions/mason/mason.timer
index 107dff97..107dff97 100644
--- a/mason/mason.timer
+++ b/extensions/mason/mason.timer
diff --git a/mason/os-init-script b/extensions/mason/os-init-script
index 77afb926..77afb926 100644
--- a/mason/os-init-script
+++ b/extensions/mason/os-init-script
diff --git a/mason/share/mason.conf b/extensions/mason/share/mason.conf
index 1295ce84..1295ce84 100644
--- a/mason/share/mason.conf
+++ b/extensions/mason/share/mason.conf
diff --git a/mason/share/os.conf b/extensions/mason/share/os.conf
index 21ef398c..21ef398c 100644
--- a/mason/share/os.conf
+++ b/extensions/mason/share/os.conf
diff --git a/moonshot-kernel.configure b/extensions/moonshot-kernel.configure
index 11d01751..11d01751 100644
--- a/moonshot-kernel.configure
+++ b/extensions/moonshot-kernel.configure
diff --git a/nfsboot-server.configure b/extensions/nfsboot-server.configure
index 9fb48096..9fb48096 100755
--- a/nfsboot-server.configure
+++ b/extensions/nfsboot-server.configure
diff --git a/nfsboot.check b/extensions/nfsboot.check
index e273f61c..e273f61c 100755
--- a/nfsboot.check
+++ b/extensions/nfsboot.check
diff --git a/nfsboot.configure b/extensions/nfsboot.configure
index 6a68dc48..6a68dc48 100755
--- a/nfsboot.configure
+++ b/extensions/nfsboot.configure
diff --git a/nfsboot.write b/extensions/nfsboot.write
index d928775e..d928775e 100755
--- a/nfsboot.write
+++ b/extensions/nfsboot.write
diff --git a/nfsboot.write.help b/extensions/nfsboot.write.help
index 186c479a..186c479a 100644
--- a/nfsboot.write.help
+++ b/extensions/nfsboot.write.help
diff --git a/openstack-ceilometer.configure b/extensions/openstack-ceilometer.configure
index 9c0b7b6d..9c0b7b6d 100644
--- a/openstack-ceilometer.configure
+++ b/extensions/openstack-ceilometer.configure
diff --git a/openstack-cinder.configure b/extensions/openstack-cinder.configure
index 4c32e11a..4c32e11a 100644
--- a/openstack-cinder.configure
+++ b/extensions/openstack-cinder.configure
diff --git a/openstack-glance.configure b/extensions/openstack-glance.configure
index 5da08895..5da08895 100644
--- a/openstack-glance.configure
+++ b/extensions/openstack-glance.configure
diff --git a/openstack-ironic.configure b/extensions/openstack-ironic.configure
index 962bbcd1..962bbcd1 100644
--- a/openstack-ironic.configure
+++ b/extensions/openstack-ironic.configure
diff --git a/openstack-keystone.configure b/extensions/openstack-keystone.configure
index 6b011b14..6b011b14 100644
--- a/openstack-keystone.configure
+++ b/extensions/openstack-keystone.configure
diff --git a/openstack-network.configure b/extensions/openstack-network.configure
index 10be5a1c..10be5a1c 100644
--- a/openstack-network.configure
+++ b/extensions/openstack-network.configure
diff --git a/openstack-neutron.configure b/extensions/openstack-neutron.configure
index 210222db..210222db 100644
--- a/openstack-neutron.configure
+++ b/extensions/openstack-neutron.configure
diff --git a/openstack-nova.configure b/extensions/openstack-nova.configure
index 213f1852..213f1852 100644
--- a/openstack-nova.configure
+++ b/extensions/openstack-nova.configure
diff --git a/openstack-swift-controller.configure b/extensions/openstack-swift-controller.configure
index 424ab57b..424ab57b 100644
--- a/openstack-swift-controller.configure
+++ b/extensions/openstack-swift-controller.configure
diff --git a/openstack.check b/extensions/openstack.check
index a3379763..a3379763 100755
--- a/openstack.check
+++ b/extensions/openstack.check
diff --git a/openstack.write b/extensions/openstack.write
index 67e07c18..67e07c18 100755
--- a/openstack.write
+++ b/extensions/openstack.write
diff --git a/openstack.write.help b/extensions/openstack.write.help
index 26983060..26983060 100644
--- a/openstack.write.help
+++ b/extensions/openstack.write.help
diff --git a/pxeboot.check b/extensions/pxeboot.check
index 611708a9..611708a9 100755
--- a/pxeboot.check
+++ b/extensions/pxeboot.check
diff --git a/pxeboot.write b/extensions/pxeboot.write
index 3a12ebcc..3a12ebcc 100644
--- a/pxeboot.write
+++ b/extensions/pxeboot.write
diff --git a/pxeboot.write.help b/extensions/pxeboot.write.help
index 7cb78bce..7cb78bce 100644
--- a/pxeboot.write.help
+++ b/extensions/pxeboot.write.help
diff --git a/rawdisk.check b/extensions/rawdisk.check
index 9be0ce91..9be0ce91 100755
--- a/rawdisk.check
+++ b/extensions/rawdisk.check
diff --git a/rawdisk.write b/extensions/rawdisk.write
index 6f2d45ba..6f2d45ba 100755
--- a/rawdisk.write
+++ b/extensions/rawdisk.write
diff --git a/rawdisk.write.help b/extensions/rawdisk.write.help
index 52ed73fb..52ed73fb 100644
--- a/rawdisk.write.help
+++ b/extensions/rawdisk.write.help
diff --git a/sdk.write b/extensions/sdk.write
index 8d3d2a63..8d3d2a63 100755
--- a/sdk.write
+++ b/extensions/sdk.write
diff --git a/set-hostname.configure b/extensions/set-hostname.configure
index 4b2424d8..4b2424d8 100755
--- a/set-hostname.configure
+++ b/extensions/set-hostname.configure
diff --git a/simple-network.configure b/extensions/simple-network.configure
index 4a70f311..4a70f311 100755
--- a/simple-network.configure
+++ b/extensions/simple-network.configure
diff --git a/ssh-rsync.check b/extensions/ssh-rsync.check
index c3bdfd29..c3bdfd29 100755
--- a/ssh-rsync.check
+++ b/extensions/ssh-rsync.check
diff --git a/ssh-rsync.write b/extensions/ssh-rsync.write
index 6d596500..6d596500 100755
--- a/ssh-rsync.write
+++ b/extensions/ssh-rsync.write
diff --git a/ssh-rsync.write.help b/extensions/ssh-rsync.write.help
index f3f79ed5..f3f79ed5 100644
--- a/ssh-rsync.write.help
+++ b/extensions/ssh-rsync.write.help
diff --git a/sshkeys.configure b/extensions/sshkeys.configure
index 7a5a8379..7a5a8379 100755
--- a/sshkeys.configure
+++ b/extensions/sshkeys.configure
diff --git a/strip-gplv3.configure b/extensions/strip-gplv3.configure
index c08061ad..c08061ad 100755
--- a/strip-gplv3.configure
+++ b/extensions/strip-gplv3.configure
diff --git a/swift-build-rings.yml b/extensions/swift-build-rings.yml
index 1ffe9c37..1ffe9c37 100644
--- a/swift-build-rings.yml
+++ b/extensions/swift-build-rings.yml
diff --git a/swift-storage-devices-validate.py b/extensions/swift-storage-devices-validate.py
index 57ab23d0..57ab23d0 100755
--- a/swift-storage-devices-validate.py
+++ b/extensions/swift-storage-devices-validate.py
diff --git a/swift-storage.configure b/extensions/swift-storage.configure
index 391b392a..391b392a 100644
--- a/swift-storage.configure
+++ b/extensions/swift-storage.configure
diff --git a/sysroot.check b/extensions/sysroot.check
index 71b35175..71b35175 100755
--- a/sysroot.check
+++ b/extensions/sysroot.check
diff --git a/sysroot.write b/extensions/sysroot.write
index 46f1a780..46f1a780 100755
--- a/sysroot.write
+++ b/extensions/sysroot.write
diff --git a/tar.check b/extensions/tar.check
index f2304d46..f2304d46 100755
--- a/tar.check
+++ b/extensions/tar.check
diff --git a/tar.write b/extensions/tar.write
index 01b545b4..01b545b4 100755
--- a/tar.write
+++ b/extensions/tar.write
diff --git a/tar.write.help b/extensions/tar.write.help
index b45c61fa..b45c61fa 100644
--- a/tar.write.help
+++ b/extensions/tar.write.help
diff --git a/trove.configure b/extensions/trove.configure
index f823762c..f823762c 100755
--- a/trove.configure
+++ b/extensions/trove.configure
diff --git a/trove.configure.help b/extensions/trove.configure.help
index c96bdf74..c96bdf74 100644
--- a/trove.configure.help
+++ b/extensions/trove.configure.help
diff --git a/vagrant.configure b/extensions/vagrant.configure
index abc3ea0c..abc3ea0c 100644
--- a/vagrant.configure
+++ b/extensions/vagrant.configure
diff --git a/vdaboot.configure b/extensions/vdaboot.configure
index 60de925b..60de925b 100755
--- a/vdaboot.configure
+++ b/extensions/vdaboot.configure
diff --git a/virtualbox-ssh.check b/extensions/virtualbox-ssh.check
index a97f3294..a97f3294 100755
--- a/virtualbox-ssh.check
+++ b/extensions/virtualbox-ssh.check
diff --git a/virtualbox-ssh.write b/extensions/virtualbox-ssh.write
index 774f2b4f..774f2b4f 100755
--- a/virtualbox-ssh.write
+++ b/extensions/virtualbox-ssh.write
diff --git a/virtualbox-ssh.write.help b/extensions/virtualbox-ssh.write.help
index 2dbf988c..2dbf988c 100644
--- a/virtualbox-ssh.write.help
+++ b/extensions/virtualbox-ssh.write.help
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32.morph b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
index 9fe7888a..b0ac9cfe 100644
--- a/systems/armv7lhf-cross-toolchain-system-x86_32.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
@@ -11,9 +11,9 @@ strata:
 - name: cross-tools
   morph: strata/cross-tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64.morph b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
index c1de199c..1bd1adc1 100644
--- a/systems/armv7lhf-cross-toolchain-system-x86_64.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
@@ -11,9 +11,9 @@ strata:
 - name: cross-tools
   morph: strata/cross-tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
index ffc5e188..32d773e8 100644
--- a/systems/base-system-armv7-highbank.morph
+++ b/systems/base-system-armv7-highbank.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-armv7-highbank
   morph: strata/bsp-armv7-highbank.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph
index 8de2b35f..4f039c02 100644
--- a/systems/base-system-armv7-versatile.morph
+++ b/systems/base-system-armv7-versatile.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-armv7-versatile
   morph: strata/bsp-armv7-versatile.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph
index 23bf4dbf..969967b5 100644
--- a/systems/base-system-armv7b-highbank.morph
+++ b/systems/base-system-armv7b-highbank.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-armv7b-highbank
   morph: strata/bsp-armv7b-highbank.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph
index b06ead7b..cbfedd89 100644
--- a/systems/base-system-armv7b-vexpress-tc2.morph
+++ b/systems/base-system-armv7b-vexpress-tc2.morph
@@ -12,8 +12,8 @@ strata:
 - name: bsp-armv7b-vexpress-tc2
   morph: strata/bsp-armv7b-vexpress-tc2.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph
index c827f3a2..399931a5 100644
--- a/systems/base-system-armv7lhf-highbank.morph
+++ b/systems/base-system-armv7lhf-highbank.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-armv7-highbank
   morph: strata/bsp-armv7-highbank.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-armv8b64.morph b/systems/base-system-armv8b64.morph
index 49e7dac7..d23bde9b 100644
--- a/systems/base-system-armv8b64.morph
+++ b/systems/base-system-armv8b64.morph
@@ -14,9 +14,9 @@ strata:
 - name: bsp-armv8b64-generic
   morph: strata/bsp-armv8b64-generic.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/base-system-armv8l64.morph b/systems/base-system-armv8l64.morph
index 560add69..24104a8b 100644
--- a/systems/base-system-armv8l64.morph
+++ b/systems/base-system-armv8l64.morph
@@ -14,9 +14,9 @@ strata:
 - name: bsp-armv8l64-generic
   morph: strata/bsp-armv8l64-generic.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph
index 3763cce5..6da852e3 100644
--- a/systems/base-system-ppc64-generic.morph
+++ b/systems/base-system-ppc64-generic.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-ppc64-generic
   morph: strata/bsp-ppc64-generic.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph
index 7ada4052..d89fd913 100644
--- a/systems/base-system-x86_32-generic.morph
+++ b/systems/base-system-x86_32-generic.morph
@@ -12,8 +12,8 @@ strata:
 - name: bsp-x86_32-generic
   morph: strata/bsp-x86_32-generic.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph
index 796c8185..aa1659b3 100644
--- a/systems/base-system-x86_64-generic.morph
+++ b/systems/base-system-x86_64-generic.morph
@@ -13,8 +13,8 @@ strata:
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index 4eb0b6e7..7230bbc0 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -35,9 +35,9 @@ strata:
 - name: mtd-utilities
   morph: strata/mtd-utilities.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index d43ac935..42156d78 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -44,12 +44,12 @@ strata:
 - name: unionfs-fuse-group
   morph: strata/unionfs-fuse-group.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index fa948037..3bdcf9f0 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -42,12 +42,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph
index 84495016..aa16f545 100644
--- a/systems/build-system-armv8b64.morph
+++ b/systems/build-system-armv8b64.morph
@@ -45,13 +45,13 @@ strata:
 - name: devtools
   morph: strata/devtools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index f79fb76e..e7ddf034 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -45,13 +45,13 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 38f2e9f3..642df309 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -42,12 +42,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index f193841f..646ae6a8 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -42,12 +42,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index a802b64f..c14b54f2 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -44,12 +44,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index fa54f9d3..82493d1e 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -42,12 +42,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 8fe5f91f..4b688555 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -44,12 +44,12 @@ strata:
 - name: ostree-core
   morph: strata/ostree-core.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 7431e56a..daaa6957 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -55,10 +55,10 @@ strata:
 - name: chef
   morph: strata/chef.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- ceph
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/ceph
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
index aaa0fa81..ed7e8d63 100644
--- a/systems/cxmanage-system-x86_64-generic.morph
+++ b/systems/cxmanage-system-x86_64-generic.morph
@@ -16,9 +16,9 @@ strata:
 - name: cxmanage
   morph: strata/cxmanage.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 620d8fb9..d7a06fe9 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -54,9 +54,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index a92561fe..854edd76 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -57,9 +57,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 50588f66..34c9a239 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -55,9 +55,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index e2c9e175..300981f9 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -55,9 +55,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 34bc04f1..4eed73e4 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -46,9 +46,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index cddd5ff4..ba5de00b 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -53,9 +53,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index a8d46bd1..d0917fcb 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -54,9 +54,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 9722644c..189c2913 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -60,9 +60,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index e3d1843d..1c39b3ea 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -58,9 +58,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index a47df980..4432f947 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -58,9 +58,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index 6c5f23ee..44ff2d53 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -57,11 +57,11 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/cloud-init
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index cd7a1e44..cad71c4e 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -57,12 +57,12 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-- moonshot-kernel
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/cloud-init
+- extensions/moonshot-kernel
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index b92073a9..fe437767 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -52,9 +52,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 4d81ff5c..26776429 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -55,9 +55,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 7eb4fc01..bc3872a7 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -54,9 +54,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 1fd44086..952bff79 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -59,10 +59,10 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- cloud-init
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/cloud-init
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 48f23cd0..394201e0 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -56,9 +56,9 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index b49964dd..fe56a5de 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -59,11 +59,11 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/cloud-init
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index c6a5f6fe..b8d4d2e7 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -57,10 +57,10 @@ strata:
 - name: coreutils-common
   morph: strata/coreutils-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- vagrant
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/vagrant
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 9306426d..71247d39 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -38,10 +38,10 @@ strata:
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/strip-gplv3
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 698230bb..429ca2d8 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -36,10 +36,10 @@ strata:
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/strip-gplv3
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index f04485bc..6048e078 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -40,9 +40,9 @@ strata:
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- strip-gplv3
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/strip-gplv3
+- extensions/install-essential-files
diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph
index 726354c9..f1a83d6d 100644
--- a/systems/installer-system-armv8b64.morph
+++ b/systems/installer-system-armv8b64.morph
@@ -28,9 +28,9 @@ strata:
 - name: installer-utils
   morph: strata/installer-utils.morph
 configuration-extensions:
-- set-hostname
-- install-files
-- fstab
-- installer
-- moonshot-kernel
-- install-essential-files
+- extensions/set-hostname
+- extensions/install-files
+- extensions/fstab
+- extensions/installer
+- extensions/moonshot-kernel
+- extensions/install-essential-files
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 3d0ced5d..e9c4cd94 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -28,8 +28,8 @@ strata:
 - name: installer-utils
   morph: strata/installer-utils.morph
 configuration-extensions:
-- set-hostname
-- install-files
-- fstab
-- installer
-- install-essential-files
+- extensions/set-hostname
+- extensions/install-files
+- extensions/fstab
+- extensions/installer
+- extensions/install-essential-files
diff --git a/systems/minimal-system-armv5l-openbmc-aspeed.morph b/systems/minimal-system-armv5l-openbmc-aspeed.morph
index fe596057..602e05c7 100644
--- a/systems/minimal-system-armv5l-openbmc-aspeed.morph
+++ b/systems/minimal-system-armv5l-openbmc-aspeed.morph
@@ -12,9 +12,9 @@ strata:
   artifacts:
   - bsp-armv5l-openbmc-aspeed-runtime
 configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/busybox-init
+- extensions/install-essential-files
diff --git a/systems/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic.morph
index 785a72a2..2e9f79c5 100644
--- a/systems/minimal-system-x86_32-generic.morph
+++ b/systems/minimal-system-x86_32-generic.morph
@@ -13,9 +13,9 @@ strata:
   artifacts:
   - bsp-x86_32-generic-runtime
 configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/busybox-init
+- extensions/install-essential-files
diff --git a/systems/minimal-system-x86_64-generic.morph b/systems/minimal-system-x86_64-generic.morph
index 9da22ec8..afd9460c 100644
--- a/systems/minimal-system-x86_64-generic.morph
+++ b/systems/minimal-system-x86_64-generic.morph
@@ -13,9 +13,9 @@ strata:
   artifacts:
   - bsp-x86_64-generic-runtime
 configuration-extensions:
-- set-hostname
-- simple-network
-- nfsboot
-- install-files
-- busybox-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/busybox-init
+- extensions/install-essential-files
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index d5ebcf30..b758d5bd 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -15,8 +15,8 @@ strata:
 - name: nodejs
   morph: strata/nodejs.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/ocaml-system-x86_64.morph b/systems/ocaml-system-x86_64.morph
index 1903e4d6..9ac35d6f 100644
--- a/systems/ocaml-system-x86_64.morph
+++ b/systems/ocaml-system-x86_64.morph
@@ -14,7 +14,7 @@ strata:
 - name: ocaml-language
   morph: strata/ocaml-language.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 8ab38bee..2f700e68 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -66,20 +66,20 @@ strata:
 - name: python-tools
   morph: strata/python-tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
-- hosts
-- openstack-keystone
-- openstack-glance
-- openstack-cinder
-- openstack-nova
-- openstack-network
-- openstack-neutron
-- openstack-ceilometer
-- fstab
-- openstack-ironic
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/cloud-init
+- extensions/hosts
+- extensions/openstack-keystone
+- extensions/openstack-glance
+- extensions/openstack-cinder
+- extensions/openstack-nova
+- extensions/openstack-network
+- extensions/openstack-neutron
+- extensions/openstack-ceilometer
+- extensions/fstab
+- extensions/openstack-ironic
+- extensions/install-essential-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 15b85f70..c7bad950 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -37,8 +37,8 @@ strata:
 - name: enlightenment
   morph: strata/enlightenment.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 3cdce60c..a1f38e9e 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -39,8 +39,8 @@ strata:
 - name: enlightenment
   morph: strata/enlightenment.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph
index 81738558..c959b6f7 100644
--- a/systems/swift-system-x86_64.morph
+++ b/systems/swift-system-x86_64.morph
@@ -24,11 +24,11 @@ strata:
 - name: openstack-common
   morph: strata/openstack-common.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- fstab
-- swift-storage
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/swift-storage
+- extensions/install-essential-files
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 0a5692f5..efc66b5c 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -48,10 +48,10 @@ strata:
 - name: devtools
   morph: strata/devtools.morph
 configuration-extensions:
-- set-hostname
-- trove
-- nfsboot-server
-- fstab
-- install-files
-- cloud-init
-- install-essential-files
+- extensions/set-hostname
+- extensions/trove
+- extensions/nfsboot-server
+- extensions/fstab
+- extensions/install-files
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
index 0b6e84b1..3f477833 100644
--- a/systems/web-system-x86_64-generic.morph
+++ b/systems/web-system-x86_64-generic.morph
@@ -30,8 +30,8 @@ strata:
 - name: nodejs
   morph: strata/nodejs.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index ccb2c3ee..78ddc8b4 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -42,8 +42,8 @@ strata:
 - name: tools
   morph: strata/tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 84f0bad0..d927dd58 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -42,8 +42,8 @@ strata:
 - name: tools
   morph: strata/tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 643291d6..f87b0982 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -48,8 +48,8 @@ strata:
 - name: xfce
   morph: strata/xfce.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph
index a9b01cd5..bc470df5 100644
--- a/systems/zookeeper-client-x86_64.morph
+++ b/systems/zookeeper-client-x86_64.morph
@@ -20,9 +20,9 @@ strata:
 - name: test-tools
   morph: strata/test-tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph
index 987ba9e1..bc46d7b3 100644
--- a/systems/zookeeper-server-x86_64.morph
+++ b/systems/zookeeper-server-x86_64.morph
@@ -20,9 +20,9 @@ strata:
 - name: test-tools
   morph: strata/test-tools.morph
 configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- install-essential-files
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/simple-network
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files