diff --git a/mk_mmc.sh b/mk_mmc.sh
index 12a3f60..df4acbf 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -127,13 +127,13 @@ case "$SYSTEM" in
 esac
 
  if [ "$USB_ROOTFS" ];then
-  sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/dvi-normal-*.cmd
+  sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
 
-  sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/serial-normal-*.cmd
+  sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
  fi
 
  if [ "$PRINTK" ];then
-  sed -i 's/bootargs/bootargs earlyprintk/g' ${DIR}/scripts/serial*.cmd
+  sed -i 's/bootargs/bootargs earlyprintk/g' ${DIR}/scripts/boot.scr/serial*.cmd
  fi
 
 }
@@ -512,13 +512,13 @@ echo "uImage"
 sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
 
 if [ "${SERIAL_MODE}" ] ; then
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/serial.cmd ${TEMPDIR}/disk/boot.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
- sudo cp -v ${DIR}/scripts/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/boot.scr/serial.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/boot.scr/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
+ sudo cp -v ${DIR}/scripts/boot.scr/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
 else
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/dvi.cmd ${TEMPDIR}/disk/boot.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
- sudo cp -v ${DIR}/scripts/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/boot.scr/dvi.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/boot.scr/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
+ sudo cp -v ${DIR}/scripts/boot.scr/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
 fi
 
 sudo cp -v ${DIR}/dl/${DIST}/linux-image-${KERNEL}_1.0${DIST}_armel.deb ${TEMPDIR}/disk/
@@ -740,13 +740,13 @@ echo "done"
 function reset_scripts {
 
  if [ "$USB_ROOTFS" ];then
-  sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-*.cmd
+  sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
 
-  sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/serial-normal-*.cmd
+  sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
  fi
 
  if [ "$PRINTK" ];then
-  sed -i 's/bootargs earlyprintk/bootargs/g' ${DIR}/scripts/serial*.cmd
+  sed -i 's/bootargs earlyprintk/bootargs/g' ${DIR}/scripts/boot.scr/serial*.cmd
  fi
 
 }
diff --git a/scripts/dvi-normal-maverick.cmd b/scripts/boot.scr/dvi-normal-maverick.cmd
similarity index 100%
rename from scripts/dvi-normal-maverick.cmd
rename to scripts/boot.scr/dvi-normal-maverick.cmd
diff --git a/scripts/dvi-normal-natty.cmd b/scripts/boot.scr/dvi-normal-natty.cmd
similarity index 100%
rename from scripts/dvi-normal-natty.cmd
rename to scripts/boot.scr/dvi-normal-natty.cmd
diff --git a/scripts/dvi-normal-squeeze.cmd b/scripts/boot.scr/dvi-normal-squeeze.cmd
similarity index 100%
rename from scripts/dvi-normal-squeeze.cmd
rename to scripts/boot.scr/dvi-normal-squeeze.cmd
diff --git a/scripts/dvi.cmd b/scripts/boot.scr/dvi.cmd
similarity index 100%
rename from scripts/dvi.cmd
rename to scripts/boot.scr/dvi.cmd
diff --git a/scripts/serial-normal-maverick.cmd b/scripts/boot.scr/serial-normal-maverick.cmd
similarity index 100%
rename from scripts/serial-normal-maverick.cmd
rename to scripts/boot.scr/serial-normal-maverick.cmd
diff --git a/scripts/serial-normal-natty.cmd b/scripts/boot.scr/serial-normal-natty.cmd
similarity index 100%
rename from scripts/serial-normal-natty.cmd
rename to scripts/boot.scr/serial-normal-natty.cmd
diff --git a/scripts/serial-normal-squeeze.cmd b/scripts/boot.scr/serial-normal-squeeze.cmd
similarity index 100%
rename from scripts/serial-normal-squeeze.cmd
rename to scripts/boot.scr/serial-normal-squeeze.cmd
diff --git a/scripts/serial.cmd b/scripts/boot.scr/serial.cmd
similarity index 100%
rename from scripts/serial.cmd
rename to scripts/boot.scr/serial.cmd