diff --git a/gnomeos/0001-Support-OSTree.patch b/gnomeos/debian/0001-Support-OSTree.patch
similarity index 100%
rename from gnomeos/0001-Support-OSTree.patch
rename to gnomeos/debian/0001-Support-OSTree.patch
diff --git a/gnomeos/debian-setup.sh b/gnomeos/debian/debian-setup.sh
similarity index 100%
rename from gnomeos/debian-setup.sh
rename to gnomeos/debian/debian-setup.sh
diff --git a/gnomeos/gnomeos-install.sh b/gnomeos/debian/gnomeos-install.sh
similarity index 100%
rename from gnomeos/gnomeos-install.sh
rename to gnomeos/debian/gnomeos-install.sh
diff --git a/gnomeos/gnomeos-make-base.sh b/gnomeos/debian/gnomeos-make-base.sh
similarity index 98%
rename from gnomeos/gnomeos-make-base.sh
rename to gnomeos/debian/gnomeos-make-base.sh
index 235808c7..50e29d5e 100755
--- a/gnomeos/gnomeos-make-base.sh
+++ b/gnomeos/debian/gnomeos-make-base.sh
@@ -182,7 +182,9 @@ if ! test -d ${OBJ}; then
 fi
 
 cd ${WORKDIR}
-cp ${SRCDIR}/ostree_switch_root ${WORKDIR}
+(cd ${SRCDIR}/..;
+ make ostree_switch_root;
+ cp ostree_switch_root ${WORKDIR})
 
 kv=`uname -r`
 kernel=/boot/vmlinuz-${kv}
diff --git a/gnomeos/gnomeos-run.sh b/gnomeos/debian/gnomeos-run.sh
similarity index 100%
rename from gnomeos/gnomeos-run.sh
rename to gnomeos/debian/gnomeos-run.sh