diff --git a/bootloader168/ATmegaBOOT_168.c b/hardware/bootloaders/atmega168/ATmegaBOOT_168.c
similarity index 100%
rename from bootloader168/ATmegaBOOT_168.c
rename to hardware/bootloaders/atmega168/ATmegaBOOT_168.c
diff --git a/bootloader168/ATmegaBOOT_168_diecimila.hex b/hardware/bootloaders/atmega168/ATmegaBOOT_168_diecimila.hex
similarity index 100%
rename from bootloader168/ATmegaBOOT_168_diecimila.hex
rename to hardware/bootloaders/atmega168/ATmegaBOOT_168_diecimila.hex
diff --git a/bootloader168/ATmegaBOOT_168_ng.hex b/hardware/bootloaders/atmega168/ATmegaBOOT_168_ng.hex
similarity index 100%
rename from bootloader168/ATmegaBOOT_168_ng.hex
rename to hardware/bootloaders/atmega168/ATmegaBOOT_168_ng.hex
diff --git a/bootloader168/Makefile b/hardware/bootloaders/atmega168/Makefile
similarity index 100%
rename from bootloader168/Makefile
rename to hardware/bootloaders/atmega168/Makefile
diff --git a/bootloader/ATmegaBOOT.c b/hardware/bootloaders/atmega8/ATmegaBOOT.c
similarity index 100%
rename from bootloader/ATmegaBOOT.c
rename to hardware/bootloaders/atmega8/ATmegaBOOT.c
diff --git a/bootloader/ATmegaBOOT.hex b/hardware/bootloaders/atmega8/ATmegaBOOT.hex
similarity index 100%
rename from bootloader/ATmegaBOOT.hex
rename to hardware/bootloaders/atmega8/ATmegaBOOT.hex
diff --git a/bootloader/Makefile b/hardware/bootloaders/atmega8/Makefile
similarity index 100%
rename from bootloader/Makefile
rename to hardware/bootloaders/atmega8/Makefile
diff --git a/bootloaderBT/ATmegaBOOT_168.c b/hardware/bootloaders/bt/ATmegaBOOT_168.c
similarity index 100%
rename from bootloaderBT/ATmegaBOOT_168.c
rename to hardware/bootloaders/bt/ATmegaBOOT_168.c
diff --git a/bootloaderBT/ATmegaBOOT_168.hex b/hardware/bootloaders/bt/ATmegaBOOT_168.hex
similarity index 100%
rename from bootloaderBT/ATmegaBOOT_168.hex
rename to hardware/bootloaders/bt/ATmegaBOOT_168.hex