diff --git a/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex b/firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex
similarity index 100%
rename from firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex
rename to firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-Mega2560-Rev3.hex
diff --git a/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex b/firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex
similarity index 100%
rename from firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex
rename to firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex
diff --git a/firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex b/firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex
similarity index 100%
rename from firmwares/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex
rename to firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-Uno-Rev3.hex
diff --git a/firmwares/MEGA-dfu_and_usbserial_combined.hex b/firmwares/atmegaxxu2/MEGA-dfu_and_usbserial_combined.hex
similarity index 100%
rename from firmwares/MEGA-dfu_and_usbserial_combined.hex
rename to firmwares/atmegaxxu2/MEGA-dfu_and_usbserial_combined.hex
diff --git a/firmwares/README.txt b/firmwares/atmegaxxu2/README.txt
similarity index 100%
rename from firmwares/README.txt
rename to firmwares/atmegaxxu2/README.txt
diff --git a/firmwares/UNO-dfu_and_usbserial_combined.hex b/firmwares/atmegaxxu2/UNO-dfu_and_usbserial_combined.hex
similarity index 100%
rename from firmwares/UNO-dfu_and_usbserial_combined.hex
rename to firmwares/atmegaxxu2/UNO-dfu_and_usbserial_combined.hex
diff --git a/firmwares/arduino-usbdfu/Arduino-usbdfu.c b/firmwares/atmegaxxu2/arduino-usbdfu/Arduino-usbdfu.c
similarity index 100%
rename from firmwares/arduino-usbdfu/Arduino-usbdfu.c
rename to firmwares/atmegaxxu2/arduino-usbdfu/Arduino-usbdfu.c
diff --git a/firmwares/arduino-usbdfu/Arduino-usbdfu.h b/firmwares/atmegaxxu2/arduino-usbdfu/Arduino-usbdfu.h
similarity index 100%
rename from firmwares/arduino-usbdfu/Arduino-usbdfu.h
rename to firmwares/atmegaxxu2/arduino-usbdfu/Arduino-usbdfu.h
diff --git a/firmwares/arduino-usbdfu/Board/LEDs.h b/firmwares/atmegaxxu2/arduino-usbdfu/Board/LEDs.h
similarity index 100%
rename from firmwares/arduino-usbdfu/Board/LEDs.h
rename to firmwares/atmegaxxu2/arduino-usbdfu/Board/LEDs.h
diff --git a/firmwares/arduino-usbdfu/Descriptors.c b/firmwares/atmegaxxu2/arduino-usbdfu/Descriptors.c
similarity index 100%
rename from firmwares/arduino-usbdfu/Descriptors.c
rename to firmwares/atmegaxxu2/arduino-usbdfu/Descriptors.c
diff --git a/firmwares/arduino-usbdfu/Descriptors.h b/firmwares/atmegaxxu2/arduino-usbdfu/Descriptors.h
similarity index 100%
rename from firmwares/arduino-usbdfu/Descriptors.h
rename to firmwares/atmegaxxu2/arduino-usbdfu/Descriptors.h
diff --git a/firmwares/arduino-usbdfu/makefile b/firmwares/atmegaxxu2/arduino-usbdfu/makefile
similarity index 100%
rename from firmwares/arduino-usbdfu/makefile
rename to firmwares/atmegaxxu2/arduino-usbdfu/makefile
diff --git a/firmwares/arduino-usbdfu/readme.txt b/firmwares/atmegaxxu2/arduino-usbdfu/readme.txt
similarity index 100%
rename from firmwares/arduino-usbdfu/readme.txt
rename to firmwares/atmegaxxu2/arduino-usbdfu/readme.txt
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-Mega2560-Rev3.hex
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-MegaADK-Rev3.hex
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-atmega16u2-Uno-Rev3.hex
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-mega.hex
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-mega.hex
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-uno.hex
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial-uno.hex
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial.c b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial.c
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial.c
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial.c
diff --git a/firmwares/arduino-usbserial/Arduino-usbserial.h b/firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial.h
similarity index 100%
rename from firmwares/arduino-usbserial/Arduino-usbserial.h
rename to firmwares/atmegaxxu2/arduino-usbserial/Arduino-usbserial.h
diff --git a/firmwares/arduino-usbserial/Board/LEDs.h b/firmwares/atmegaxxu2/arduino-usbserial/Board/LEDs.h
similarity index 100%
rename from firmwares/arduino-usbserial/Board/LEDs.h
rename to firmwares/atmegaxxu2/arduino-usbserial/Board/LEDs.h
diff --git a/firmwares/arduino-usbserial/Descriptors.c b/firmwares/atmegaxxu2/arduino-usbserial/Descriptors.c
similarity index 100%
rename from firmwares/arduino-usbserial/Descriptors.c
rename to firmwares/atmegaxxu2/arduino-usbserial/Descriptors.c
diff --git a/firmwares/arduino-usbserial/Descriptors.h b/firmwares/atmegaxxu2/arduino-usbserial/Descriptors.h
similarity index 100%
rename from firmwares/arduino-usbserial/Descriptors.h
rename to firmwares/atmegaxxu2/arduino-usbserial/Descriptors.h
diff --git a/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h b/firmwares/atmegaxxu2/arduino-usbserial/Lib/LightweightRingBuff.h
similarity index 100%
rename from firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
rename to firmwares/atmegaxxu2/arduino-usbserial/Lib/LightweightRingBuff.h
diff --git a/firmwares/arduino-usbserial/makefile b/firmwares/atmegaxxu2/arduino-usbserial/makefile
similarity index 100%
rename from firmwares/arduino-usbserial/makefile
rename to firmwares/atmegaxxu2/arduino-usbserial/makefile
diff --git a/firmwares/arduino-usbserial/readme.txt b/firmwares/atmegaxxu2/arduino-usbserial/readme.txt
similarity index 100%
rename from firmwares/arduino-usbserial/readme.txt
rename to firmwares/atmegaxxu2/arduino-usbserial/readme.txt