Bootloader layout reorganized