diff --git a/petitboot.exp b/reboot/petitboot.exp
similarity index 100%
rename from petitboot.exp
rename to reboot/petitboot.exp
diff --git a/reboot.sh b/reboot/reboot.sh
similarity index 75%
rename from reboot.sh
rename to reboot/reboot.sh
index 162d8ed..5b035e7 100755
--- a/reboot.sh
+++ b/reboot/reboot.sh
@@ -13,7 +13,6 @@
     ssh ${CONNECT} /usr/sbin/obmcutil poweron
     time expect petitboot.exp -- ${CONNECT}
     ssh ${CONNECT} /usr/sbin/obmcutil poweroff
-    sleep 20 # mboxd reload period. Remove when protocol v2 daemon is integrated
 
     i=$(($i + 1))