diff --git a/flash-tool/COPYING b/inflash/COPYING
similarity index 100%
rename from flash-tool/COPYING
rename to inflash/COPYING
diff --git a/flash-tool/ChangeLog b/inflash/ChangeLog
similarity index 100%
rename from flash-tool/ChangeLog
rename to inflash/ChangeLog
diff --git a/flash-tool/Makefile.am b/inflash/Makefile.am
similarity index 100%
rename from flash-tool/Makefile.am
rename to inflash/Makefile.am
diff --git a/flash-tool/README b/inflash/README
similarity index 100%
rename from flash-tool/README
rename to inflash/README
diff --git a/flash-tool/autogen.sh b/inflash/autogen.sh
similarity index 100%
rename from flash-tool/autogen.sh
rename to inflash/autogen.sh
diff --git a/flash-tool/configure.ac b/inflash/configure.ac
similarity index 100%
rename from flash-tool/configure.ac
rename to inflash/configure.ac
diff --git a/flash-tool/debian/changelog b/inflash/debian/changelog
similarity index 100%
rename from flash-tool/debian/changelog
rename to inflash/debian/changelog
diff --git a/flash-tool/debian/compat b/inflash/debian/compat
similarity index 100%
rename from flash-tool/debian/compat
rename to inflash/debian/compat
diff --git a/flash-tool/debian/control b/inflash/debian/control
similarity index 100%
rename from flash-tool/debian/control
rename to inflash/debian/control
diff --git a/flash-tool/debian/copyright b/inflash/debian/copyright
similarity index 100%
rename from flash-tool/debian/copyright
rename to inflash/debian/copyright
diff --git a/flash-tool/debian/cron.d.ex b/inflash/debian/cron.d.ex
similarity index 100%
rename from flash-tool/debian/cron.d.ex
rename to inflash/debian/cron.d.ex
diff --git a/flash-tool/debian/dirs b/inflash/debian/dirs
similarity index 100%
rename from flash-tool/debian/dirs
rename to inflash/debian/dirs
diff --git a/flash-tool/debian/docs b/inflash/debian/docs
similarity index 100%
rename from flash-tool/debian/docs
rename to inflash/debian/docs
diff --git a/flash-tool/debian/inflash.default.ex b/inflash/debian/inflash.default.ex
similarity index 100%
rename from flash-tool/debian/inflash.default.ex
rename to inflash/debian/inflash.default.ex
diff --git a/flash-tool/debian/inflash.doc-base.EX b/inflash/debian/inflash.doc-base.EX
similarity index 100%
rename from flash-tool/debian/inflash.doc-base.EX
rename to inflash/debian/inflash.doc-base.EX
diff --git a/flash-tool/debian/init.d.lsb.ex b/inflash/debian/init.d.lsb.ex
similarity index 100%
rename from flash-tool/debian/init.d.lsb.ex
rename to inflash/debian/init.d.lsb.ex
diff --git a/flash-tool/debian/manpage.1.ex b/inflash/debian/manpage.1.ex
similarity index 100%
rename from flash-tool/debian/manpage.1.ex
rename to inflash/debian/manpage.1.ex
diff --git a/flash-tool/debian/manpage.sgml.ex b/inflash/debian/manpage.sgml.ex
similarity index 100%
rename from flash-tool/debian/manpage.sgml.ex
rename to inflash/debian/manpage.sgml.ex
diff --git a/flash-tool/debian/manpage.xml.ex b/inflash/debian/manpage.xml.ex
similarity index 100%
rename from flash-tool/debian/manpage.xml.ex
rename to inflash/debian/manpage.xml.ex
diff --git a/flash-tool/debian/menu.ex b/inflash/debian/menu.ex
similarity index 100%
rename from flash-tool/debian/menu.ex
rename to inflash/debian/menu.ex
diff --git a/flash-tool/debian/postinst.ex b/inflash/debian/postinst.ex
similarity index 100%
rename from flash-tool/debian/postinst.ex
rename to inflash/debian/postinst.ex
diff --git a/flash-tool/debian/postrm.ex b/inflash/debian/postrm.ex
similarity index 100%
rename from flash-tool/debian/postrm.ex
rename to inflash/debian/postrm.ex
diff --git a/flash-tool/debian/preinst.ex b/inflash/debian/preinst.ex
similarity index 100%
rename from flash-tool/debian/preinst.ex
rename to inflash/debian/preinst.ex
diff --git a/flash-tool/debian/prerm.ex b/inflash/debian/prerm.ex
similarity index 100%
rename from flash-tool/debian/prerm.ex
rename to inflash/debian/prerm.ex
diff --git a/flash-tool/debian/rules b/inflash/debian/rules
similarity index 100%
rename from flash-tool/debian/rules
rename to inflash/debian/rules
diff --git a/flash-tool/debian/watch.ex b/inflash/debian/watch.ex
similarity index 100%
rename from flash-tool/debian/watch.ex
rename to inflash/debian/watch.ex
diff --git a/flash-tool/src/Makefile.am b/inflash/src/Makefile.am
similarity index 87%
rename from flash-tool/src/Makefile.am
rename to inflash/src/Makefile.am
index 901547e..14530a1 100644
--- a/flash-tool/src/Makefile.am
+++ b/inflash/src/Makefile.am
@@ -12,6 +12,6 @@ inflash_SOURCES = cmd.c  command_line.c  ingenic_cfg.c  \
 prefix = /usr
 
 datadir = /usr/share/inflash
-data_DATA = ../xburst_stage1/xburst_stage1.bin ../xburst_stage2/usb_boot.bin \
+data_DATA = ../xburst_stage1/xburst_stage1.bin ../device_stage2/usb_boot.bin \
 	usb_boot.cfg
 EXTRA_DIST = $(datadir)
diff --git a/flash-tool/src/cmd.c b/inflash/src/cmd.c
similarity index 100%
rename from flash-tool/src/cmd.c
rename to inflash/src/cmd.c
diff --git a/flash-tool/src/cmd.h b/inflash/src/cmd.h
similarity index 100%
rename from flash-tool/src/cmd.h
rename to inflash/src/cmd.h
diff --git a/flash-tool/src/command_line.c b/inflash/src/command_line.c
similarity index 100%
rename from flash-tool/src/command_line.c
rename to inflash/src/command_line.c
diff --git a/flash-tool/src/command_line.h b/inflash/src/command_line.h
similarity index 100%
rename from flash-tool/src/command_line.h
rename to inflash/src/command_line.h
diff --git a/flash-tool/src/ingenic_cfg.c b/inflash/src/ingenic_cfg.c
similarity index 100%
rename from flash-tool/src/ingenic_cfg.c
rename to inflash/src/ingenic_cfg.c
diff --git a/flash-tool/src/ingenic_cfg.h b/inflash/src/ingenic_cfg.h
similarity index 100%
rename from flash-tool/src/ingenic_cfg.h
rename to inflash/src/ingenic_cfg.h
diff --git a/flash-tool/src/ingenic_usb.c b/inflash/src/ingenic_usb.c
similarity index 100%
rename from flash-tool/src/ingenic_usb.c
rename to inflash/src/ingenic_usb.c
diff --git a/flash-tool/src/ingenic_usb.h b/inflash/src/ingenic_usb.h
similarity index 100%
rename from flash-tool/src/ingenic_usb.h
rename to inflash/src/ingenic_usb.h
diff --git a/flash-tool/src/main.c b/inflash/src/main.c
similarity index 100%
rename from flash-tool/src/main.c
rename to inflash/src/main.c
diff --git a/flash-tool/src/usb_boot.cfg b/inflash/src/usb_boot.cfg
similarity index 100%
rename from flash-tool/src/usb_boot.cfg
rename to inflash/src/usb_boot.cfg
diff --git a/flash-tool/src/usb_boot_defines.h b/inflash/src/usb_boot_defines.h
similarity index 100%
rename from flash-tool/src/usb_boot_defines.h
rename to inflash/src/usb_boot_defines.h
diff --git a/flash-tool/xburst_stage1/Makefile b/inflash/xburst_stage1/Makefile
similarity index 100%
rename from flash-tool/xburst_stage1/Makefile
rename to inflash/xburst_stage1/Makefile
diff --git a/flash-tool/xburst_stage1/board_4740.c b/inflash/xburst_stage1/board_4740.c
similarity index 100%
rename from flash-tool/xburst_stage1/board_4740.c
rename to inflash/xburst_stage1/board_4740.c
diff --git a/flash-tool/xburst_stage1/board_4750.c b/inflash/xburst_stage1/board_4750.c
similarity index 100%
rename from flash-tool/xburst_stage1/board_4750.c
rename to inflash/xburst_stage1/board_4750.c
diff --git a/flash-tool/xburst_stage1/common.c b/inflash/xburst_stage1/common.c
similarity index 100%
rename from flash-tool/xburst_stage1/common.c
rename to inflash/xburst_stage1/common.c
diff --git a/flash-tool/xburst_stage1/configs.h b/inflash/xburst_stage1/configs.h
similarity index 100%
rename from flash-tool/xburst_stage1/configs.h
rename to inflash/xburst_stage1/configs.h
diff --git a/flash-tool/xburst_stage1/debug.c b/inflash/xburst_stage1/debug.c
similarity index 100%
rename from flash-tool/xburst_stage1/debug.c
rename to inflash/xburst_stage1/debug.c
diff --git a/flash-tool/xburst_stage1/head.S b/inflash/xburst_stage1/head.S
similarity index 100%
rename from flash-tool/xburst_stage1/head.S
rename to inflash/xburst_stage1/head.S
diff --git a/flash-tool/xburst_stage1/jz4740.h b/inflash/xburst_stage1/jz4740.h
similarity index 100%
rename from flash-tool/xburst_stage1/jz4740.h
rename to inflash/xburst_stage1/jz4740.h
diff --git a/flash-tool/xburst_stage1/jz4750.h b/inflash/xburst_stage1/jz4750.h
similarity index 100%
rename from flash-tool/xburst_stage1/jz4750.h
rename to inflash/xburst_stage1/jz4750.h
diff --git a/flash-tool/xburst_stage1/main.c b/inflash/xburst_stage1/main.c
similarity index 100%
rename from flash-tool/xburst_stage1/main.c
rename to inflash/xburst_stage1/main.c
diff --git a/flash-tool/xburst_stage1/target.ld b/inflash/xburst_stage1/target.ld
similarity index 100%
rename from flash-tool/xburst_stage1/target.ld
rename to inflash/xburst_stage1/target.ld
diff --git a/flash-tool/xburst_stage2/Makefile b/inflash/xburst_stage2/Makefile
similarity index 100%
rename from flash-tool/xburst_stage2/Makefile
rename to inflash/xburst_stage2/Makefile
diff --git a/flash-tool/xburst_stage2/include/archdefs.h b/inflash/xburst_stage2/include/archdefs.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/archdefs.h
rename to inflash/xburst_stage2/include/archdefs.h
diff --git a/flash-tool/xburst_stage2/include/error.h b/inflash/xburst_stage2/include/error.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/error.h
rename to inflash/xburst_stage2/include/error.h
diff --git a/flash-tool/xburst_stage2/include/jz4740.h b/inflash/xburst_stage2/include/jz4740.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/jz4740.h
rename to inflash/xburst_stage2/include/jz4740.h
diff --git a/flash-tool/xburst_stage2/include/jz4750.h b/inflash/xburst_stage2/include/jz4750.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/jz4750.h
rename to inflash/xburst_stage2/include/jz4750.h
diff --git a/flash-tool/xburst_stage2/include/mips.h b/inflash/xburst_stage2/include/mips.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/mips.h
rename to inflash/xburst_stage2/include/mips.h
diff --git a/flash-tool/xburst_stage2/include/mipsregs.h b/inflash/xburst_stage2/include/mipsregs.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/mipsregs.h
rename to inflash/xburst_stage2/include/mipsregs.h
diff --git a/flash-tool/xburst_stage2/include/nandflash.h b/inflash/xburst_stage2/include/nandflash.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/nandflash.h
rename to inflash/xburst_stage2/include/nandflash.h
diff --git a/flash-tool/xburst_stage2/include/sysdefs.h b/inflash/xburst_stage2/include/sysdefs.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/sysdefs.h
rename to inflash/xburst_stage2/include/sysdefs.h
diff --git a/flash-tool/xburst_stage2/include/udc.h b/inflash/xburst_stage2/include/udc.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/udc.h
rename to inflash/xburst_stage2/include/udc.h
diff --git a/flash-tool/xburst_stage2/include/usb.h b/inflash/xburst_stage2/include/usb.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/usb.h
rename to inflash/xburst_stage2/include/usb.h
diff --git a/flash-tool/xburst_stage2/include/usb_boot.h b/inflash/xburst_stage2/include/usb_boot.h
similarity index 100%
rename from flash-tool/xburst_stage2/include/usb_boot.h
rename to inflash/xburst_stage2/include/usb_boot.h
diff --git a/flash-tool/xburst_stage2/nandflash/nandflash_4740.c b/inflash/xburst_stage2/nandflash/nandflash_4740.c
similarity index 100%
rename from flash-tool/xburst_stage2/nandflash/nandflash_4740.c
rename to inflash/xburst_stage2/nandflash/nandflash_4740.c
diff --git a/flash-tool/xburst_stage2/nandflash/nandflash_4750.c b/inflash/xburst_stage2/nandflash/nandflash_4750.c
similarity index 100%
rename from flash-tool/xburst_stage2/nandflash/nandflash_4750.c
rename to inflash/xburst_stage2/nandflash/nandflash_4750.c
diff --git a/flash-tool/xburst_stage2/target.ld b/inflash/xburst_stage2/target.ld
similarity index 100%
rename from flash-tool/xburst_stage2/target.ld
rename to inflash/xburst_stage2/target.ld
diff --git a/flash-tool/xburst_stage2/usb_boot/boothandler.c b/inflash/xburst_stage2/usb_boot/boothandler.c
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/boothandler.c
rename to inflash/xburst_stage2/usb_boot/boothandler.c
diff --git a/flash-tool/xburst_stage2/usb_boot/cache.c b/inflash/xburst_stage2/usb_boot/cache.c
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/cache.c
rename to inflash/xburst_stage2/usb_boot/cache.c
diff --git a/flash-tool/xburst_stage2/usb_boot/head.S b/inflash/xburst_stage2/usb_boot/head.S
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/head.S
rename to inflash/xburst_stage2/usb_boot/head.S
diff --git a/flash-tool/xburst_stage2/usb_boot/main.c b/inflash/xburst_stage2/usb_boot/main.c
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/main.c
rename to inflash/xburst_stage2/usb_boot/main.c
diff --git a/flash-tool/xburst_stage2/usb_boot/serial.c b/inflash/xburst_stage2/usb_boot/serial.c
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/serial.c
rename to inflash/xburst_stage2/usb_boot/serial.c
diff --git a/flash-tool/xburst_stage2/usb_boot/udc.c b/inflash/xburst_stage2/usb_boot/udc.c
similarity index 100%
rename from flash-tool/xburst_stage2/usb_boot/udc.c
rename to inflash/xburst_stage2/usb_boot/udc.c