diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb b/gnomeos/yocto/classes/gnomeos-contents.bbclass
similarity index 98%
rename from gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
rename to gnomeos/yocto/classes/gnomeos-contents.bbclass
index 63b661b0..b84c148f 100644
--- a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -10,7 +10,8 @@ inherit rootfs_${IMAGE_PKGTYPE}
 PACKAGE_INSTALL = "task-core-boot \
 		   coreutils \
 		   ostree ostree-init \
-		   strace"
+		   strace \
+		   python-core python-misc"
 
 RDEPENDS += "${PACKAGE_INSTALL}"
 DEPENDS += "makedevs-native virtual/fakeroot-native"
diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
new file mode 100644
index 00000000..d70a704f
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents
diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
new file mode 100644
index 00000000..ff8d2aa3
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents
+
+PACKAGE_INSTALL += "task-core-sdk"