diff --git a/contracts/arch.sw/aarch64.json b/contracts/arch.sw/aarch64/contract.json
similarity index 57%
rename from contracts/arch.sw/aarch64.json
rename to contracts/arch.sw/aarch64/contract.json
index 292cd92f..e108e792 100644
--- a/contracts/arch.sw/aarch64.json
+++ b/contracts/arch.sw/aarch64/contract.json
@@ -5,7 +5,11 @@
   "name": "ARM v8",
   "data": { "arch": "aarch64" },
   "requires": [
-    { "type": "hw.device-type", "arch": "aarch64" }
-  ],
-  "variants": ""
+    {
+      "type": "hw.device-type",
+      "data": {
+        "arch": "aarch64"
+      }
+    }
+  ]
 }
diff --git a/contracts/arch.sw/amd64.json b/contracts/arch.sw/amd64/contract.json
similarity index 60%
rename from contracts/arch.sw/amd64.json
rename to contracts/arch.sw/amd64/contract.json
index 6e173a91..7ad0a106 100644
--- a/contracts/arch.sw/amd64.json
+++ b/contracts/arch.sw/amd64/contract.json
@@ -5,7 +5,11 @@
   "name": "Intel 64-bit (x86-64)",
   "data": { "arch": "amd64" },
   "requires": [
-    { "type": "hw.device-type", "arch": "amd64" }
-  ],
-  "variants": ""
+    {
+      "type": "hw.device-type",
+      "data": {
+        "arch": "amd64"
+      }
+    }
+  ]
 }
diff --git a/contracts/arch.sw/armel.json b/contracts/arch.sw/armel.json
deleted file mode 100644
index 08767067..00000000
--- a/contracts/arch.sw/armel.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "slug": "armel",
-  "version": "1",
-  "type": "arch.sw",
-  "name": "ARM v5",
-  "arch": "armel",
-  "requires": [
-    {
-      "or": [
-        { "type": "hw.device-type", "arch": "armel" }
-      ]
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json
new file mode 100644
index 00000000..b5cc061c
--- /dev/null
+++ b/contracts/arch.sw/armel/contract.json
@@ -0,0 +1,15 @@
+{
+  "slug": "armel",
+  "version": "1",
+  "type": "arch.sw",
+  "name": "ARM v5",
+  "data": { "arch": "armel" },
+  "requires": [
+    {
+      "type": "hw.device-type",
+      "data": {
+        "arch": "armel"
+      }
+    }
+  ]
+}
diff --git a/contracts/arch.sw/armhf.json b/contracts/arch.sw/armhf.json
deleted file mode 100644
index 3b1ec147..00000000
--- a/contracts/arch.sw/armhf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "slug": "armhf",
-  "version": "1",
-  "type": "arch.sw",
-  "name": "ARM Hard Float",
-  "arch": "armhf",
-  "requires": [
-    {
-      "or": [
-        { "type": "hw.device-type", "arch": "armv7hf" },
-        { "type": "hw.device-type", "arch": "rpi" }
-      ]
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json
new file mode 100644
index 00000000..39a48fd2
--- /dev/null
+++ b/contracts/arch.sw/armhf/contract.json
@@ -0,0 +1,25 @@
+{
+  "slug": "armhf",
+  "version": "1",
+  "type": "arch.sw",
+  "name": "ARM Hard Float",
+  "data": { "arch": "armhf" },
+  "requires": [
+    {
+      "or": [
+        {
+          "type": "hw.device-type",
+          "data": {
+            "arch": "armv7hf"
+          }
+        },
+        {
+          "type": "hw.device-type",
+          "data": {
+            "arch": "rpi"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/contracts/arch.sw/armv7hf.json b/contracts/arch.sw/armv7hf.json
deleted file mode 100644
index 416f20da..00000000
--- a/contracts/arch.sw/armv7hf.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "slug": "armv7hf",
-  "version": "1",
-  "type": "arch.sw",
-  "name": "ARM v7",
-  "arch": "armv7hf",
-  "requires": [
-    {
-      "or": [
-        { "type": "hw.device-type", "arch": "armv7hf" }
-      ]
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json
new file mode 100644
index 00000000..9f907917
--- /dev/null
+++ b/contracts/arch.sw/armv7hf/contract.json
@@ -0,0 +1,15 @@
+{
+  "slug": "armv7hf",
+  "version": "1",
+  "type": "arch.sw",
+  "name": "ARM v7",
+  "data": { "arch": "armv7hf" },
+  "requires": [
+    {
+      "type": "hw.device-type",
+      "data": {
+        "arch": "armv7hf"
+      }
+    }
+  ]
+}
diff --git a/contracts/arch.sw/i386.json b/contracts/arch.sw/i386/contract.json
similarity index 51%
rename from contracts/arch.sw/i386.json
rename to contracts/arch.sw/i386/contract.json
index 5d9f96bf..0fac18db 100644
--- a/contracts/arch.sw/i386.json
+++ b/contracts/arch.sw/i386/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "Intel 32-bit (x86)",
-  "arch": "i386",
+  "data": { "arch": "i386" },
   "requires": [
     {
-      "or": [
-        { "type": "hw.device-type", "arch": "i386" }
-      ]
+      "type": "hw.device-type",
+      "data": {
+        "arch": "i386"
+      }
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/arch.sw/rpi.json b/contracts/arch.sw/rpi.json
deleted file mode 100644
index 67695ef5..00000000
--- a/contracts/arch.sw/rpi.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "slug": "rpi",
-  "version": "1",
-  "type": "arch.sw",
-  "name": "ARM v6",
-  "arch": "armv6hf",
-  "requires": [
-    {
-      "or": [
-        { "type": "hw.device-type", "arch": "rpi" }
-      ]
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json
new file mode 100644
index 00000000..023c5c1c
--- /dev/null
+++ b/contracts/arch.sw/rpi/contract.json
@@ -0,0 +1,15 @@
+{
+  "slug": "rpi",
+  "version": "1",
+  "type": "arch.sw",
+  "name": "ARM v6",
+  "data": { "arch": "armv6hf" },
+  "requires": [
+    {
+      "type": "hw.device-type",
+      "data": {
+        "arch": "rpi"
+      }
+    }
+  ]
+}
diff --git a/contracts/hw.device-type/am571x-evm.json b/contracts/hw.device-type/am571x-evm/contract.json
similarity index 88%
rename from contracts/hw.device-type/am571x-evm.json
rename to contracts/hw.device-type/am571x-evm/contract.json
index 65b132ee..bb63bcff 100644
--- a/contracts/hw.device-type/am571x-evm.json
+++ b/contracts/hw.device-type/am571x-evm/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/apalis-imx6q.json b/contracts/hw.device-type/apalis-imx6q/contract.json
similarity index 88%
rename from contracts/hw.device-type/apalis-imx6q.json
rename to contracts/hw.device-type/apalis-imx6q/contract.json
index 6819224b..da56b05e 100644
--- a/contracts/hw.device-type/apalis-imx6q.json
+++ b/contracts/hw.device-type/apalis-imx6q/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/artik10.json b/contracts/hw.device-type/artik10/contract.json
similarity index 88%
rename from contracts/hw.device-type/artik10.json
rename to contracts/hw.device-type/artik10/contract.json
index 2fd06969..076fb5a5 100644
--- a/contracts/hw.device-type/artik10.json
+++ b/contracts/hw.device-type/artik10/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/artik5.json b/contracts/hw.device-type/artik5/contract.json
similarity index 88%
rename from contracts/hw.device-type/artik5.json
rename to contracts/hw.device-type/artik5/contract.json
index cdf5f780..48c02d82 100644
--- a/contracts/hw.device-type/artik5.json
+++ b/contracts/hw.device-type/artik5/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/artik710.json b/contracts/hw.device-type/artik710/contract.json
similarity index 88%
rename from contracts/hw.device-type/artik710.json
rename to contracts/hw.device-type/artik710/contract.json
index 784ecea6..6bdd7fa8 100644
--- a/contracts/hw.device-type/artik710.json
+++ b/contracts/hw.device-type/artik710/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/beaglebone/boot-external.tpl b/contracts/hw.device-type/beaglebone-black/boot-external.tpl
similarity index 100%
rename from partials/hw.device-type/beaglebone/boot-external.tpl
rename to contracts/hw.device-type/beaglebone-black/boot-external.tpl
diff --git a/partials/hw.device-type/beaglebone/boot-internal.tpl b/contracts/hw.device-type/beaglebone-black/boot-internal.tpl
similarity index 100%
rename from partials/hw.device-type/beaglebone/boot-internal.tpl
rename to contracts/hw.device-type/beaglebone-black/boot-internal.tpl
diff --git a/contracts/hw.device-type/beaglebone-black.json b/contracts/hw.device-type/beaglebone-black/contract.json
similarity index 88%
rename from contracts/hw.device-type/beaglebone-black.json
rename to contracts/hw.device-type/beaglebone-black/contract.json
index 32421c0a..622b1574 100644
--- a/contracts/hw.device-type/beaglebone-black.json
+++ b/contracts/hw.device-type/beaglebone-black/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/beaglebone/prepare-network.tpl b/contracts/hw.device-type/beaglebone-black/prepare-network.tpl
similarity index 100%
rename from partials/hw.device-type/beaglebone/prepare-network.tpl
rename to contracts/hw.device-type/beaglebone-black/prepare-network.tpl
diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl
new file mode 100644
index 00000000..7d4df03d
--- /dev/null
+++ b/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl
@@ -0,0 +1 @@
+Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl
new file mode 100644
index 00000000..c1d012f3
--- /dev/null
+++ b/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl
@@ -0,0 +1 @@
+Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beaglebone-green-wifi.json b/contracts/hw.device-type/beaglebone-green-wifi/contract.json
similarity index 89%
rename from contracts/hw.device-type/beaglebone-green-wifi.json
rename to contracts/hw.device-type/beaglebone-green-wifi/contract.json
index 0feff703..073d1d5a 100644
--- a/contracts/hw.device-type/beaglebone-green-wifi.json
+++ b/contracts/hw.device-type/beaglebone-green-wifi/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/vab820-quad/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl
similarity index 100%
rename from partials/hw.device-type/vab820-quad/prepare-network.tpl
rename to contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl
diff --git a/contracts/hw.device-type/beaglebone-green/boot-external.tpl b/contracts/hw.device-type/beaglebone-green/boot-external.tpl
new file mode 100644
index 00000000..7d4df03d
--- /dev/null
+++ b/contracts/hw.device-type/beaglebone-green/boot-external.tpl
@@ -0,0 +1 @@
+Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beaglebone-green/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green/boot-internal.tpl
new file mode 100644
index 00000000..c1d012f3
--- /dev/null
+++ b/contracts/hw.device-type/beaglebone-green/boot-internal.tpl
@@ -0,0 +1 @@
+Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beaglebone-green.json b/contracts/hw.device-type/beaglebone-green/contract.json
similarity index 88%
rename from contracts/hw.device-type/beaglebone-green.json
rename to contracts/hw.device-type/beaglebone-green/contract.json
index 44143f43..579eb315 100644
--- a/contracts/hw.device-type/beaglebone-green.json
+++ b/contracts/hw.device-type/beaglebone-green/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/beaglebone-green/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green/prepare-network.tpl
new file mode 100644
index 00000000..7ef8d976
--- /dev/null
+++ b/contracts/hw.device-type/beaglebone-green/prepare-network.tpl
@@ -0,0 +1 @@
+Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/partials/hw.device-type/boot-external.tpl b/contracts/hw.device-type/boot-external.tpl
similarity index 100%
rename from partials/hw.device-type/boot-external.tpl
rename to contracts/hw.device-type/boot-external.tpl
diff --git a/partials/hw.device-type/boot-internal.tpl b/contracts/hw.device-type/boot-internal.tpl
similarity index 100%
rename from partials/hw.device-type/boot-internal.tpl
rename to contracts/hw.device-type/boot-internal.tpl
diff --git a/contracts/hw.device-type/ccon-01.json b/contracts/hw.device-type/ccon-01/contract.json
similarity index 88%
rename from contracts/hw.device-type/ccon-01.json
rename to contracts/hw.device-type/ccon-01/contract.json
index 87f55545..37e5d0b8 100644
--- a/contracts/hw.device-type/ccon-01.json
+++ b/contracts/hw.device-type/ccon-01/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/colibri-imx6dl.json b/contracts/hw.device-type/colibri-imx6dl/contract.json
similarity index 88%
rename from contracts/hw.device-type/colibri-imx6dl.json
rename to contracts/hw.device-type/colibri-imx6dl/contract.json
index 691b7744..59b76ada 100644
--- a/contracts/hw.device-type/colibri-imx6dl.json
+++ b/contracts/hw.device-type/colibri-imx6dl/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/cybertan-ze250.json b/contracts/hw.device-type/cybertan-ze250/contract.json
similarity index 88%
rename from contracts/hw.device-type/cybertan-ze250.json
rename to contracts/hw.device-type/cybertan-ze250/contract.json
index e816227b..0f29b1e3 100644
--- a/contracts/hw.device-type/cybertan-ze250.json
+++ b/contracts/hw.device-type/cybertan-ze250/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "usbkey"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/generic-aarch64.json b/contracts/hw.device-type/generic-aarch64/contract.json
similarity index 88%
rename from contracts/hw.device-type/generic-aarch64.json
rename to contracts/hw.device-type/generic-aarch64/contract.json
index ae5b04e9..efa57c5b 100644
--- a/contracts/hw.device-type/generic-aarch64.json
+++ b/contracts/hw.device-type/generic-aarch64/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/generic-armv7ahf.json b/contracts/hw.device-type/generic-armv7ahf/contract.json
similarity index 88%
rename from contracts/hw.device-type/generic-armv7ahf.json
rename to contracts/hw.device-type/generic-armv7ahf/contract.json
index 7e7111a5..39d62f8b 100644
--- a/contracts/hw.device-type/generic-armv7ahf.json
+++ b/contracts/hw.device-type/generic-armv7ahf/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/hummingboard.json b/contracts/hw.device-type/hummingboard/contract.json
similarity index 88%
rename from contracts/hw.device-type/hummingboard.json
rename to contracts/hw.device-type/hummingboard/contract.json
index a930538d..a5b78eee 100644
--- a/contracts/hw.device-type/hummingboard.json
+++ b/contracts/hw.device-type/hummingboard/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/imx6ul-var-dart.json b/contracts/hw.device-type/imx6ul-var-dart/contract.json
similarity index 88%
rename from contracts/hw.device-type/imx6ul-var-dart.json
rename to contracts/hw.device-type/imx6ul-var-dart/contract.json
index 0682b737..4d5c49f7 100644
--- a/contracts/hw.device-type/imx6ul-var-dart.json
+++ b/contracts/hw.device-type/imx6ul-var-dart/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/insert-install-media.tpl b/contracts/hw.device-type/insert-install-media.tpl
similarity index 100%
rename from partials/hw.device-type/insert-install-media.tpl
rename to contracts/hw.device-type/insert-install-media.tpl
diff --git a/contracts/hw.device-type/intel-edison.json b/contracts/hw.device-type/intel-edison/contract.json
similarity index 88%
rename from contracts/hw.device-type/intel-edison.json
rename to contracts/hw.device-type/intel-edison/contract.json
index 0782358f..5c33b86e 100644
--- a/contracts/hw.device-type/intel-edison.json
+++ b/contracts/hw.device-type/intel-edison/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "dfu"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/intel-nuc/boot-external.tpl b/contracts/hw.device-type/intel-nuc/boot-external.tpl
similarity index 100%
rename from partials/hw.device-type/intel-nuc/boot-external.tpl
rename to contracts/hw.device-type/intel-nuc/boot-external.tpl
diff --git a/partials/hw.device-type/intel-nuc/boot-internal.tpl b/contracts/hw.device-type/intel-nuc/boot-internal.tpl
similarity index 100%
rename from partials/hw.device-type/intel-nuc/boot-internal.tpl
rename to contracts/hw.device-type/intel-nuc/boot-internal.tpl
diff --git a/contracts/hw.device-type/intel-nuc.json b/contracts/hw.device-type/intel-nuc/contract.json
similarity index 88%
rename from contracts/hw.device-type/intel-nuc.json
rename to contracts/hw.device-type/intel-nuc/contract.json
index 99f2beb2..623c1713 100644
--- a/contracts/hw.device-type/intel-nuc.json
+++ b/contracts/hw.device-type/intel-nuc/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "usbkey"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/iot2000.json b/contracts/hw.device-type/iot2000/contract.json
similarity index 88%
rename from contracts/hw.device-type/iot2000.json
rename to contracts/hw.device-type/iot2000/contract.json
index 0f0472a9..83f47392 100644
--- a/contracts/hw.device-type/iot2000.json
+++ b/contracts/hw.device-type/iot2000/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/jetson-tx1.json b/contracts/hw.device-type/jetson-tx1/contract.json
similarity index 88%
rename from contracts/hw.device-type/jetson-tx1.json
rename to contracts/hw.device-type/jetson-tx1/contract.json
index 353784f5..5a147470 100644
--- a/contracts/hw.device-type/jetson-tx1.json
+++ b/contracts/hw.device-type/jetson-tx1/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/jetson-tx2.json b/contracts/hw.device-type/jetson-tx2/contract.json
similarity index 88%
rename from contracts/hw.device-type/jetson-tx2.json
rename to contracts/hw.device-type/jetson-tx2/contract.json
index 2018951d..569b9f74 100644
--- a/contracts/hw.device-type/jetson-tx2.json
+++ b/contracts/hw.device-type/jetson-tx2/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/kitra520.json b/contracts/hw.device-type/kitra520/contract.json
similarity index 88%
rename from contracts/hw.device-type/kitra520.json
rename to contracts/hw.device-type/kitra520/contract.json
index c235b2ee..a39c66bc 100644
--- a/contracts/hw.device-type/kitra520.json
+++ b/contracts/hw.device-type/kitra520/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/kitra710.json b/contracts/hw.device-type/kitra710/contract.json
similarity index 88%
rename from contracts/hw.device-type/kitra710.json
rename to contracts/hw.device-type/kitra710/contract.json
index dd495f04..7df2f5c8 100644
--- a/contracts/hw.device-type/kitra710.json
+++ b/contracts/hw.device-type/kitra710/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/nitrogen6x.json b/contracts/hw.device-type/nitrogen6x/contract.json
similarity index 88%
rename from contracts/hw.device-type/nitrogen6x.json
rename to contracts/hw.device-type/nitrogen6x/contract.json
index b42334f7..fe8aef7d 100644
--- a/contracts/hw.device-type/nitrogen6x.json
+++ b/contracts/hw.device-type/nitrogen6x/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/odroid-c1.json b/contracts/hw.device-type/odroid-c1/contract.json
similarity index 88%
rename from contracts/hw.device-type/odroid-c1.json
rename to contracts/hw.device-type/odroid-c1/contract.json
index 71f09145..e092685e 100644
--- a/contracts/hw.device-type/odroid-c1.json
+++ b/contracts/hw.device-type/odroid-c1/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/odroid-xu4.json b/contracts/hw.device-type/odroid-xu4/contract.json
similarity index 88%
rename from contracts/hw.device-type/odroid-xu4.json
rename to contracts/hw.device-type/odroid-xu4/contract.json
index 8b477ced..74a567e7 100644
--- a/contracts/hw.device-type/odroid-xu4.json
+++ b/contracts/hw.device-type/odroid-xu4/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/parallella.json b/contracts/hw.device-type/parallella/contract.json
similarity index 88%
rename from contracts/hw.device-type/parallella.json
rename to contracts/hw.device-type/parallella/contract.json
index 9753eb08..aa17d481 100644
--- a/contracts/hw.device-type/parallella.json
+++ b/contracts/hw.device-type/parallella/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/prepare-network.tpl b/contracts/hw.device-type/prepare-network.tpl
similarity index 100%
rename from partials/hw.device-type/prepare-network.tpl
rename to contracts/hw.device-type/prepare-network.tpl
diff --git a/contracts/hw.device-type/qemux86-64.json b/contracts/hw.device-type/qemux86-64/contract.json
similarity index 88%
rename from contracts/hw.device-type/qemux86-64.json
rename to contracts/hw.device-type/qemux86-64/contract.json
index ee5351b2..91bc9d49 100644
--- a/contracts/hw.device-type/qemux86-64.json
+++ b/contracts/hw.device-type/qemux86-64/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "image"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/qemux86.json b/contracts/hw.device-type/qemux86/contract.json
similarity index 88%
rename from contracts/hw.device-type/qemux86.json
rename to contracts/hw.device-type/qemux86/contract.json
index cca7e6d5..07fc25bc 100644
--- a/contracts/hw.device-type/qemux86.json
+++ b/contracts/hw.device-type/qemux86/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "image"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/raspberry-pi.json b/contracts/hw.device-type/raspberry-pi/contract.json
similarity index 88%
rename from contracts/hw.device-type/raspberry-pi.json
rename to contracts/hw.device-type/raspberry-pi/contract.json
index 6f73383c..24e05781 100644
--- a/contracts/hw.device-type/raspberry-pi.json
+++ b/contracts/hw.device-type/raspberry-pi/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/raspberry-pi2.json b/contracts/hw.device-type/raspberry-pi2/contract.json
similarity index 88%
rename from contracts/hw.device-type/raspberry-pi2.json
rename to contracts/hw.device-type/raspberry-pi2/contract.json
index 0571a758..834ea4f8 100644
--- a/contracts/hw.device-type/raspberry-pi2.json
+++ b/contracts/hw.device-type/raspberry-pi2/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/raspberrypi3.json b/contracts/hw.device-type/raspberrypi3/contract.json
similarity index 88%
rename from contracts/hw.device-type/raspberrypi3.json
rename to contracts/hw.device-type/raspberrypi3/contract.json
index 2b6d833e..10a54f8a 100644
--- a/contracts/hw.device-type/raspberrypi3.json
+++ b/contracts/hw.device-type/raspberrypi3/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/remove-install-media.tpl b/contracts/hw.device-type/remove-install-media.tpl
similarity index 100%
rename from partials/hw.device-type/remove-install-media.tpl
rename to contracts/hw.device-type/remove-install-media.tpl
diff --git a/partials/hw.device-type/ts4900/boot-external.tpl b/contracts/hw.device-type/ts4900/boot-external.tpl
similarity index 100%
rename from partials/hw.device-type/ts4900/boot-external.tpl
rename to contracts/hw.device-type/ts4900/boot-external.tpl
diff --git a/partials/hw.device-type/ts4900/boot-internal.tpl b/contracts/hw.device-type/ts4900/boot-internal.tpl
similarity index 100%
rename from partials/hw.device-type/ts4900/boot-internal.tpl
rename to contracts/hw.device-type/ts4900/boot-internal.tpl
diff --git a/contracts/hw.device-type/ts4900.json b/contracts/hw.device-type/ts4900/contract.json
similarity index 88%
rename from contracts/hw.device-type/ts4900.json
rename to contracts/hw.device-type/ts4900/contract.json
index 6d47d9cb..b5befab4 100644
--- a/contracts/hw.device-type/ts4900.json
+++ b/contracts/hw.device-type/ts4900/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/ts7700.json b/contracts/hw.device-type/ts7700/contract.json
similarity index 88%
rename from contracts/hw.device-type/ts7700.json
rename to contracts/hw.device-type/ts7700/contract.json
index 515d43d2..096ff96d 100644
--- a/contracts/hw.device-type/ts7700.json
+++ b/contracts/hw.device-type/ts7700/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/up-board.json b/contracts/hw.device-type/up-board/contract.json
similarity index 88%
rename from contracts/hw.device-type/up-board.json
rename to contracts/hw.device-type/up-board/contract.json
index e02c234f..912f6f7d 100644
--- a/contracts/hw.device-type/up-board.json
+++ b/contracts/hw.device-type/up-board/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "usbkey"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/hw.device-type/vab820-quad/boot-external.tpl b/contracts/hw.device-type/via-vab820-quad/boot-external.tpl
similarity index 100%
rename from partials/hw.device-type/vab820-quad/boot-external.tpl
rename to contracts/hw.device-type/via-vab820-quad/boot-external.tpl
diff --git a/partials/hw.device-type/vab820-quad/boot-internal.tpl b/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
similarity index 100%
rename from partials/hw.device-type/vab820-quad/boot-internal.tpl
rename to contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
diff --git a/contracts/hw.device-type/via-vab820-quad.json b/contracts/hw.device-type/via-vab820-quad/contract.json
similarity index 88%
rename from contracts/hw.device-type/via-vab820-quad.json
rename to contracts/hw.device-type/via-vab820-quad/contract.json
index 7ab23c73..3a20f37b 100644
--- a/contracts/hw.device-type/via-vab820-quad.json
+++ b/contracts/hw.device-type/via-vab820-quad/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
new file mode 100644
index 00000000..7ef8d976
--- /dev/null
+++ b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
@@ -0,0 +1 @@
+Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/partials/hw.device-type/visual-appearance-when-off.tpl b/contracts/hw.device-type/visual-appearance-when-off.tpl
similarity index 100%
rename from partials/hw.device-type/visual-appearance-when-off.tpl
rename to contracts/hw.device-type/visual-appearance-when-off.tpl
diff --git a/contracts/hw.device-type/zc702-zynq7.json b/contracts/hw.device-type/zc702-zynq7/contract.json
similarity index 88%
rename from contracts/hw.device-type/zc702-zynq7.json
rename to contracts/hw.device-type/zc702-zynq7/contract.json
index f4823c40..23227360 100644
--- a/contracts/hw.device-type/zc702-zynq7.json
+++ b/contracts/hw.device-type/zc702-zynq7/contract.json
@@ -15,7 +15,5 @@
     "media": {
       "installation": "sdcard"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/sw.blob/download.tpl b/contracts/sw.blob/download.tpl
similarity index 100%
rename from partials/sw.blob/download.tpl
rename to contracts/sw.blob/download.tpl
diff --git a/contracts/sw.blob/entry.json b/contracts/sw.blob/entry/contract.json
similarity index 93%
rename from contracts/sw.blob/entry.json
rename to contracts/sw.blob/entry/contract.json
index 570a9c15..229d4849 100644
--- a/contracts/sw.blob/entry.json
+++ b/contracts/sw.blob/entry/contract.json
@@ -3,15 +3,14 @@
   "type": "sw.blob",
   "name": "resin entry.sh script",
   "version": "1",
-  "data": {
+  "assets": {
     "bin": {
       "main": "entry.sh"
     }
   },
-  "requires": "",  
   "variants": [
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "entry-alpine.sh",
           "url": "file://./assets/entry-alpine.sh",
@@ -23,7 +22,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "entry-no-systemd-debian.sh",
           "url": "file://./assets/entry-no-systemd-debian.sh",
@@ -35,7 +34,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "entry-systemd-debian.sh",
           "url": "file://./assets/entry-systemd-debian.sh",
@@ -54,7 +53,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "entry-fedora.sh",
           "url": "file://./assets/entry-fedora.sh",
diff --git a/contracts/sw.blob/nodejs.json b/contracts/sw.blob/nodejs/contract.json
similarity index 94%
rename from contracts/sw.blob/nodejs.json
rename to contracts/sw.blob/nodejs/contract.json
index e376f086..7bc33a2e 100644
--- a/contracts/sw.blob/nodejs.json
+++ b/contracts/sw.blob/nodejs/contract.json
@@ -9,7 +9,7 @@
       "libc": "{{libc}}"
     }
   ],
-  "data": {
+  "assets": {
     "bin": {
       "checksumType": "sha256"
     }
@@ -22,7 +22,7 @@
           "libc": "musl-libc",
           "variants": [
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-armhf.tar.gz",
                   "checksum": "99ea7697fd1a4fc297cbcfca98d920e19a8a5ffead5239db58c6f4383f56e21c"
@@ -38,7 +38,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-amd64.tar.gz",
                   "checksum": "d9591863975989387aa7369a95eaea11db9183d3c2d56b35cd2e58f15d7e17a3"
@@ -49,7 +49,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-i386.tar.gz",
                   "checksum": "140651bbd447316ac45f7fdf50a11c728f628b1d8e4c9f5deb83b5fe23c87824"
@@ -65,7 +65,7 @@
           "libc": "glibc",
           "variants": [
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armel.tar.gz",
                   "checksum": "7be6f13e407bff7eab3883764dca59dbedb751613cf23cbfe75a618a7c3ce333"
@@ -76,7 +76,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv6l.tar.gz",
                   "checksum": "af669f5fc7cb5269978144a8b6469923657119b3ee712d6bf70167e36b6812c2"
@@ -87,7 +87,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv7hf.tar.gz",
                   "checksum": "849a55c62a726386649fb9c6da8e41ac3611d8b3a1ac481959516fc95047262a"
@@ -98,7 +98,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-i386.tar.gz",
                 "checksum": "a47a28aed8307d4328ce23e5dda57d6b4bde7ddf60b41f354850f1f9cfe37750"
               },
@@ -107,7 +107,7 @@
               ]
             },
             {
-              "data": {
+              "assets": {
                 "bin": {
                   "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-x64.tar.gz",
                   "checksum": "52382b93865a5edd834db10e8f60822680d26dc2b8cadccafc351b0082a9052a"
diff --git a/contracts/sw.blob/qemu.json b/contracts/sw.blob/qemu/contract.json
similarity index 94%
rename from contracts/sw.blob/qemu.json
rename to contracts/sw.blob/qemu/contract.json
index 53be2cde..b4a28ef5 100644
--- a/contracts/sw.blob/qemu.json
+++ b/contracts/sw.blob/qemu/contract.json
@@ -3,16 +3,15 @@
   "type": "sw.blob",
   "version": "1",
   "name": "QEMU v{{version}}",
-  "data": {
+  "assets": {
     "bin": {
       "checksumType": "sha256"
     }
   },
-  "requires": "",
   "variants": [
     {
       "version": "2.9.0.resin1-arm",
-      "data": {
+      "assets": {
         "bin": {
           "name": "qemu-arm-static",
           "url": "file://./assets/qemu-arm-static",
@@ -32,7 +31,7 @@
     },
     {
       "version": "2.9.0.resin1-aarch64",
-      "data": {
+      "assets": {
         "bin": {
           "name": "qemu-aarch64-static",
           "url": "file://./assets/qemu-aarch64-static",
diff --git a/contracts/sw.blob/resin-xbuild.json b/contracts/sw.blob/resin-xbuild/contract.json
similarity index 89%
rename from contracts/sw.blob/resin-xbuild.json
rename to contracts/sw.blob/resin-xbuild/contract.json
index 7841982f..7abe2107 100644
--- a/contracts/sw.blob/resin-xbuild.json
+++ b/contracts/sw.blob/resin-xbuild/contract.json
@@ -3,7 +3,7 @@
   "type": "sw.blob",
   "name": "Resin XBuild v{{version}}",
   "version": "1.0.0",
-  "data": {
+  "assets": {
     "bin": {
       "name": "resin-xbuild{{version}}.tar.gz",
       "url": "http://resin-packages.s3.amazonaws.com/resin-xbuild/v{{version}}/resin-xbuild{{version}}.tar.gz",
@@ -11,7 +11,5 @@
       "checksumType": "sha256",
       "main": "resin-xbuild"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/contracts/sw.blob/tini.json b/contracts/sw.blob/tini/contract.json
similarity index 95%
rename from contracts/sw.blob/tini.json
rename to contracts/sw.blob/tini/contract.json
index c2734f68..0465a5e4 100644
--- a/contracts/sw.blob/tini.json
+++ b/contracts/sw.blob/tini/contract.json
@@ -3,8 +3,7 @@
   "type": "sw.blob",
   "name": "tini",
   "version": "0.14.0",
-  "requires": "",
-  "data": {
+  "assets": {
     "bin": {
       "checksumType": "sha256",
       "main": "tini"
@@ -12,7 +11,7 @@
   },
   "variants": [
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "tini{{version}}.linux-armv7hf.tar.gz",
           "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armv7hf.tar.gz",
@@ -30,7 +29,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "tini{{version}}.linux-armel.tar.gz",
           "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armel.tar.gz",
@@ -43,7 +42,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "tini{{version}}.linux-aarch64.tar.gz",
           "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-aarch64.tar.gz",
@@ -56,7 +55,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "tini{{version}}.linux-i386.tar.gz",
           "checksum": "9f4a0b536efdcbe92bc81c6e68dbf8dc1c5739e58f4e7e3a91f07094655149e8",
@@ -69,7 +68,7 @@
       ]
     },
     {
-      "data": {
+      "assets": {
         "bin": {
           "name": "tini{{version}}.linux-amd64.tar.gz",
           "checksum": "a662ee1594cb037909237c87d577b6e4dee9879f1c23279f1a829683e542e4a0",
diff --git a/partials/sw.image-writer+hw.device-type/etcher/flash.tpl b/contracts/sw.image-writer+hw.device-type/etcher/flash.tpl
similarity index 100%
rename from partials/sw.image-writer+hw.device-type/etcher/flash.tpl
rename to contracts/sw.image-writer+hw.device-type/etcher/flash.tpl
diff --git a/partials/sw.image-writer/download.tpl b/contracts/sw.image-writer/download.tpl
similarity index 100%
rename from partials/sw.image-writer/download.tpl
rename to contracts/sw.image-writer/download.tpl
diff --git a/contracts/sw.image-writer/etcher.json b/contracts/sw.image-writer/etcher/contract.json
similarity index 86%
rename from contracts/sw.image-writer/etcher.json
rename to contracts/sw.image-writer/etcher/contract.json
index 742acad0..ccfa4d9e 100644
--- a/contracts/sw.image-writer/etcher.json
+++ b/contracts/sw.image-writer/etcher/contract.json
@@ -3,13 +3,11 @@
   "type": "sw.image-writer",
   "name": "Etcher for macOS",
   "version": "1.1.2",
-  "data": {
+  "assets": {
     "bin": {
       "url": "https://github.com/resin-io/etcher/releases/download/v{{version}}/Etcher-{{version}}.dmg",
       "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4",
       "checksumType": "sha256"
     }
-  },
-  "requires": "",
-  "variants": ""
+  }
 }
diff --git a/partials/sw.os+arch.sw/alpine+aarch64/from.tpl b/contracts/sw.os+arch.sw/alpine+aarch64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine+aarch64/from.tpl
rename to contracts/sw.os+arch.sw/alpine+aarch64/from.tpl
diff --git a/partials/sw.os+arch.sw/alpine+amd64/from.tpl b/contracts/sw.os+arch.sw/alpine+amd64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine+amd64/from.tpl
rename to contracts/sw.os+arch.sw/alpine+amd64/from.tpl
diff --git a/partials/sw.os+arch.sw/alpine+armhf/from.tpl b/contracts/sw.os+arch.sw/alpine+armhf/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine+armhf/from.tpl
rename to contracts/sw.os+arch.sw/alpine+armhf/from.tpl
diff --git a/partials/sw.os+arch.sw/alpine+i386/from.tpl b/contracts/sw.os+arch.sw/alpine+i386/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine+i386/from.tpl
rename to contracts/sw.os+arch.sw/alpine+i386/from.tpl
diff --git a/partials/sw.os+arch.sw/alpine/base-dependencies.tpl b/contracts/sw.os+arch.sw/alpine/base-dependencies.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine/base-dependencies.tpl
rename to contracts/sw.os+arch.sw/alpine/base-dependencies.tpl
diff --git a/partials/sw.os+arch.sw/alpine/init-system.tpl b/contracts/sw.os+arch.sw/alpine/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine/init-system.tpl
rename to contracts/sw.os+arch.sw/alpine/init-system.tpl
diff --git a/partials/sw.os+arch.sw/alpine/os-config.tpl b/contracts/sw.os+arch.sw/alpine/os-config.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine/os-config.tpl
rename to contracts/sw.os+arch.sw/alpine/os-config.tpl
diff --git a/partials/sw.os+arch.sw/alpine/tini.tpl b/contracts/sw.os+arch.sw/alpine/tini.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/alpine/tini.tpl
rename to contracts/sw.os+arch.sw/alpine/tini.tpl
diff --git a/partials/sw.os+arch.sw/debian+aarch64/from.tpl b/contracts/sw.os+arch.sw/debian+aarch64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+aarch64/from.tpl
rename to contracts/sw.os+arch.sw/debian+aarch64/from.tpl
diff --git a/partials/sw.os+arch.sw/debian+amd64/from.tpl b/contracts/sw.os+arch.sw/debian+amd64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+amd64/from.tpl
rename to contracts/sw.os+arch.sw/debian+amd64/from.tpl
diff --git a/partials/sw.os+arch.sw/debian+armel/from.tpl b/contracts/sw.os+arch.sw/debian+armel/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+armel/from.tpl
rename to contracts/sw.os+arch.sw/debian+armel/from.tpl
diff --git a/partials/sw.os+arch.sw/debian+armel/qemu.tpl b/contracts/sw.os+arch.sw/debian+armel/qemu.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+armel/qemu.tpl
rename to contracts/sw.os+arch.sw/debian+armel/qemu.tpl
diff --git a/partials/sw.os+arch.sw/debian+armv7hf/from.tpl b/contracts/sw.os+arch.sw/debian+armv7hf/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+armv7hf/from.tpl
rename to contracts/sw.os+arch.sw/debian+armv7hf/from.tpl
diff --git a/partials/sw.os+arch.sw/debian+i386/from.tpl b/contracts/sw.os+arch.sw/debian+i386/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian+i386/from.tpl
rename to contracts/sw.os+arch.sw/debian+i386/from.tpl
diff --git a/partials/sw.os+arch.sw/debian/base-dependencies.tpl b/contracts/sw.os+arch.sw/debian/base-dependencies.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian/base-dependencies.tpl
rename to contracts/sw.os+arch.sw/debian/base-dependencies.tpl
diff --git a/partials/sw.os+arch.sw/debian/init-system.tpl b/contracts/sw.os+arch.sw/debian/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian/init-system.tpl
rename to contracts/sw.os+arch.sw/debian/init-system.tpl
diff --git a/partials/sw.os+arch.sw/debian/os-config.tpl b/contracts/sw.os+arch.sw/debian/os-config.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian/os-config.tpl
rename to contracts/sw.os+arch.sw/debian/os-config.tpl
diff --git a/partials/sw.os+arch.sw/debian@jessie/init-system.tpl b/contracts/sw.os+arch.sw/debian@jessie/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian@jessie/init-system.tpl
rename to contracts/sw.os+arch.sw/debian@jessie/init-system.tpl
diff --git a/partials/sw.os+arch.sw/debian@wheezy/init-system.tpl b/contracts/sw.os+arch.sw/debian@wheezy/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/debian@wheezy/init-system.tpl
rename to contracts/sw.os+arch.sw/debian@wheezy/init-system.tpl
diff --git a/partials/sw.os+arch.sw/fedora+aarch64/from.tpl b/contracts/sw.os+arch.sw/fedora+aarch64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora+aarch64/from.tpl
rename to contracts/sw.os+arch.sw/fedora+aarch64/from.tpl
diff --git a/partials/sw.os+arch.sw/fedora+amd64/from.tpl b/contracts/sw.os+arch.sw/fedora+amd64/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora+amd64/from.tpl
rename to contracts/sw.os+arch.sw/fedora+amd64/from.tpl
diff --git a/partials/sw.os+arch.sw/fedora+armv7hf/from.tpl b/contracts/sw.os+arch.sw/fedora+armv7hf/from.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora+armv7hf/from.tpl
rename to contracts/sw.os+arch.sw/fedora+armv7hf/from.tpl
diff --git a/partials/sw.os+arch.sw/fedora+armv7hf/os-config.tpl b/contracts/sw.os+arch.sw/fedora+armv7hf/os-config.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora+armv7hf/os-config.tpl
rename to contracts/sw.os+arch.sw/fedora+armv7hf/os-config.tpl
diff --git a/partials/sw.os+arch.sw/fedora/base-dependencies.tpl b/contracts/sw.os+arch.sw/fedora/base-dependencies.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora/base-dependencies.tpl
rename to contracts/sw.os+arch.sw/fedora/base-dependencies.tpl
diff --git a/partials/sw.os+arch.sw/fedora/init-system.tpl b/contracts/sw.os+arch.sw/fedora/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora/init-system.tpl
rename to contracts/sw.os+arch.sw/fedora/init-system.tpl
diff --git a/partials/sw.os+arch.sw/fedora/os-config.tpl b/contracts/sw.os+arch.sw/fedora/os-config.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora/os-config.tpl
rename to contracts/sw.os+arch.sw/fedora/os-config.tpl
diff --git a/partials/sw.os+arch.sw/fedora@24/init-system.tpl b/contracts/sw.os+arch.sw/fedora@24/init-system.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/fedora@24/init-system.tpl
rename to contracts/sw.os+arch.sw/fedora@24/init-system.tpl
diff --git a/partials/sw.os+arch.sw/qemu.tpl b/contracts/sw.os+arch.sw/qemu.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/qemu.tpl
rename to contracts/sw.os+arch.sw/qemu.tpl
diff --git a/partials/sw.os+arch.sw/resin-xbuild.tpl b/contracts/sw.os+arch.sw/resin-xbuild.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/resin-xbuild.tpl
rename to contracts/sw.os+arch.sw/resin-xbuild.tpl
diff --git a/partials/sw.os+arch.sw/tini.tpl b/contracts/sw.os+arch.sw/tini.tpl
similarity index 100%
rename from partials/sw.os+arch.sw/tini.tpl
rename to contracts/sw.os+arch.sw/tini.tpl
diff --git a/partials/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl
rename to contracts/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl
rename to contracts/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl
rename to contracts/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/alpine/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/alpine/dependencies.tpl
rename to contracts/sw.os+hw.device-type/alpine/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+iot2000/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+iot2000/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+iot2000/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+iot2000/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian+up-board/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+up-board/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian+up-board/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian+up-board/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian/dependencies.tpl b/contracts/sw.os+hw.device-type/debian/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian/dependencies.tpl
rename to contracts/sw.os+hw.device-type/debian/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/debian/distro-config.tpl b/contracts/sw.os+hw.device-type/debian/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl
rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/dependencies.tpl b/contracts/sw.os+hw.device-type/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/dependencies.tpl
rename to contracts/sw.os+hw.device-type/dependencies.tpl
diff --git a/partials/sw.os+hw.device-type/distro-config.tpl b/contracts/sw.os+hw.device-type/distro-config.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/distro-config.tpl
rename to contracts/sw.os+hw.device-type/distro-config.tpl
diff --git a/partials/sw.os+hw.device-type/fedora/dependencies.tpl b/contracts/sw.os+hw.device-type/fedora/dependencies.tpl
similarity index 100%
rename from partials/sw.os+hw.device-type/fedora/dependencies.tpl
rename to contracts/sw.os+hw.device-type/fedora/dependencies.tpl
diff --git a/partials/sw.os-flasher/description-of-internal-process.tpl b/contracts/sw.os-flasher/description-of-internal-process.tpl
similarity index 100%
rename from partials/sw.os-flasher/description-of-internal-process.tpl
rename to contracts/sw.os-flasher/description-of-internal-process.tpl
diff --git a/partials/sw.os-image/download.tpl b/contracts/sw.os-image/download.tpl
similarity index 100%
rename from partials/sw.os-image/download.tpl
rename to contracts/sw.os-image/download.tpl
diff --git a/contracts/sw.os-image/resinos.json b/contracts/sw.os-image/resinos/contract.json
similarity index 92%
rename from contracts/sw.os-image/resinos.json
rename to contracts/sw.os-image/resinos/contract.json
index 191b4533..d5787952 100644
--- a/contracts/sw.os-image/resinos.json
+++ b/contracts/sw.os-image/resinos/contract.json
@@ -9,10 +9,9 @@
       "slug": "raspberrypi3"
     }
   ],
-  "data": {
+  "assets": {
     "url": "https://files.resin.io/resinos/raspberrypi3/{{version}}/image/resin.img.zip",
     "checksumType": "sha256",
     "checksum": "29c1fef73e8636c79ab1d835bc1d90f115d7683585eaf39874a2eab739b74baf"
-  },
-  "variants": ""
+  }
 }
diff --git a/partials/sw.os-image/resinos/download.tpl b/contracts/sw.os-image/resinos/download.tpl
similarity index 100%
rename from partials/sw.os-image/resinos/download.tpl
rename to contracts/sw.os-image/resinos/download.tpl
diff --git a/contracts/sw.os/alpine.json b/contracts/sw.os/alpine/contract.json
similarity index 96%
rename from contracts/sw.os/alpine.json
rename to contracts/sw.os/alpine/contract.json
index fc893fc9..d520a9a4 100644
--- a/contracts/sw.os/alpine.json
+++ b/contracts/sw.os/alpine/contract.json
@@ -2,7 +2,7 @@
   "slug": "alpine",
   "type": "sw.os",
   "version": "1",
-  "data":{ "libc": "musl-libc" },
+  "data": { "libc": "musl-libc" },
   "name": "Alpine Linux {{version}}",
   "requires": [
     { "type": "sw.blob", "slug": "tini" },
diff --git a/contracts/sw.os/debian.json b/contracts/sw.os/debian/contract.json
similarity index 98%
rename from contracts/sw.os/debian.json
rename to contracts/sw.os/debian/contract.json
index d97fd5d7..d0f5f1ce 100644
--- a/contracts/sw.os/debian.json
+++ b/contracts/sw.os/debian/contract.json
@@ -3,6 +3,7 @@
   "type": "sw.os",
   "version": "1",
   "data": { "libc": "glibc" },
+  "name": "Debian {{version}}",
   "requires": [
     { "type": "sw.blob", "slug": "tini" },
     { "type": "sw.blob", "slug": "resin-xbuild" },
diff --git a/contracts/sw.os/fedora.json b/contracts/sw.os/fedora/contract.json
similarity index 100%
rename from contracts/sw.os/fedora.json
rename to contracts/sw.os/fedora/contract.json
diff --git a/contracts/sw.os/resinos.json b/contracts/sw.os/resinos/contract.json
similarity index 92%
rename from contracts/sw.os/resinos.json
rename to contracts/sw.os/resinos/contract.json
index 5f942f97..4e77dac1 100644
--- a/contracts/sw.os/resinos.json
+++ b/contracts/sw.os/resinos/contract.json
@@ -13,6 +13,5 @@
       "type": "sw.os-image",
       "slug": "resinos"
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/sw.stack/go.json b/contracts/sw.stack/go/contract.json
similarity index 98%
rename from contracts/sw.stack/go.json
rename to contracts/sw.stack/go/contract.json
index fc5d7d2d..cee716d6 100644
--- a/contracts/sw.stack/go.json
+++ b/contracts/sw.stack/go/contract.json
@@ -3,7 +3,6 @@
   "type": "sw.stack",
   "name": "Go {{version}}",
   "version": "1",
-  "data": "",
   "requires": [
     {
       "or": [
diff --git a/contracts/sw.stack/java.json b/contracts/sw.stack/java/contract.json
similarity index 98%
rename from contracts/sw.stack/java.json
rename to contracts/sw.stack/java/contract.json
index 85906b02..a6fb4756 100644
--- a/contracts/sw.stack/java.json
+++ b/contracts/sw.stack/java/contract.json
@@ -3,7 +3,6 @@
   "type": "sw.stack",
   "name": "Java {{version}}",
   "version": "1",
-  "data": "",
   "requires": [
     {
       "or": [
diff --git a/contracts/sw.stack/nodejs.json b/contracts/sw.stack/nodejs/contract.json
similarity index 99%
rename from contracts/sw.stack/nodejs.json
rename to contracts/sw.stack/nodejs/contract.json
index 318c8d76..cd4614c7 100644
--- a/contracts/sw.stack/nodejs.json
+++ b/contracts/sw.stack/nodejs/contract.json
@@ -3,7 +3,6 @@
   "type": "sw.stack",
   "name": "Node.js {{version}}",
   "version": "1",
-  "data": "",
   "requires": [
     {
       "or": [
diff --git a/contracts/sw.stack/python.json b/contracts/sw.stack/python/contract.json
similarity index 98%
rename from contracts/sw.stack/python.json
rename to contracts/sw.stack/python/contract.json
index e7d20d71..716520c7 100644
--- a/contracts/sw.stack/python.json
+++ b/contracts/sw.stack/python/contract.json
@@ -3,7 +3,6 @@
   "type": "sw.stack",
   "name": "Python {{version}}",
   "version": "1",
-  "data": "",
   "requires": [
     {
       "or": [
diff --git a/contracts/sw.variant/jdk.json b/contracts/sw.variant/jdk.json
deleted file mode 100644
index d0d85cb3..00000000
--- a/contracts/sw.variant/jdk.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "slug": "jdk",
-  "version": "1",
-  "type": "sw.variant",
-  "name": "JDK",
-  "data": "",
-  "requires": [
-    {
-      "or": [
-        { "type": "sw.os", "slug": "fedora" },
-        { "type": "sw.os", "slug": "debian" },
-        { "type": "sw.os", "slug": "raspbian" },
-        { "type": "sw.os", "slug": "alpine" }
-      ]
-    },
-    {
-      "type": "sw.stack",
-      "slug": "java"
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/sw.variant/jre.json b/contracts/sw.variant/jre.json
deleted file mode 100644
index 9ca22260..00000000
--- a/contracts/sw.variant/jre.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "slug": "jre",
-  "version": "1",
-  "type": "sw.variant",
-  "name": "JRE",
-  "data": "",
-  "requires": [
-    {
-      "or": [
-        { "type": "sw.os", "slug": "fedora" },
-        { "type": "sw.os", "slug": "debian" },
-        { "type": "sw.os", "slug": "raspbian" },
-        { "type": "sw.os", "slug": "alpine" }
-      ]
-    },
-    {
-      "type": "sw.stack",
-      "slug": "java"
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/sw.variant/onbuild.json b/contracts/sw.variant/onbuild.json
deleted file mode 100644
index b8975215..00000000
--- a/contracts/sw.variant/onbuild.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "slug": "onbuild",
-  "version": "1",
-  "type": "sw.variant",
-  "name": "On Build",
-  "data": "",
-  "requires": [
-    {
-      "or": [
-        { "type": "sw.os", "slug": "fedora" },
-        { "type": "sw.os", "slug": "debian" },
-        { "type": "sw.os", "slug": "raspbian" },
-        { "type": "sw.os", "slug": "alpine" }
-      ]
-    },
-    {
-      "or": [
-        { "type": "sw.stack", "slug": "go" },
-        { "type": "sw.stack", "slug": "nodejs" },
-        { "type": "sw.stack", "slug": "python" }
-      ]
-    }
-  ],
-  "variants": ""
-}
diff --git a/contracts/sw.variant/slim.json b/contracts/sw.variant/slim.json
deleted file mode 100644
index f8c151f4..00000000
--- a/contracts/sw.variant/slim.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "slug": "slim",
-  "version": "1",
-  "type": "sw.variant",
-  "name": "Slim",
-  "data": "",
-  "requires": [
-    {
-      "or": [
-        { "type": "sw.os", "slug": "fedora" },
-        { "type": "sw.os", "slug": "debian" },
-        { "type": "sw.os", "slug": "raspbian" },
-        { "type": "sw.os", "slug": "alpine" }
-      ]
-    },
-    {
-      "or": [
-        { "type": "sw.stack", "slug": "go" },
-        { "type": "sw.stack", "slug": "nodejs" },
-        { "type": "sw.stack", "slug": "python" }
-      ]
-    }
-  ],
-  "variants": ""
-}