diff --git a/avr/avrdude.conf b/avrdude.conf
similarity index 100%
rename from avr/avrdude.conf
rename to avrdude.conf
diff --git a/avr/boards.txt b/boards.txt
similarity index 100%
rename from avr/boards.txt
rename to boards.txt
diff --git a/avr/bootloaders/empty/empty_all.hex b/bootloaders/empty/empty_all.hex
similarity index 100%
rename from avr/bootloaders/empty/empty_all.hex
rename to bootloaders/empty/empty_all.hex
diff --git a/avr/bootloaders/optiboot/Makefile b/bootloaders/optiboot/Makefile
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile
rename to bootloaders/optiboot/Makefile
diff --git a/avr/bootloaders/optiboot/Makefile.1284 b/bootloaders/optiboot/Makefile.1284
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.1284
rename to bootloaders/optiboot/Makefile.1284
diff --git a/avr/bootloaders/optiboot/Makefile.2560 b/bootloaders/optiboot/Makefile.2560
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.2560
rename to bootloaders/optiboot/Makefile.2560
diff --git a/avr/bootloaders/optiboot/Makefile.MCUdude b/bootloaders/optiboot/Makefile.MCUdude
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.MCUdude
rename to bootloaders/optiboot/Makefile.MCUdude
diff --git a/avr/bootloaders/optiboot/Makefile.atmel b/bootloaders/optiboot/Makefile.atmel
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.atmel
rename to bootloaders/optiboot/Makefile.atmel
diff --git a/avr/bootloaders/optiboot/Makefile.custom b/bootloaders/optiboot/Makefile.custom
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.custom
rename to bootloaders/optiboot/Makefile.custom
diff --git a/avr/bootloaders/optiboot/Makefile.isp b/bootloaders/optiboot/Makefile.isp
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.isp
rename to bootloaders/optiboot/Makefile.isp
diff --git a/avr/bootloaders/optiboot/Makefile.tiny b/bootloaders/optiboot/Makefile.tiny
similarity index 100%
rename from avr/bootloaders/optiboot/Makefile.tiny
rename to bootloaders/optiboot/Makefile.tiny
diff --git a/avr/bootloaders/optiboot/README.TXT b/bootloaders/optiboot/README.TXT
similarity index 100%
rename from avr/bootloaders/optiboot/README.TXT
rename to bootloaders/optiboot/README.TXT
diff --git a/avr/bootloaders/optiboot/baudcheck.c b/bootloaders/optiboot/baudcheck.c
similarity index 100%
rename from avr/bootloaders/optiboot/baudcheck.c
rename to bootloaders/optiboot/baudcheck.c
diff --git a/avr/bootloaders/optiboot/baudcheck.tmp.sh b/bootloaders/optiboot/baudcheck.tmp.sh
similarity index 100%
rename from avr/bootloaders/optiboot/baudcheck.tmp.sh
rename to bootloaders/optiboot/baudcheck.tmp.sh
diff --git a/avr/bootloaders/optiboot/boot.h b/bootloaders/optiboot/boot.h
similarity index 100%
rename from avr/bootloaders/optiboot/boot.h
rename to bootloaders/optiboot/boot.h
diff --git a/avr/bootloaders/optiboot/boot_opt.h b/bootloaders/optiboot/boot_opt.h
similarity index 100%
rename from avr/bootloaders/optiboot/boot_opt.h
rename to bootloaders/optiboot/boot_opt.h
diff --git a/avr/bootloaders/optiboot/makeall b/bootloaders/optiboot/makeall
similarity index 100%
rename from avr/bootloaders/optiboot/makeall
rename to bootloaders/optiboot/makeall
diff --git a/avr/bootloaders/optiboot/makeall.tiny.bat b/bootloaders/optiboot/makeall.tiny.bat
similarity index 100%
rename from avr/bootloaders/optiboot/makeall.tiny.bat
rename to bootloaders/optiboot/makeall.tiny.bat
diff --git a/avr/bootloaders/optiboot/makeoptions b/bootloaders/optiboot/makeoptions
similarity index 100%
rename from avr/bootloaders/optiboot/makeoptions
rename to bootloaders/optiboot/makeoptions
diff --git a/avr/bootloaders/optiboot/omake b/bootloaders/optiboot/omake
similarity index 100%
rename from avr/bootloaders/optiboot/omake
rename to bootloaders/optiboot/omake
diff --git a/avr/bootloaders/optiboot/omake.bat b/bootloaders/optiboot/omake.bat
similarity index 100%
rename from avr/bootloaders/optiboot/omake.bat
rename to bootloaders/optiboot/omake.bat
diff --git a/avr/bootloaders/optiboot/optiboot.c b/bootloaders/optiboot/optiboot.c
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot.c
rename to bootloaders/optiboot/optiboot.c
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_1000000L.hex b/bootloaders/optiboot/optiboot_attiny1634_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_1025000L.hex b/bootloaders/optiboot/optiboot_attiny1634_1025000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_1025000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_1025000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_1025000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_1025000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_1025000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_1025000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_11059200L.hex b/bootloaders/optiboot/optiboot_attiny1634_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_11059200L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_11059200L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_11059200L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_11059200L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_12000000L.hex b/bootloaders/optiboot/optiboot_attiny1634_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_12000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_12000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_12000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_12000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_14745600L.hex b/bootloaders/optiboot/optiboot_attiny1634_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_14745600L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_14745600L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_14745600L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_14745600L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_16000000L.hex b/bootloaders/optiboot/optiboot_attiny1634_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_16000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_16000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_16000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_16000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_7372800L.hex b/bootloaders/optiboot/optiboot_attiny1634_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_7372800L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_7372800L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_7372800L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_7372800L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_8000000L.hex b/bootloaders/optiboot/optiboot_attiny1634_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_8000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_8000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_8000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_8000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_8200000L.hex b/bootloaders/optiboot/optiboot_attiny1634_8200000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_8200000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_8200000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_9216000L.hex b/bootloaders/optiboot/optiboot_attiny1634_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny1634_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny1634_9216000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny1634_9216000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny1634_9216000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny1634_9216000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_11059200L.hex b/bootloaders/optiboot/optiboot_attiny167_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny167_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_12000000L.hex b/bootloaders/optiboot/optiboot_attiny167_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_14745600L.hex b/bootloaders/optiboot/optiboot_attiny167_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny167_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_16000000L.hex b/bootloaders/optiboot/optiboot_attiny167_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_18432000L.hex b/bootloaders/optiboot/optiboot_attiny167_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_20000000L.hex b/bootloaders/optiboot/optiboot_attiny167_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_7372800L.hex b/bootloaders/optiboot/optiboot_attiny167_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny167_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_8000000L.hex b/bootloaders/optiboot/optiboot_attiny167_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny167_9216000L.hex b/bootloaders/optiboot/optiboot_attiny167_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny167_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny167_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_11059200L.hex b/bootloaders/optiboot/optiboot_attiny441_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny441_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_11059200L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_11059200L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_11059200L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_11059200L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_12000000L.hex b/bootloaders/optiboot/optiboot_attiny441_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_12000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_12000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_12000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_12000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_14745600L.hex b/bootloaders/optiboot/optiboot_attiny441_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny441_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_14745600L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_14745600L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_14745600L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_14745600L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_16000000L.hex b/bootloaders/optiboot/optiboot_attiny441_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_16000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_16000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_16000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_16000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_18432000L.hex b/bootloaders/optiboot/optiboot_attiny441_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_18432000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_18432000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_18432000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_18432000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_20000000L.hex b/bootloaders/optiboot/optiboot_attiny441_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_20000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_20000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_20000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_20000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_7372800L.hex b/bootloaders/optiboot/optiboot_attiny441_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny441_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_7372800L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_7372800L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_7372800L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_7372800L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_8000000L.hex b/bootloaders/optiboot/optiboot_attiny441_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_8000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_8000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_8000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_8000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_8200000L.hex b/bootloaders/optiboot/optiboot_attiny441_8200000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_8200000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_8200000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_9216000L.hex b/bootloaders/optiboot/optiboot_attiny441_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny441_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny441_9216000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny441_9216000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny441_9216000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny441_9216000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_1000000L.hex b/bootloaders/optiboot/optiboot_attiny44_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_11059200L.hex b/bootloaders/optiboot/optiboot_attiny44_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny44_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_12000000L.hex b/bootloaders/optiboot/optiboot_attiny44_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_14745600L.hex b/bootloaders/optiboot/optiboot_attiny44_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny44_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_16000000L.hex b/bootloaders/optiboot/optiboot_attiny44_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_18432000L.hex b/bootloaders/optiboot/optiboot_attiny44_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_20000000L.hex b/bootloaders/optiboot/optiboot_attiny44_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_7372800L.hex b/bootloaders/optiboot/optiboot_attiny44_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny44_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_8000000L.hex b/bootloaders/optiboot/optiboot_attiny44_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny44_9216000L.hex b/bootloaders/optiboot/optiboot_attiny44_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny44_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny44_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_1000000L.hex b/bootloaders/optiboot/optiboot_attiny45_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_11059200L.hex b/bootloaders/optiboot/optiboot_attiny45_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny45_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_12000000L.hex b/bootloaders/optiboot/optiboot_attiny45_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_14745600L.hex b/bootloaders/optiboot/optiboot_attiny45_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny45_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_16000000L.hex b/bootloaders/optiboot/optiboot_attiny45_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_18432000L.hex b/bootloaders/optiboot/optiboot_attiny45_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_20000000L.hex b/bootloaders/optiboot/optiboot_attiny45_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_7372800L.hex b/bootloaders/optiboot/optiboot_attiny45_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny45_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_8000000L.hex b/bootloaders/optiboot/optiboot_attiny45_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny45_9216000L.hex b/bootloaders/optiboot/optiboot_attiny45_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny45_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny45_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_1000000L.hex b/bootloaders/optiboot/optiboot_attiny461_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_11059200L.hex b/bootloaders/optiboot/optiboot_attiny461_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny461_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_12000000L.hex b/bootloaders/optiboot/optiboot_attiny461_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_14745600L.hex b/bootloaders/optiboot/optiboot_attiny461_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny461_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_16000000L.hex b/bootloaders/optiboot/optiboot_attiny461_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_18432000L.hex b/bootloaders/optiboot/optiboot_attiny461_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_20000000L.hex b/bootloaders/optiboot/optiboot_attiny461_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_7372800L.hex b/bootloaders/optiboot/optiboot_attiny461_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny461_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_8000000L.hex b/bootloaders/optiboot/optiboot_attiny461_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny461_9216000L.hex b/bootloaders/optiboot/optiboot_attiny461_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny461_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny461_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny48_8000000L.hex b/bootloaders/optiboot/optiboot_attiny48_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny48_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny48_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_1000000L.hex b/bootloaders/optiboot/optiboot_attiny828_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny828_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_1000000L.lst b/bootloaders/optiboot/optiboot_attiny828_1000000L.lst
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_1000000L.lst
rename to bootloaders/optiboot/optiboot_attiny828_1000000L.lst
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_1025000L.hex b/bootloaders/optiboot/optiboot_attiny828_1025000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_1025000L.hex
rename to bootloaders/optiboot/optiboot_attiny828_1025000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_1025000L.lst b/bootloaders/optiboot/optiboot_attiny828_1025000L.lst
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_1025000L.lst
rename to bootloaders/optiboot/optiboot_attiny828_1025000L.lst
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_8000000L.hex b/bootloaders/optiboot/optiboot_attiny828_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny828_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny828_8200000L.hex b/bootloaders/optiboot/optiboot_attiny828_8200000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny828_8200000L.hex
rename to bootloaders/optiboot/optiboot_attiny828_8200000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_1000000L.hex b/bootloaders/optiboot/optiboot_attiny841_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_1025000L.hex b/bootloaders/optiboot/optiboot_attiny841_1025000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_1025000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_1025000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_11059200L.hex b/bootloaders/optiboot/optiboot_attiny841_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny841_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_11059200L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_11059200L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_11059200L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_11059200L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_12000000L.hex b/bootloaders/optiboot/optiboot_attiny841_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_12000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_12000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_12000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_12000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_14745600L.hex b/bootloaders/optiboot/optiboot_attiny841_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny841_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_14745600L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_14745600L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_14745600L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_14745600L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_16000000L.hex b/bootloaders/optiboot/optiboot_attiny841_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_16000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_16000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_16000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_16000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_18432000L.hex b/bootloaders/optiboot/optiboot_attiny841_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_18432000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_18432000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_18432000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_18432000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_20000000L.hex b/bootloaders/optiboot/optiboot_attiny841_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_20000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_20000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_20000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_20000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_7372800L.hex b/bootloaders/optiboot/optiboot_attiny841_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny841_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_7372800L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_7372800L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_7372800L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_7372800L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_8000000L.hex b/bootloaders/optiboot/optiboot_attiny841_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_8000000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_8000000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_8000000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_8000000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_8200000L.hex b/bootloaders/optiboot/optiboot_attiny841_8200000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_8200000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_8200000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_9216000L.hex b/bootloaders/optiboot/optiboot_attiny841_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny841_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny841_9216000L_ser1.hex b/bootloaders/optiboot/optiboot_attiny841_9216000L_ser1.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny841_9216000L_ser1.hex
rename to bootloaders/optiboot/optiboot_attiny841_9216000L_ser1.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_1000000L.hex b/bootloaders/optiboot/optiboot_attiny84_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_11059200L.hex b/bootloaders/optiboot/optiboot_attiny84_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny84_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_12000000L.hex b/bootloaders/optiboot/optiboot_attiny84_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_14745600L.hex b/bootloaders/optiboot/optiboot_attiny84_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny84_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_16000000L.hex b/bootloaders/optiboot/optiboot_attiny84_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_18432000L.hex b/bootloaders/optiboot/optiboot_attiny84_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_20000000L.hex b/bootloaders/optiboot/optiboot_attiny84_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_7372800L.hex b/bootloaders/optiboot/optiboot_attiny84_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny84_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_8000000L.hex b/bootloaders/optiboot/optiboot_attiny84_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny84_9216000L.hex b/bootloaders/optiboot/optiboot_attiny84_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny84_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny84_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_1000000L.hex b/bootloaders/optiboot/optiboot_attiny85_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_11059200L.hex b/bootloaders/optiboot/optiboot_attiny85_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny85_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_12000000L.hex b/bootloaders/optiboot/optiboot_attiny85_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_14745600L.hex b/bootloaders/optiboot/optiboot_attiny85_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny85_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_16000000L.hex b/bootloaders/optiboot/optiboot_attiny85_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_18432000L.hex b/bootloaders/optiboot/optiboot_attiny85_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_20000000L.hex b/bootloaders/optiboot/optiboot_attiny85_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_7372800L.hex b/bootloaders/optiboot/optiboot_attiny85_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny85_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_8000000L.hex b/bootloaders/optiboot/optiboot_attiny85_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny85_9216000L.hex b/bootloaders/optiboot/optiboot_attiny85_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny85_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny85_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_1000000L.hex b/bootloaders/optiboot/optiboot_attiny861_1000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_1000000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_1000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_11059200L.hex b/bootloaders/optiboot/optiboot_attiny861_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny861_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_12000000L.hex b/bootloaders/optiboot/optiboot_attiny861_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_14745600L.hex b/bootloaders/optiboot/optiboot_attiny861_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny861_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_16000000L.hex b/bootloaders/optiboot/optiboot_attiny861_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_18432000L.hex b/bootloaders/optiboot/optiboot_attiny861_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_20000000L.hex b/bootloaders/optiboot/optiboot_attiny861_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_7372800L.hex b/bootloaders/optiboot/optiboot_attiny861_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny861_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_8000000L.hex b/bootloaders/optiboot/optiboot_attiny861_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny861_9216000L.hex b/bootloaders/optiboot/optiboot_attiny861_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny861_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny861_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_11059200L.hex b/bootloaders/optiboot/optiboot_attiny87_11059200L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_11059200L.hex
rename to bootloaders/optiboot/optiboot_attiny87_11059200L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_12000000L.hex b/bootloaders/optiboot/optiboot_attiny87_12000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_12000000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_12000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_14745600L.hex b/bootloaders/optiboot/optiboot_attiny87_14745600L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_14745600L.hex
rename to bootloaders/optiboot/optiboot_attiny87_14745600L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_16000000L.hex b/bootloaders/optiboot/optiboot_attiny87_16000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_16000000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_16000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_18432000L.hex b/bootloaders/optiboot/optiboot_attiny87_18432000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_18432000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_18432000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_20000000L.hex b/bootloaders/optiboot/optiboot_attiny87_20000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_20000000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_20000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_7372800L.hex b/bootloaders/optiboot/optiboot_attiny87_7372800L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_7372800L.hex
rename to bootloaders/optiboot/optiboot_attiny87_7372800L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_8000000L.hex b/bootloaders/optiboot/optiboot_attiny87_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_8000000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny87_9216000L.hex b/bootloaders/optiboot/optiboot_attiny87_9216000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny87_9216000L.hex
rename to bootloaders/optiboot/optiboot_attiny87_9216000L.hex
diff --git a/avr/bootloaders/optiboot/optiboot_attiny88_8000000L.hex b/bootloaders/optiboot/optiboot_attiny88_8000000L.hex
similarity index 100%
rename from avr/bootloaders/optiboot/optiboot_attiny88_8000000L.hex
rename to bootloaders/optiboot/optiboot_attiny88_8000000L.hex
diff --git a/avr/bootloaders/optiboot/pin_defs.h b/bootloaders/optiboot/pin_defs.h
similarity index 100%
rename from avr/bootloaders/optiboot/pin_defs.h
rename to bootloaders/optiboot/pin_defs.h
diff --git a/avr/bootloaders/optiboot/stk500.h b/bootloaders/optiboot/stk500.h
similarity index 100%
rename from avr/bootloaders/optiboot/stk500.h
rename to bootloaders/optiboot/stk500.h
diff --git a/avr/bootloaders/optiboot_unsupported/Makefile b/bootloaders/optiboot_unsupported/Makefile
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/Makefile
rename to bootloaders/optiboot_unsupported/Makefile
diff --git a/avr/bootloaders/optiboot_unsupported/README.TXT b/bootloaders/optiboot_unsupported/README.TXT
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/README.TXT
rename to bootloaders/optiboot_unsupported/README.TXT
diff --git a/avr/bootloaders/optiboot_unsupported/Readme for Tuned optiboot.txt b/bootloaders/optiboot_unsupported/Readme for Tuned optiboot.txt
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/Readme for Tuned optiboot.txt
rename to bootloaders/optiboot_unsupported/Readme for Tuned optiboot.txt
diff --git a/avr/bootloaders/optiboot_unsupported/boot.h b/bootloaders/optiboot_unsupported/boot.h
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/boot.h
rename to bootloaders/optiboot_unsupported/boot.h
diff --git a/avr/bootloaders/optiboot_unsupported/flash.hex b/bootloaders/optiboot_unsupported/flash.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/flash.hex
rename to bootloaders/optiboot_unsupported/flash.hex
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny162_12M.bat b/bootloaders/optiboot_unsupported/make attiny162_12M.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny162_12M.bat
rename to bootloaders/optiboot_unsupported/make attiny162_12M.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny167.bat b/bootloaders/optiboot_unsupported/make attiny167.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny167.bat
rename to bootloaders/optiboot_unsupported/make attiny167.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny167_tuned.bat b/bootloaders/optiboot_unsupported/make attiny167_tuned.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny167_tuned.bat
rename to bootloaders/optiboot_unsupported/make attiny167_tuned.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny24.bat b/bootloaders/optiboot_unsupported/make attiny24.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny24.bat
rename to bootloaders/optiboot_unsupported/make attiny24.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny24_tuned.bat b/bootloaders/optiboot_unsupported/make attiny24_tuned.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny24_tuned.bat
rename to bootloaders/optiboot_unsupported/make attiny24_tuned.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny84.bat b/bootloaders/optiboot_unsupported/make attiny84.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny84.bat
rename to bootloaders/optiboot_unsupported/make attiny84.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny84_12.bat b/bootloaders/optiboot_unsupported/make attiny84_12.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny84_12.bat
rename to bootloaders/optiboot_unsupported/make attiny84_12.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny84_alternate_tuned.bat b/bootloaders/optiboot_unsupported/make attiny84_alternate_tuned.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny84_alternate_tuned.bat
rename to bootloaders/optiboot_unsupported/make attiny84_alternate_tuned.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny84_tuned.bat b/bootloaders/optiboot_unsupported/make attiny84_tuned.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny84_tuned.bat
rename to bootloaders/optiboot_unsupported/make attiny84_tuned.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny85.bat b/bootloaders/optiboot_unsupported/make attiny85.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny85.bat
rename to bootloaders/optiboot_unsupported/make attiny85.bat
diff --git a/avr/bootloaders/optiboot_unsupported/make attiny85_tuned.bat b/bootloaders/optiboot_unsupported/make attiny85_tuned.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/make attiny85_tuned.bat
rename to bootloaders/optiboot_unsupported/make attiny85_tuned.bat
diff --git a/avr/bootloaders/optiboot_unsupported/makeall b/bootloaders/optiboot_unsupported/makeall
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/makeall
rename to bootloaders/optiboot_unsupported/makeall
diff --git a/avr/bootloaders/optiboot_unsupported/omake b/bootloaders/optiboot_unsupported/omake
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/omake
rename to bootloaders/optiboot_unsupported/omake
diff --git a/avr/bootloaders/optiboot_unsupported/omake.bat b/bootloaders/optiboot_unsupported/omake.bat
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/omake.bat
rename to bootloaders/optiboot_unsupported/omake.bat
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot.c b/bootloaders/optiboot_unsupported/optiboot.c
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot.c
rename to bootloaders/optiboot_unsupported/optiboot.c
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny167.elf b/bootloaders/optiboot_unsupported/optiboot_attiny167.elf
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny167.elf
rename to bootloaders/optiboot_unsupported/optiboot_attiny167.elf
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny167.hex b/bootloaders/optiboot_unsupported/optiboot_attiny167.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny167.hex
rename to bootloaders/optiboot_unsupported/optiboot_attiny167.hex
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny167.lst b/bootloaders/optiboot_unsupported/optiboot_attiny167.lst
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny167.lst
rename to bootloaders/optiboot_unsupported/optiboot_attiny167.lst
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny24.elf b/bootloaders/optiboot_unsupported/optiboot_attiny24.elf
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny24.elf
rename to bootloaders/optiboot_unsupported/optiboot_attiny24.elf
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny24.hex b/bootloaders/optiboot_unsupported/optiboot_attiny24.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny24.hex
rename to bootloaders/optiboot_unsupported/optiboot_attiny24.hex
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny24.lst b/bootloaders/optiboot_unsupported/optiboot_attiny24.lst
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny24.lst
rename to bootloaders/optiboot_unsupported/optiboot_attiny24.lst
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84.elf b/bootloaders/optiboot_unsupported/optiboot_attiny84.elf
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84.elf
rename to bootloaders/optiboot_unsupported/optiboot_attiny84.elf
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84.hex b/bootloaders/optiboot_unsupported/optiboot_attiny84.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84.hex
rename to bootloaders/optiboot_unsupported/optiboot_attiny84.hex
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84.lst b/bootloaders/optiboot_unsupported/optiboot_attiny84.lst
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84.lst
rename to bootloaders/optiboot_unsupported/optiboot_attiny84.lst
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.elf b/bootloaders/optiboot_unsupported/optiboot_attiny84_12.elf
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.elf
rename to bootloaders/optiboot_unsupported/optiboot_attiny84_12.elf
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.hex b/bootloaders/optiboot_unsupported/optiboot_attiny84_12.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.hex
rename to bootloaders/optiboot_unsupported/optiboot_attiny84_12.hex
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.lst b/bootloaders/optiboot_unsupported/optiboot_attiny84_12.lst
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny84_12.lst
rename to bootloaders/optiboot_unsupported/optiboot_attiny84_12.lst
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny85.elf b/bootloaders/optiboot_unsupported/optiboot_attiny85.elf
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny85.elf
rename to bootloaders/optiboot_unsupported/optiboot_attiny85.elf
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny85.hex b/bootloaders/optiboot_unsupported/optiboot_attiny85.hex
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny85.hex
rename to bootloaders/optiboot_unsupported/optiboot_attiny85.hex
diff --git a/avr/bootloaders/optiboot_unsupported/optiboot_attiny85.lst b/bootloaders/optiboot_unsupported/optiboot_attiny85.lst
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/optiboot_attiny85.lst
rename to bootloaders/optiboot_unsupported/optiboot_attiny85.lst
diff --git a/avr/bootloaders/optiboot_unsupported/pin_defs.h b/bootloaders/optiboot_unsupported/pin_defs.h
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/pin_defs.h
rename to bootloaders/optiboot_unsupported/pin_defs.h
diff --git a/avr/bootloaders/optiboot_unsupported/stk500.h b/bootloaders/optiboot_unsupported/stk500.h
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/stk500.h
rename to bootloaders/optiboot_unsupported/stk500.h
diff --git a/avr/bootloaders/optiboot_unsupported/tinyTuner.c b/bootloaders/optiboot_unsupported/tinyTuner.c
similarity index 100%
rename from avr/bootloaders/optiboot_unsupported/tinyTuner.c
rename to bootloaders/optiboot_unsupported/tinyTuner.c
diff --git a/avr/cores/empty/Arduino.h b/cores/empty/Arduino.h
similarity index 100%
rename from avr/cores/empty/Arduino.h
rename to cores/empty/Arduino.h
diff --git a/avr/cores/empty/WProgram.h b/cores/empty/WProgram.h
similarity index 100%
rename from avr/cores/empty/WProgram.h
rename to cores/empty/WProgram.h
diff --git a/avr/cores/empty/main.cpp b/cores/empty/main.cpp
similarity index 100%
rename from avr/cores/empty/main.cpp
rename to cores/empty/main.cpp
diff --git a/avr/cores/tiny/Arduino.h b/cores/tiny/Arduino.h
similarity index 100%
rename from avr/cores/tiny/Arduino.h
rename to cores/tiny/Arduino.h
diff --git a/avr/cores/tiny/HardwareSerial.cpp b/cores/tiny/HardwareSerial.cpp
similarity index 100%
rename from avr/cores/tiny/HardwareSerial.cpp
rename to cores/tiny/HardwareSerial.cpp
diff --git a/avr/cores/tiny/HardwareSerial.h b/cores/tiny/HardwareSerial.h
similarity index 100%
rename from avr/cores/tiny/HardwareSerial.h
rename to cores/tiny/HardwareSerial.h
diff --git a/avr/cores/tiny/Print.cpp b/cores/tiny/Print.cpp
similarity index 100%
rename from avr/cores/tiny/Print.cpp
rename to cores/tiny/Print.cpp
diff --git a/avr/cores/tiny/Print.h b/cores/tiny/Print.h
similarity index 100%
rename from avr/cores/tiny/Print.h
rename to cores/tiny/Print.h
diff --git a/avr/cores/tiny/Printable.h b/cores/tiny/Printable.h
similarity index 100%
rename from avr/cores/tiny/Printable.h
rename to cores/tiny/Printable.h
diff --git a/avr/cores/tiny/Stream.cpp b/cores/tiny/Stream.cpp
similarity index 100%
rename from avr/cores/tiny/Stream.cpp
rename to cores/tiny/Stream.cpp
diff --git a/avr/cores/tiny/Stream.h b/cores/tiny/Stream.h
similarity index 100%
rename from avr/cores/tiny/Stream.h
rename to cores/tiny/Stream.h
diff --git a/avr/cores/tiny/TinySoftwareSerial.cpp b/cores/tiny/TinySoftwareSerial.cpp
similarity index 100%
rename from avr/cores/tiny/TinySoftwareSerial.cpp
rename to cores/tiny/TinySoftwareSerial.cpp
diff --git a/avr/cores/tiny/TinySoftwareSerial.h b/cores/tiny/TinySoftwareSerial.h
similarity index 100%
rename from avr/cores/tiny/TinySoftwareSerial.h
rename to cores/tiny/TinySoftwareSerial.h
diff --git a/avr/cores/tiny/Tone.cpp b/cores/tiny/Tone.cpp
similarity index 100%
rename from avr/cores/tiny/Tone.cpp
rename to cores/tiny/Tone.cpp
diff --git a/avr/cores/tiny/WCharacter.h b/cores/tiny/WCharacter.h
similarity index 100%
rename from avr/cores/tiny/WCharacter.h
rename to cores/tiny/WCharacter.h
diff --git a/avr/cores/tiny/WInterrupts.c b/cores/tiny/WInterrupts.c
similarity index 100%
rename from avr/cores/tiny/WInterrupts.c
rename to cores/tiny/WInterrupts.c
diff --git a/avr/cores/tiny/WMath.cpp b/cores/tiny/WMath.cpp
similarity index 100%
rename from avr/cores/tiny/WMath.cpp
rename to cores/tiny/WMath.cpp
diff --git a/avr/cores/tiny/WProgram.h b/cores/tiny/WProgram.h
similarity index 100%
rename from avr/cores/tiny/WProgram.h
rename to cores/tiny/WProgram.h
diff --git a/avr/cores/tiny/WString.cpp b/cores/tiny/WString.cpp
similarity index 100%
rename from avr/cores/tiny/WString.cpp
rename to cores/tiny/WString.cpp
diff --git a/avr/cores/tiny/WString.h b/cores/tiny/WString.h
similarity index 100%
rename from avr/cores/tiny/WString.h
rename to cores/tiny/WString.h
diff --git a/avr/cores/tiny/abi.cpp b/cores/tiny/abi.cpp
similarity index 100%
rename from avr/cores/tiny/abi.cpp
rename to cores/tiny/abi.cpp
diff --git a/avr/cores/tiny/binary.h b/cores/tiny/binary.h
similarity index 100%
rename from avr/cores/tiny/binary.h
rename to cores/tiny/binary.h
diff --git a/avr/cores/tiny/main.cpp b/cores/tiny/main.cpp
similarity index 100%
rename from avr/cores/tiny/main.cpp
rename to cores/tiny/main.cpp
diff --git a/avr/cores/tiny/new.cpp b/cores/tiny/new.cpp
similarity index 100%
rename from avr/cores/tiny/new.cpp
rename to cores/tiny/new.cpp
diff --git a/avr/cores/tiny/new.h b/cores/tiny/new.h
similarity index 100%
rename from avr/cores/tiny/new.h
rename to cores/tiny/new.h
diff --git a/avr/cores/tiny/wiring.c b/cores/tiny/wiring.c
similarity index 100%
rename from avr/cores/tiny/wiring.c
rename to cores/tiny/wiring.c
diff --git a/avr/cores/tiny/wiring_analog.c b/cores/tiny/wiring_analog.c
similarity index 100%
rename from avr/cores/tiny/wiring_analog.c
rename to cores/tiny/wiring_analog.c
diff --git a/avr/cores/tiny/wiring_digital.c b/cores/tiny/wiring_digital.c
similarity index 100%
rename from avr/cores/tiny/wiring_digital.c
rename to cores/tiny/wiring_digital.c
diff --git a/avr/cores/tiny/wiring_private.h b/cores/tiny/wiring_private.h
similarity index 100%
rename from avr/cores/tiny/wiring_private.h
rename to cores/tiny/wiring_private.h
diff --git a/avr/cores/tiny/wiring_pulse.c b/cores/tiny/wiring_pulse.c
similarity index 100%
rename from avr/cores/tiny/wiring_pulse.c
rename to cores/tiny/wiring_pulse.c
diff --git a/avr/cores/tiny/wiring_shift.c b/cores/tiny/wiring_shift.c
similarity index 100%
rename from avr/cores/tiny/wiring_shift.c
rename to cores/tiny/wiring_shift.c
diff --git a/avr/cores/tinymodern/Arduino.h b/cores/tinymodern/Arduino.h
similarity index 100%
rename from avr/cores/tinymodern/Arduino.h
rename to cores/tinymodern/Arduino.h
diff --git a/avr/cores/tinymodern/HardwareSerial.cpp b/cores/tinymodern/HardwareSerial.cpp
similarity index 100%
rename from avr/cores/tinymodern/HardwareSerial.cpp
rename to cores/tinymodern/HardwareSerial.cpp
diff --git a/avr/cores/tinymodern/HardwareSerial.h b/cores/tinymodern/HardwareSerial.h
similarity index 100%
rename from avr/cores/tinymodern/HardwareSerial.h
rename to cores/tinymodern/HardwareSerial.h
diff --git a/avr/cores/tinymodern/Print.cpp b/cores/tinymodern/Print.cpp
similarity index 100%
rename from avr/cores/tinymodern/Print.cpp
rename to cores/tinymodern/Print.cpp
diff --git a/avr/cores/tinymodern/Print.h b/cores/tinymodern/Print.h
similarity index 100%
rename from avr/cores/tinymodern/Print.h
rename to cores/tinymodern/Print.h
diff --git a/avr/cores/tinymodern/Printable.h b/cores/tinymodern/Printable.h
similarity index 100%
rename from avr/cores/tinymodern/Printable.h
rename to cores/tinymodern/Printable.h
diff --git a/avr/cores/tinymodern/PwmTimer.h b/cores/tinymodern/PwmTimer.h
similarity index 100%
rename from avr/cores/tinymodern/PwmTimer.h
rename to cores/tinymodern/PwmTimer.h
diff --git a/avr/cores/tinymodern/Stream.cpp b/cores/tinymodern/Stream.cpp
similarity index 100%
rename from avr/cores/tinymodern/Stream.cpp
rename to cores/tinymodern/Stream.cpp
diff --git a/avr/cores/tinymodern/Stream.h b/cores/tinymodern/Stream.h
similarity index 100%
rename from avr/cores/tinymodern/Stream.h
rename to cores/tinymodern/Stream.h
diff --git a/avr/cores/tinymodern/Tone.cpp b/cores/tinymodern/Tone.cpp
similarity index 100%
rename from avr/cores/tinymodern/Tone.cpp
rename to cores/tinymodern/Tone.cpp
diff --git a/avr/cores/tinymodern/ToneTimer.h b/cores/tinymodern/ToneTimer.h
similarity index 100%
rename from avr/cores/tinymodern/ToneTimer.h
rename to cores/tinymodern/ToneTimer.h
diff --git a/avr/cores/tinymodern/UserTimer.h b/cores/tinymodern/UserTimer.h
similarity index 100%
rename from avr/cores/tinymodern/UserTimer.h
rename to cores/tinymodern/UserTimer.h
diff --git a/avr/cores/tinymodern/WCharacter.h b/cores/tinymodern/WCharacter.h
similarity index 100%
rename from avr/cores/tinymodern/WCharacter.h
rename to cores/tinymodern/WCharacter.h
diff --git a/avr/cores/tinymodern/WConstants.h b/cores/tinymodern/WConstants.h
similarity index 100%
rename from avr/cores/tinymodern/WConstants.h
rename to cores/tinymodern/WConstants.h
diff --git a/avr/cores/tinymodern/WInterrupts.c b/cores/tinymodern/WInterrupts.c
similarity index 100%
rename from avr/cores/tinymodern/WInterrupts.c
rename to cores/tinymodern/WInterrupts.c
diff --git a/avr/cores/tinymodern/WMath.cpp b/cores/tinymodern/WMath.cpp
similarity index 100%
rename from avr/cores/tinymodern/WMath.cpp
rename to cores/tinymodern/WMath.cpp
diff --git a/avr/cores/tinymodern/WProgram.h b/cores/tinymodern/WProgram.h
similarity index 100%
rename from avr/cores/tinymodern/WProgram.h
rename to cores/tinymodern/WProgram.h
diff --git a/avr/cores/tinymodern/WString.cpp b/cores/tinymodern/WString.cpp
similarity index 100%
rename from avr/cores/tinymodern/WString.cpp
rename to cores/tinymodern/WString.cpp
diff --git a/avr/cores/tinymodern/WString.h b/cores/tinymodern/WString.h
similarity index 100%
rename from avr/cores/tinymodern/WString.h
rename to cores/tinymodern/WString.h
diff --git a/avr/cores/tinymodern/abi.cpp b/cores/tinymodern/abi.cpp
similarity index 100%
rename from avr/cores/tinymodern/abi.cpp
rename to cores/tinymodern/abi.cpp
diff --git a/avr/cores/tinymodern/binary.h b/cores/tinymodern/binary.h
similarity index 100%
rename from avr/cores/tinymodern/binary.h
rename to cores/tinymodern/binary.h
diff --git a/avr/cores/tinymodern/core_adc.h b/cores/tinymodern/core_adc.h
similarity index 100%
rename from avr/cores/tinymodern/core_adc.h
rename to cores/tinymodern/core_adc.h
diff --git a/avr/cores/tinymodern/core_atomic.h b/cores/tinymodern/core_atomic.h
similarity index 100%
rename from avr/cores/tinymodern/core_atomic.h
rename to cores/tinymodern/core_atomic.h
diff --git a/avr/cores/tinymodern/core_build_options.h b/cores/tinymodern/core_build_options.h
similarity index 100%
rename from avr/cores/tinymodern/core_build_options.h
rename to cores/tinymodern/core_build_options.h
diff --git a/avr/cores/tinymodern/core_macros.h b/cores/tinymodern/core_macros.h
similarity index 100%
rename from avr/cores/tinymodern/core_macros.h
rename to cores/tinymodern/core_macros.h
diff --git a/avr/cores/tinymodern/core_pins.h b/cores/tinymodern/core_pins.h
similarity index 100%
rename from avr/cores/tinymodern/core_pins.h
rename to cores/tinymodern/core_pins.h
diff --git a/avr/cores/tinymodern/core_timers.h b/cores/tinymodern/core_timers.h
similarity index 100%
rename from avr/cores/tinymodern/core_timers.h
rename to cores/tinymodern/core_timers.h
diff --git a/avr/cores/tinymodern/main.cpp b/cores/tinymodern/main.cpp
similarity index 100%
rename from avr/cores/tinymodern/main.cpp
rename to cores/tinymodern/main.cpp
diff --git a/avr/cores/tinymodern/new.cpp b/cores/tinymodern/new.cpp
similarity index 100%
rename from avr/cores/tinymodern/new.cpp
rename to cores/tinymodern/new.cpp
diff --git a/avr/cores/tinymodern/new.h b/cores/tinymodern/new.h
similarity index 100%
rename from avr/cores/tinymodern/new.h
rename to cores/tinymodern/new.h
diff --git a/avr/cores/tinymodern/pins_arduino.c b/cores/tinymodern/pins_arduino.c
similarity index 100%
rename from avr/cores/tinymodern/pins_arduino.c
rename to cores/tinymodern/pins_arduino.c
diff --git a/avr/cores/tinymodern/pins_arduino.h b/cores/tinymodern/pins_arduino.h
similarity index 100%
rename from avr/cores/tinymodern/pins_arduino.h
rename to cores/tinymodern/pins_arduino.h
diff --git a/avr/cores/tinymodern/wiring.c b/cores/tinymodern/wiring.c
similarity index 100%
rename from avr/cores/tinymodern/wiring.c
rename to cores/tinymodern/wiring.c
diff --git a/avr/cores/tinymodern/wiring.h b/cores/tinymodern/wiring.h
similarity index 100%
rename from avr/cores/tinymodern/wiring.h
rename to cores/tinymodern/wiring.h
diff --git a/avr/cores/tinymodern/wiring_analog.c b/cores/tinymodern/wiring_analog.c
similarity index 100%
rename from avr/cores/tinymodern/wiring_analog.c
rename to cores/tinymodern/wiring_analog.c
diff --git a/avr/cores/tinymodern/wiring_digital.c b/cores/tinymodern/wiring_digital.c
similarity index 100%
rename from avr/cores/tinymodern/wiring_digital.c
rename to cores/tinymodern/wiring_digital.c
diff --git a/avr/cores/tinymodern/wiring_private.h b/cores/tinymodern/wiring_private.h
similarity index 100%
rename from avr/cores/tinymodern/wiring_private.h
rename to cores/tinymodern/wiring_private.h
diff --git a/avr/cores/tinymodern/wiring_pulse.c b/cores/tinymodern/wiring_pulse.c
similarity index 100%
rename from avr/cores/tinymodern/wiring_pulse.c
rename to cores/tinymodern/wiring_pulse.c
diff --git a/avr/cores/tinymodern/wiring_shift.c b/cores/tinymodern/wiring_shift.c
similarity index 100%
rename from avr/cores/tinymodern/wiring_shift.c
rename to cores/tinymodern/wiring_shift.c
diff --git a/avr/create_disassembler_listing.sh b/create_disassembler_listing.sh
similarity index 100%
rename from avr/create_disassembler_listing.sh
rename to create_disassembler_listing.sh
diff --git a/avr/delete_merged_output.bat b/delete_merged_output.bat
similarity index 100%
rename from avr/delete_merged_output.bat
rename to delete_merged_output.bat
diff --git a/avr/delete_merged_output.sh b/delete_merged_output.sh
similarity index 100%
rename from avr/delete_merged_output.sh
rename to delete_merged_output.sh
diff --git a/avr/externalprogrammers.txt b/externalprogrammers.txt
similarity index 100%
rename from avr/externalprogrammers.txt
rename to externalprogrammers.txt
diff --git a/avr/extras/ATtiny_1634.md b/extras/ATtiny_1634.md
similarity index 100%
rename from avr/extras/ATtiny_1634.md
rename to extras/ATtiny_1634.md
diff --git a/avr/extras/ATtiny_43.md b/extras/ATtiny_43.md
similarity index 100%
rename from avr/extras/ATtiny_43.md
rename to extras/ATtiny_43.md
diff --git a/avr/extras/ATtiny_828.md b/extras/ATtiny_828.md
similarity index 100%
rename from avr/extras/ATtiny_828.md
rename to extras/ATtiny_828.md
diff --git a/avr/extras/ATtiny_x313.md b/extras/ATtiny_x313.md
similarity index 100%
rename from avr/extras/ATtiny_x313.md
rename to extras/ATtiny_x313.md
diff --git a/avr/extras/ATtiny_x4.md b/extras/ATtiny_x4.md
similarity index 100%
rename from avr/extras/ATtiny_x4.md
rename to extras/ATtiny_x4.md
diff --git a/avr/extras/ATtiny_x41.md b/extras/ATtiny_x41.md
similarity index 100%
rename from avr/extras/ATtiny_x41.md
rename to extras/ATtiny_x41.md
diff --git a/avr/extras/ATtiny_x5.md b/extras/ATtiny_x5.md
similarity index 100%
rename from avr/extras/ATtiny_x5.md
rename to extras/ATtiny_x5.md
diff --git a/avr/extras/ATtiny_x61.md b/extras/ATtiny_x61.md
similarity index 100%
rename from avr/extras/ATtiny_x61.md
rename to extras/ATtiny_x61.md
diff --git a/avr/extras/ATtiny_x7.md b/extras/ATtiny_x7.md
similarity index 100%
rename from avr/extras/ATtiny_x7.md
rename to extras/ATtiny_x7.md
diff --git a/avr/extras/ATtiny_x8.md b/extras/ATtiny_x8.md
similarity index 100%
rename from avr/extras/ATtiny_x8.md
rename to extras/ATtiny_x8.md
diff --git a/avr/extras/Pinout_1634.jpg b/extras/Pinout_1634.jpg
similarity index 100%
rename from avr/extras/Pinout_1634.jpg
rename to extras/Pinout_1634.jpg
diff --git a/avr/extras/Pinout_43.jpg b/extras/Pinout_43.jpg
similarity index 100%
rename from avr/extras/Pinout_43.jpg
rename to extras/Pinout_43.jpg
diff --git a/avr/extras/Pinout_828.jpg b/extras/Pinout_828.jpg
similarity index 100%
rename from avr/extras/Pinout_828.jpg
rename to extras/Pinout_828.jpg
diff --git a/avr/extras/Pinout_x313.jpg b/extras/Pinout_x313.jpg
similarity index 100%
rename from avr/extras/Pinout_x313.jpg
rename to extras/Pinout_x313.jpg
diff --git a/avr/extras/Pinout_x4.jpg b/extras/Pinout_x4.jpg
similarity index 100%
rename from avr/extras/Pinout_x4.jpg
rename to extras/Pinout_x4.jpg
diff --git a/avr/extras/Pinout_x41.jpg b/extras/Pinout_x41.jpg
similarity index 100%
rename from avr/extras/Pinout_x41.jpg
rename to extras/Pinout_x41.jpg
diff --git a/avr/extras/Pinout_x5.jpg b/extras/Pinout_x5.jpg
similarity index 100%
rename from avr/extras/Pinout_x5.jpg
rename to extras/Pinout_x5.jpg
diff --git a/avr/extras/Pinout_x61.jpg b/extras/Pinout_x61.jpg
similarity index 100%
rename from avr/extras/Pinout_x61.jpg
rename to extras/Pinout_x61.jpg
diff --git a/avr/extras/Pinout_x7.jpg b/extras/Pinout_x7.jpg
similarity index 100%
rename from avr/extras/Pinout_x7.jpg
rename to extras/Pinout_x7.jpg
diff --git a/avr/extras/Pinout_x8-PU.jpg b/extras/Pinout_x8-PU.jpg
similarity index 100%
rename from avr/extras/Pinout_x8-PU.jpg
rename to extras/Pinout_x8-PU.jpg
diff --git a/avr/extras/Pinout_x8.jpg b/extras/Pinout_x8.jpg
similarity index 100%
rename from avr/extras/Pinout_x8.jpg
rename to extras/Pinout_x8.jpg
diff --git a/avr/extras/tinyNeoPixel.md b/extras/tinyNeoPixel.md
similarity index 100%
rename from avr/extras/tinyNeoPixel.md
rename to extras/tinyNeoPixel.md
diff --git a/avr/libraries/ATTinyCore/examples/TemperatureRead/TemperatureRead.ino b/libraries/ATTinyCore/examples/TemperatureRead/TemperatureRead.ino
similarity index 100%
rename from avr/libraries/ATTinyCore/examples/TemperatureRead/TemperatureRead.ino
rename to libraries/ATTinyCore/examples/TemperatureRead/TemperatureRead.ino
diff --git a/avr/libraries/ATTinyCore/library.properties b/libraries/ATTinyCore/library.properties
similarity index 100%
rename from avr/libraries/ATTinyCore/library.properties
rename to libraries/ATTinyCore/library.properties
diff --git a/avr/libraries/ATTinyCore/src/ATTinyCore.h b/libraries/ATTinyCore/src/ATTinyCore.h
similarity index 100%
rename from avr/libraries/ATTinyCore/src/ATTinyCore.h
rename to libraries/ATTinyCore/src/ATTinyCore.h
diff --git a/avr/libraries/EEPROM/EEPROM.h b/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from avr/libraries/EEPROM/EEPROM.h
rename to libraries/EEPROM/EEPROM.h
diff --git a/avr/libraries/EEPROM/README.md b/libraries/EEPROM/README.md
similarity index 100%
rename from avr/libraries/EEPROM/README.md
rename to libraries/EEPROM/README.md
diff --git a/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino b/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
rename to libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino b/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
rename to libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino b/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
rename to libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino b/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
rename to libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino b/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
rename to libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino b/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
rename to libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino b/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
rename to libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
diff --git a/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino b/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
similarity index 100%
rename from avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
rename to libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
diff --git a/avr/libraries/EEPROM/keywords.txt b/libraries/EEPROM/keywords.txt
similarity index 100%
rename from avr/libraries/EEPROM/keywords.txt
rename to libraries/EEPROM/keywords.txt
diff --git a/avr/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
similarity index 100%
rename from avr/libraries/EEPROM/library.properties
rename to libraries/EEPROM/library.properties
diff --git a/avr/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
similarity index 100%
rename from avr/libraries/SPI/SPI.cpp
rename to libraries/SPI/SPI.cpp
diff --git a/avr/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
similarity index 100%
rename from avr/libraries/SPI/SPI.h
rename to libraries/SPI/SPI.h
diff --git a/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino b/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
similarity index 100%
rename from avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
rename to libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
diff --git a/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
similarity index 100%
rename from avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
rename to libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
diff --git a/avr/libraries/SPI/keywords.txt b/libraries/SPI/keywords.txt
similarity index 100%
rename from avr/libraries/SPI/keywords.txt
rename to libraries/SPI/keywords.txt
diff --git a/avr/libraries/SPI/library.properties b/libraries/SPI/library.properties
similarity index 100%
rename from avr/libraries/SPI/library.properties
rename to libraries/SPI/library.properties
diff --git a/avr/libraries/Servo/README.adoc b/libraries/Servo/README.adoc
similarity index 100%
rename from avr/libraries/Servo/README.adoc
rename to libraries/Servo/README.adoc
diff --git a/avr/libraries/Servo/examples/Knob/Knob.ino b/libraries/Servo/examples/Knob/Knob.ino
similarity index 100%
rename from avr/libraries/Servo/examples/Knob/Knob.ino
rename to libraries/Servo/examples/Knob/Knob.ino
diff --git a/avr/libraries/Servo/examples/Sweep/Sweep.ino b/libraries/Servo/examples/Sweep/Sweep.ino
similarity index 100%
rename from avr/libraries/Servo/examples/Sweep/Sweep.ino
rename to libraries/Servo/examples/Sweep/Sweep.ino
diff --git a/avr/libraries/Servo/keywords.txt b/libraries/Servo/keywords.txt
similarity index 100%
rename from avr/libraries/Servo/keywords.txt
rename to libraries/Servo/keywords.txt
diff --git a/avr/libraries/Servo/library.properties b/libraries/Servo/library.properties
similarity index 100%
rename from avr/libraries/Servo/library.properties
rename to libraries/Servo/library.properties
diff --git a/avr/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h
similarity index 100%
rename from avr/libraries/Servo/src/Servo.h
rename to libraries/Servo/src/Servo.h
diff --git a/avr/libraries/Servo/src/avr/Servo.cpp b/libraries/Servo/src/avr/Servo.cpp
similarity index 100%
rename from avr/libraries/Servo/src/avr/Servo.cpp
rename to libraries/Servo/src/avr/Servo.cpp
diff --git a/avr/libraries/Servo/src/avr/ServoTimers.h b/libraries/Servo/src/avr/ServoTimers.h
similarity index 100%
rename from avr/libraries/Servo/src/avr/ServoTimers.h
rename to libraries/Servo/src/avr/ServoTimers.h
diff --git a/avr/libraries/Servo_ATTinyCore/README.adoc b/libraries/Servo_ATTinyCore/README.adoc
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/README.adoc
rename to libraries/Servo_ATTinyCore/README.adoc
diff --git a/avr/libraries/Servo_ATTinyCore/examples/Knob/Knob.ino b/libraries/Servo_ATTinyCore/examples/Knob/Knob.ino
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/examples/Knob/Knob.ino
rename to libraries/Servo_ATTinyCore/examples/Knob/Knob.ino
diff --git a/avr/libraries/Servo_ATTinyCore/examples/Sweep/Sweep.ino b/libraries/Servo_ATTinyCore/examples/Sweep/Sweep.ino
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/examples/Sweep/Sweep.ino
rename to libraries/Servo_ATTinyCore/examples/Sweep/Sweep.ino
diff --git a/avr/libraries/Servo_ATTinyCore/keywords.txt b/libraries/Servo_ATTinyCore/keywords.txt
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/keywords.txt
rename to libraries/Servo_ATTinyCore/keywords.txt
diff --git a/avr/libraries/Servo_ATTinyCore/library.properties b/libraries/Servo_ATTinyCore/library.properties
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/library.properties
rename to libraries/Servo_ATTinyCore/library.properties
diff --git a/avr/libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h b/libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h
rename to libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h
diff --git a/avr/libraries/Servo_ATTinyCore/src/avr/ServoTimers.h b/libraries/Servo_ATTinyCore/src/avr/ServoTimers.h
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/src/avr/ServoTimers.h
rename to libraries/Servo_ATTinyCore/src/avr/ServoTimers.h
diff --git a/avr/libraries/Servo_ATTinyCore/src/avr/Servo_ATTinyCore.cpp b/libraries/Servo_ATTinyCore/src/avr/Servo_ATTinyCore.cpp
similarity index 100%
rename from avr/libraries/Servo_ATTinyCore/src/avr/Servo_ATTinyCore.cpp
rename to libraries/Servo_ATTinyCore/src/avr/Servo_ATTinyCore.cpp
diff --git a/avr/libraries/SoftwareSerial/SoftwareSerial.cpp b/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from avr/libraries/SoftwareSerial/SoftwareSerial.cpp
rename to libraries/SoftwareSerial/SoftwareSerial.cpp
diff --git a/avr/libraries/SoftwareSerial/SoftwareSerial.h b/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from avr/libraries/SoftwareSerial/SoftwareSerial.h
rename to libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
similarity index 100%
rename from avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
rename to libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
diff --git a/avr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino b/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
similarity index 100%
rename from avr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
rename to libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
diff --git a/avr/libraries/SoftwareSerial/keywords.txt b/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from avr/libraries/SoftwareSerial/keywords.txt
rename to libraries/SoftwareSerial/keywords.txt
diff --git a/avr/libraries/SoftwareSerial/library.properties b/libraries/SoftwareSerial/library.properties
similarity index 100%
rename from avr/libraries/SoftwareSerial/library.properties
rename to libraries/SoftwareSerial/library.properties
diff --git a/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino b/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
similarity index 100%
rename from avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
rename to libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
diff --git a/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino b/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
similarity index 100%
rename from avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
rename to libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
diff --git a/avr/libraries/Wire/examples/master_reader/master_reader.ino b/libraries/Wire/examples/master_reader/master_reader.ino
similarity index 100%
rename from avr/libraries/Wire/examples/master_reader/master_reader.ino
rename to libraries/Wire/examples/master_reader/master_reader.ino
diff --git a/avr/libraries/Wire/examples/master_writer/master_writer.ino b/libraries/Wire/examples/master_writer/master_writer.ino
similarity index 100%
rename from avr/libraries/Wire/examples/master_writer/master_writer.ino
rename to libraries/Wire/examples/master_writer/master_writer.ino
diff --git a/avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino b/libraries/Wire/examples/slave_receiver/slave_receiver.ino
similarity index 100%
rename from avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino
rename to libraries/Wire/examples/slave_receiver/slave_receiver.ino
diff --git a/avr/libraries/Wire/examples/slave_sender/slave_sender.ino b/libraries/Wire/examples/slave_sender/slave_sender.ino
similarity index 100%
rename from avr/libraries/Wire/examples/slave_sender/slave_sender.ino
rename to libraries/Wire/examples/slave_sender/slave_sender.ino
diff --git a/avr/libraries/Wire/keywords.txt b/libraries/Wire/keywords.txt
similarity index 100%
rename from avr/libraries/Wire/keywords.txt
rename to libraries/Wire/keywords.txt
diff --git a/avr/libraries/Wire/library.properties b/libraries/Wire/library.properties
similarity index 100%
rename from avr/libraries/Wire/library.properties
rename to libraries/Wire/library.properties
diff --git a/avr/libraries/Wire/src/SoftI2CMaster.h b/libraries/Wire/src/SoftI2CMaster.h
similarity index 100%
rename from avr/libraries/Wire/src/SoftI2CMaster.h
rename to libraries/Wire/src/SoftI2CMaster.h
diff --git a/avr/libraries/Wire/src/SoftWire.h b/libraries/Wire/src/SoftWire.h
similarity index 100%
rename from avr/libraries/Wire/src/SoftWire.h
rename to libraries/Wire/src/SoftWire.h
diff --git a/avr/libraries/Wire/src/USIWire.cpp b/libraries/Wire/src/USIWire.cpp
similarity index 100%
rename from avr/libraries/Wire/src/USIWire.cpp
rename to libraries/Wire/src/USIWire.cpp
diff --git a/avr/libraries/Wire/src/USIWire.h b/libraries/Wire/src/USIWire.h
similarity index 100%
rename from avr/libraries/Wire/src/USIWire.h
rename to libraries/Wire/src/USIWire.h
diff --git a/avr/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.c b/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.c
similarity index 100%
rename from avr/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.c
rename to libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.c
diff --git a/avr/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.h b/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.h
similarity index 100%
rename from avr/libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.h
rename to libraries/Wire/src/USI_TWI_Master/USI_TWI_Master.h
diff --git a/avr/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.c b/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.c
similarity index 100%
rename from avr/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.c
rename to libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.c
diff --git a/avr/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.h b/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.h
similarity index 100%
rename from avr/libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.h
rename to libraries/Wire/src/USI_TWI_Slave/USI_TWI_Slave.h
diff --git a/avr/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
similarity index 100%
rename from avr/libraries/Wire/src/Wire.cpp
rename to libraries/Wire/src/Wire.cpp
diff --git a/avr/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
similarity index 100%
rename from avr/libraries/Wire/src/Wire.h
rename to libraries/Wire/src/Wire.h
diff --git a/avr/libraries/Wire/src/WireS.cpp b/libraries/Wire/src/WireS.cpp
similarity index 100%
rename from avr/libraries/Wire/src/WireS.cpp
rename to libraries/Wire/src/WireS.cpp
diff --git a/avr/libraries/Wire/src/WireS.h b/libraries/Wire/src/WireS.h
similarity index 100%
rename from avr/libraries/Wire/src/WireS.h
rename to libraries/Wire/src/WireS.h
diff --git a/avr/libraries/Wire/src/twi.c b/libraries/Wire/src/twi.c
similarity index 100%
rename from avr/libraries/Wire/src/twi.c
rename to libraries/Wire/src/twi.c
diff --git a/avr/libraries/Wire/src/twi.h b/libraries/Wire/src/twi.h
similarity index 100%
rename from avr/libraries/Wire/src/twi.h
rename to libraries/Wire/src/twi.h
diff --git a/avr/libraries/tinyNeoPixel/COPYING b/libraries/tinyNeoPixel/COPYING
similarity index 100%
rename from avr/libraries/tinyNeoPixel/COPYING
rename to libraries/tinyNeoPixel/COPYING
diff --git a/avr/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino b/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
rename to libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
diff --git a/avr/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino b/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
rename to libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
diff --git a/avr/libraries/tinyNeoPixel/examples/simple/simple.ino b/libraries/tinyNeoPixel/examples/simple/simple.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel/examples/simple/simple.ino
rename to libraries/tinyNeoPixel/examples/simple/simple.ino
diff --git a/avr/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino b/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
rename to libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
diff --git a/avr/libraries/tinyNeoPixel/keywords.txt b/libraries/tinyNeoPixel/keywords.txt
similarity index 100%
rename from avr/libraries/tinyNeoPixel/keywords.txt
rename to libraries/tinyNeoPixel/keywords.txt
diff --git a/avr/libraries/tinyNeoPixel/library.properties b/libraries/tinyNeoPixel/library.properties
similarity index 100%
rename from avr/libraries/tinyNeoPixel/library.properties
rename to libraries/tinyNeoPixel/library.properties
diff --git a/avr/libraries/tinyNeoPixel/tinyNeoPixel.cpp b/libraries/tinyNeoPixel/tinyNeoPixel.cpp
similarity index 100%
rename from avr/libraries/tinyNeoPixel/tinyNeoPixel.cpp
rename to libraries/tinyNeoPixel/tinyNeoPixel.cpp
diff --git a/avr/libraries/tinyNeoPixel/tinyNeoPixel.h b/libraries/tinyNeoPixel/tinyNeoPixel.h
similarity index 100%
rename from avr/libraries/tinyNeoPixel/tinyNeoPixel.h
rename to libraries/tinyNeoPixel/tinyNeoPixel.h
diff --git a/avr/libraries/tinyNeoPixel_Static/COPYING b/libraries/tinyNeoPixel_Static/COPYING
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/COPYING
rename to libraries/tinyNeoPixel_Static/COPYING
diff --git a/avr/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino b/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
rename to libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
diff --git a/avr/libraries/tinyNeoPixel_Static/examples/simple/simple.ino b/libraries/tinyNeoPixel_Static/examples/simple/simple.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/examples/simple/simple.ino
rename to libraries/tinyNeoPixel_Static/examples/simple/simple.ino
diff --git a/avr/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino b/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
rename to libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
diff --git a/avr/libraries/tinyNeoPixel_Static/keywords.txt b/libraries/tinyNeoPixel_Static/keywords.txt
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/keywords.txt
rename to libraries/tinyNeoPixel_Static/keywords.txt
diff --git a/avr/libraries/tinyNeoPixel_Static/library.properties b/libraries/tinyNeoPixel_Static/library.properties
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/library.properties
rename to libraries/tinyNeoPixel_Static/library.properties
diff --git a/avr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp b/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
rename to libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
diff --git a/avr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h b/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
similarity index 100%
rename from avr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
rename to libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
diff --git a/avr/platform.txt b/platform.txt
similarity index 100%
rename from avr/platform.txt
rename to platform.txt
diff --git a/avr/programmers.txt b/programmers.txt
similarity index 100%
rename from avr/programmers.txt
rename to programmers.txt
diff --git a/avr/travis-ci/arduino-ci-script/.github/CONTRIBUTING.md b/travis-ci/arduino-ci-script/.github/CONTRIBUTING.md
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/.github/CONTRIBUTING.md
rename to travis-ci/arduino-ci-script/.github/CONTRIBUTING.md
diff --git a/avr/travis-ci/arduino-ci-script/.github/ISSUE_TEMPLATE.md b/travis-ci/arduino-ci-script/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/.github/ISSUE_TEMPLATE.md
rename to travis-ci/arduino-ci-script/.github/ISSUE_TEMPLATE.md
diff --git a/avr/travis-ci/arduino-ci-script/.github/PULL_REQUEST_TEMPLATE.md b/travis-ci/arduino-ci-script/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/.github/PULL_REQUEST_TEMPLATE.md
rename to travis-ci/arduino-ci-script/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/avr/travis-ci/arduino-ci-script/.travis.yml b/travis-ci/arduino-ci-script/.travis.yml
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/.travis.yml
rename to travis-ci/arduino-ci-script/.travis.yml
diff --git a/avr/travis-ci/arduino-ci-script/LICENSE b/travis-ci/arduino-ci-script/LICENSE
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/LICENSE
rename to travis-ci/arduino-ci-script/LICENSE
diff --git a/avr/travis-ci/arduino-ci-script/README.md b/travis-ci/arduino-ci-script/README.md
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/README.md
rename to travis-ci/arduino-ci-script/README.md
diff --git a/avr/travis-ci/arduino-ci-script/arduino-ci-script.sh b/travis-ci/arduino-ci-script/arduino-ci-script.sh
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/arduino-ci-script.sh
rename to travis-ci/arduino-ci-script/arduino-ci-script.sh
diff --git a/avr/travis-ci/arduino-ci-script/etc/autoformat.sh b/travis-ci/arduino-ci-script/etc/autoformat.sh
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/etc/autoformat.sh
rename to travis-ci/arduino-ci-script/etc/autoformat.sh
diff --git a/avr/travis-ci/arduino-ci-script/etc/codespell-ignore-words-list.txt b/travis-ci/arduino-ci-script/etc/codespell-ignore-words-list.txt
similarity index 100%
rename from avr/travis-ci/arduino-ci-script/etc/codespell-ignore-words-list.txt
rename to travis-ci/arduino-ci-script/etc/codespell-ignore-words-list.txt
diff --git a/avr/travis-ci/etc/codespell-ignore-words-list.txt b/travis-ci/etc/codespell-ignore-words-list.txt
similarity index 100%
rename from avr/travis-ci/etc/codespell-ignore-words-list.txt
rename to travis-ci/etc/codespell-ignore-words-list.txt
diff --git a/avr/variants/tiny43/pins_arduino.h b/variants/tiny43/pins_arduino.h
similarity index 100%
rename from avr/variants/tiny43/pins_arduino.h
rename to variants/tiny43/pins_arduino.h
diff --git a/avr/variants/tinyX313/pins_arduino.h b/variants/tinyX313/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX313/pins_arduino.h
rename to variants/tinyX313/pins_arduino.h
diff --git a/avr/variants/tinyX4/pins_arduino.h b/variants/tinyX4/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX4/pins_arduino.h
rename to variants/tinyX4/pins_arduino.h
diff --git a/avr/variants/tinyX4_reverse/pins_arduino.h b/variants/tinyX4_reverse/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX4_reverse/pins_arduino.h
rename to variants/tinyX4_reverse/pins_arduino.h
diff --git a/avr/variants/tinyX5/pins_arduino.h b/variants/tinyX5/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX5/pins_arduino.h
rename to variants/tinyX5/pins_arduino.h
diff --git a/avr/variants/tinyX61/pins_arduino.h b/variants/tinyX61/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX61/pins_arduino.h
rename to variants/tinyX61/pins_arduino.h
diff --git a/avr/variants/tinyX7/pins_arduino.h b/variants/tinyX7/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX7/pins_arduino.h
rename to variants/tinyX7/pins_arduino.h
diff --git a/avr/variants/tinyX7_New/pins_arduino.h b/variants/tinyX7_New/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX7_New/pins_arduino.h
rename to variants/tinyX7_New/pins_arduino.h
diff --git a/avr/variants/tinyX8/pins_arduino.h b/variants/tinyX8/pins_arduino.h
similarity index 100%
rename from avr/variants/tinyX8/pins_arduino.h
rename to variants/tinyX8/pins_arduino.h