diff --git a/util/flash_and_burn/82802ab.c b/util/flashrom/82802ab.c
similarity index 100%
rename from util/flash_and_burn/82802ab.c
rename to util/flashrom/82802ab.c
diff --git a/util/flash_and_burn/82802ab.h b/util/flashrom/82802ab.h
similarity index 100%
rename from util/flash_and_burn/82802ab.h
rename to util/flashrom/82802ab.h
diff --git a/util/flash_and_burn/Makefile b/util/flashrom/Makefile
similarity index 100%
rename from util/flash_and_burn/Makefile
rename to util/flashrom/Makefile
diff --git a/util/flash_and_burn/README b/util/flashrom/README
similarity index 100%
rename from util/flash_and_burn/README
rename to util/flashrom/README
diff --git a/util/flash_and_burn/am29f040b.c b/util/flashrom/am29f040b.c
similarity index 100%
rename from util/flash_and_burn/am29f040b.c
rename to util/flashrom/am29f040b.c
diff --git a/util/flash_and_burn/am29f040b.h b/util/flashrom/am29f040b.h
similarity index 100%
rename from util/flash_and_burn/am29f040b.h
rename to util/flashrom/am29f040b.h
diff --git a/util/flash_and_burn/flash.h b/util/flashrom/flash.h
similarity index 100%
rename from util/flash_and_burn/flash.h
rename to util/flashrom/flash.h
diff --git a/util/flash_and_burn/flash_enable.c b/util/flashrom/flash_enable.c
similarity index 100%
rename from util/flash_and_burn/flash_enable.c
rename to util/flashrom/flash_enable.c
diff --git a/util/flash_and_burn/flash_on.c b/util/flashrom/flash_on.c
similarity index 100%
rename from util/flash_and_burn/flash_on.c
rename to util/flashrom/flash_on.c
diff --git a/util/flash_and_burn/flash_rom.c b/util/flashrom/flash_rom.c
similarity index 100%
rename from util/flash_and_burn/flash_rom.c
rename to util/flashrom/flash_rom.c
diff --git a/util/flash_and_burn/jedec.c b/util/flashrom/jedec.c
similarity index 100%
rename from util/flash_and_burn/jedec.c
rename to util/flashrom/jedec.c
diff --git a/util/flash_and_burn/jedec.h b/util/flashrom/jedec.h
similarity index 100%
rename from util/flash_and_burn/jedec.h
rename to util/flashrom/jedec.h
diff --git a/util/flash_and_burn/m29f400bt.c b/util/flashrom/m29f400bt.c
similarity index 100%
rename from util/flash_and_burn/m29f400bt.c
rename to util/flashrom/m29f400bt.c
diff --git a/util/flash_and_burn/m29f400bt.h b/util/flashrom/m29f400bt.h
similarity index 100%
rename from util/flash_and_burn/m29f400bt.h
rename to util/flashrom/m29f400bt.h
diff --git a/util/flash_and_burn/msys_doc.c b/util/flashrom/msys_doc.c
similarity index 100%
rename from util/flash_and_burn/msys_doc.c
rename to util/flashrom/msys_doc.c
diff --git a/util/flash_and_burn/msys_doc.h b/util/flashrom/msys_doc.h
similarity index 100%
rename from util/flash_and_burn/msys_doc.h
rename to util/flashrom/msys_doc.h
diff --git a/util/flash_and_burn/mx29f002.c b/util/flashrom/mx29f002.c
similarity index 100%
rename from util/flash_and_burn/mx29f002.c
rename to util/flashrom/mx29f002.c
diff --git a/util/flash_and_burn/mx29f002.h b/util/flashrom/mx29f002.h
similarity index 100%
rename from util/flash_and_burn/mx29f002.h
rename to util/flashrom/mx29f002.h
diff --git a/util/flash_and_burn/pm49fl004.c b/util/flashrom/pm49fl004.c
similarity index 100%
rename from util/flash_and_burn/pm49fl004.c
rename to util/flashrom/pm49fl004.c
diff --git a/util/flash_and_burn/pm49fl004.h b/util/flashrom/pm49fl004.h
similarity index 100%
rename from util/flash_and_burn/pm49fl004.h
rename to util/flashrom/pm49fl004.h
diff --git a/util/flash_and_burn/sst28sf040.c b/util/flashrom/sst28sf040.c
similarity index 100%
rename from util/flash_and_burn/sst28sf040.c
rename to util/flashrom/sst28sf040.c
diff --git a/util/flash_and_burn/sst28sf040.h b/util/flashrom/sst28sf040.h
similarity index 100%
rename from util/flash_and_burn/sst28sf040.h
rename to util/flashrom/sst28sf040.h
diff --git a/util/flash_and_burn/sst39sf020.c b/util/flashrom/sst39sf020.c
similarity index 100%
rename from util/flash_and_burn/sst39sf020.c
rename to util/flashrom/sst39sf020.c
diff --git a/util/flash_and_burn/sst39sf020.h b/util/flashrom/sst39sf020.h
similarity index 100%
rename from util/flash_and_burn/sst39sf020.h
rename to util/flashrom/sst39sf020.h
diff --git a/util/flash_and_burn/sst49lf040.c b/util/flashrom/sst49lf040.c
similarity index 100%
rename from util/flash_and_burn/sst49lf040.c
rename to util/flashrom/sst49lf040.c
diff --git a/util/flash_and_burn/sst49lf040.h b/util/flashrom/sst49lf040.h
similarity index 100%
rename from util/flash_and_burn/sst49lf040.h
rename to util/flashrom/sst49lf040.h
diff --git a/util/flash_and_burn/sst_fwhub.c b/util/flashrom/sst_fwhub.c
similarity index 100%
rename from util/flash_and_burn/sst_fwhub.c
rename to util/flashrom/sst_fwhub.c
diff --git a/util/flash_and_burn/sst_fwhub.h b/util/flashrom/sst_fwhub.h
similarity index 100%
rename from util/flash_and_burn/sst_fwhub.h
rename to util/flashrom/sst_fwhub.h
diff --git a/util/flash_and_burn/udelay.c b/util/flashrom/udelay.c
similarity index 100%
rename from util/flash_and_burn/udelay.c
rename to util/flashrom/udelay.c
diff --git a/util/flash_and_burn/w49f002u.c b/util/flashrom/w49f002u.c
similarity index 100%
rename from util/flash_and_burn/w49f002u.c
rename to util/flashrom/w49f002u.c
diff --git a/util/flash_and_burn/w49f002u.h b/util/flashrom/w49f002u.h
similarity index 100%
rename from util/flash_and_burn/w49f002u.h
rename to util/flashrom/w49f002u.h