diff --git a/inflash/xburst_stage2/usb_boot/boothandler.c b/inflash/xburst_stage2/boothandler.c similarity index 100% rename from inflash/xburst_stage2/usb_boot/boothandler.c rename to inflash/xburst_stage2/boothandler.c diff --git a/inflash/xburst_stage2/usb_boot/cache.c b/inflash/xburst_stage2/cache.c similarity index 100% rename from inflash/xburst_stage2/usb_boot/cache.c rename to inflash/xburst_stage2/cache.c diff --git a/inflash/xburst_stage2/usb_boot/head.S b/inflash/xburst_stage2/head.S similarity index 100% rename from inflash/xburst_stage2/usb_boot/head.S rename to inflash/xburst_stage2/head.S diff --git a/inflash/xburst_stage2/usb_boot/main.c b/inflash/xburst_stage2/main.c similarity index 100% rename from inflash/xburst_stage2/usb_boot/main.c rename to inflash/xburst_stage2/main.c diff --git a/inflash/xburst_stage2/nandflash/nandflash_4740.c b/inflash/xburst_stage2/nandflash_4740.c similarity index 100% rename from inflash/xburst_stage2/nandflash/nandflash_4740.c rename to inflash/xburst_stage2/nandflash_4740.c diff --git a/inflash/xburst_stage2/nandflash/nandflash_4750.c b/inflash/xburst_stage2/nandflash_4750.c similarity index 100% rename from inflash/xburst_stage2/nandflash/nandflash_4750.c rename to inflash/xburst_stage2/nandflash_4750.c diff --git a/inflash/xburst_stage2/usb_boot/serial.c b/inflash/xburst_stage2/serial.c similarity index 100% rename from inflash/xburst_stage2/usb_boot/serial.c rename to inflash/xburst_stage2/serial.c diff --git a/inflash/xburst_stage2/usb_boot/udc.c b/inflash/xburst_stage2/udc.c similarity index 100% rename from inflash/xburst_stage2/usb_boot/udc.c rename to inflash/xburst_stage2/udc.c