diff --git a/megaavr/avrdude.conf b/avrdude.conf
similarity index 100%
rename from megaavr/avrdude.conf
rename to avrdude.conf
diff --git a/megaavr/boards.txt b/boards.txt
similarity index 100%
rename from megaavr/boards.txt
rename to boards.txt
diff --git a/megaavr/bootloaders/optiboot_x/Makefile b/bootloaders/optiboot_x/Makefile
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/Makefile
rename to bootloaders/optiboot_x/Makefile
diff --git a/megaavr/bootloaders/optiboot_x/README.TXT b/bootloaders/optiboot_x/README.TXT
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/README.TXT
rename to bootloaders/optiboot_x/README.TXT
diff --git a/megaavr/bootloaders/optiboot_x/baudcheck.c b/bootloaders/optiboot_x/baudcheck.c
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/baudcheck.c
rename to bootloaders/optiboot_x/baudcheck.c
diff --git a/megaavr/bootloaders/optiboot_x/boot_opt.h b/bootloaders/optiboot_x/boot_opt.h
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/boot_opt.h
rename to bootloaders/optiboot_x/boot_opt.h
diff --git a/megaavr/bootloaders/optiboot_x/info.sh b/bootloaders/optiboot_x/info.sh
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/info.sh
rename to bootloaders/optiboot_x/info.sh
diff --git a/megaavr/bootloaders/optiboot_x/make-ccversions b/bootloaders/optiboot_x/make-ccversions
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/make-ccversions
rename to bootloaders/optiboot_x/make-ccversions
diff --git a/megaavr/bootloaders/optiboot_x/make_all_xtiny.bat b/bootloaders/optiboot_x/make_all_xtiny.bat
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/make_all_xtiny.bat
rename to bootloaders/optiboot_x/make_all_xtiny.bat
diff --git a/megaavr/bootloaders/optiboot_x/makeoptions b/bootloaders/optiboot_x/makeoptions
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/makeoptions
rename to bootloaders/optiboot_x/makeoptions
diff --git a/megaavr/bootloaders/optiboot_x/megaTinyCore_Notes.txt b/bootloaders/optiboot_x/megaTinyCore_Notes.txt
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/megaTinyCore_Notes.txt
rename to bootloaders/optiboot_x/megaTinyCore_Notes.txt
diff --git a/megaavr/bootloaders/optiboot_x/omake b/bootloaders/optiboot_x/omake
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/omake
rename to bootloaders/optiboot_x/omake
diff --git a/megaavr/bootloaders/optiboot_x/omake.bat b/bootloaders/optiboot_x/omake.bat
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/omake.bat
rename to bootloaders/optiboot_x/omake.bat
diff --git a/megaavr/bootloaders/optiboot_x/optiboot.c b/bootloaders/optiboot_x/optiboot.c
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot.c
rename to bootloaders/optiboot_x/optiboot.c
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy2.hex b/bootloaders/optiboot_x/optiboot_txy2.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy2.hex
rename to bootloaders/optiboot_x/optiboot_txy2.hex
index 7bfc06db..7b4c57d3 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_txy2.hex
+++ b/bootloaders/optiboot_x/optiboot_txy2.hex
@@ -1,30 +1,30 @@
-:1000000001C0D1C01124809140008093400083FF43
-:1000100004C0282E80E0AFD0F3C0A895069A0E9AAF
-:1000200010920102809182128370813029F58CE553
-:1000300090E0809308089093090881E080930B0872
-:1000400083E0809307081092050880EC80930608EF
-:100050008BE091D0079A87E0815089F4A8950DE94B
-:1000600083E0D82E7CD08134F1F479D0182F8CD055
-:10007000123889F480E013C083E790E0DACF179A52
-:100080002EEC36E5A8959091040897FDE8CF215015
-:100090003109C1F7E1CF89E0113809F083E058D088
-:1000A00080E156D0DFCF823419F484E175D0F8CFE7
-:1000B000853411F485E0FACF853531F450D0C82F5E
-:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
-:1000D000D1CF8436B9F443D042D0182F40D08634E3
-:1000E00079F4D0583CD0888321961150D9F74CD060
-:1000F00004BFD0920010809102108370E1F7D0CF3E
-:10010000DC5EF0CF843791F42AD029D0182F27D085
-:10011000F82E3AD086E4F81207C0D058888121968C
-:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
-:100130002BD0809100110CD08091011109D08091B9
-:100140000211ADCF813509F0BDCF81E014D0BACF17
-:100150009091040895FFFCCF809302080895809148
-:10016000040887FFFCCF909101088091000892FD60
-:1001700001C0A89508959091010190FDFCCF98EDE4
-:1001800094BF809300010895EADF803219F081E086
-:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
-:1001A000E9F7CF91F1CF88ED84BF60930001809192
-:0801B00002108370E1F70895CD
-:0201FE000009F6
-:00000001FF
+:1000000001C0D1C01124809140008093400083FF43
+:1000100004C0282E80E0AFD0F3C0A895069A0E9AAF
+:1000200010920102809182128370813029F58CE553
+:1000300090E0809308089093090881E080930B0872
+:1000400083E0809307081092050880EC80930608EF
+:100050008BE091D0079A87E0815089F4A8950DE94B
+:1000600083E0D82E7CD08134F1F479D0182F8CD055
+:10007000123889F480E013C083E790E0DACF179A52
+:100080002EEC36E5A8959091040897FDE8CF215015
+:100090003109C1F7E1CF89E0113809F083E058D088
+:1000A00080E156D0DFCF823419F484E175D0F8CFE7
+:1000B000853411F485E0FACF853531F450D0C82F5E
+:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
+:1000D000D1CF8436B9F443D042D0182F40D08634E3
+:1000E00079F4D0583CD0888321961150D9F74CD060
+:1000F00004BFD0920010809102108370E1F7D0CF3E
+:10010000DC5EF0CF843791F42AD029D0182F27D085
+:10011000F82E3AD086E4F81207C0D058888121968C
+:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
+:100130002BD0809100110CD08091011109D08091B9
+:100140000211ADCF813509F0BDCF81E014D0BACF17
+:100150009091040895FFFCCF809302080895809148
+:10016000040887FFFCCF909101088091000892FD60
+:1001700001C0A89508959091010190FDFCCF98EDE4
+:1001800094BF809300010895EADF803219F081E086
+:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
+:1001A000E9F7CF91F1CF88ED84BF60930001809192
+:0801B00002108370E1F70895CD
+:0201FE000009F6
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy2_alt.hex b/bootloaders/optiboot_x/optiboot_txy2_alt.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy2_alt.hex
rename to bootloaders/optiboot_x/optiboot_txy2_alt.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy2_alt_rst.hex b/bootloaders/optiboot_x/optiboot_txy2_alt_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy2_alt_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy2_alt_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy2_rst.hex b/bootloaders/optiboot_x/optiboot_txy2_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy2_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy2_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy4.hex b/bootloaders/optiboot_x/optiboot_txy4.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy4.hex
rename to bootloaders/optiboot_x/optiboot_txy4.hex
index f67c6d17..3e7b8842 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_txy4.hex
+++ b/bootloaders/optiboot_x/optiboot_txy4.hex
@@ -1,30 +1,30 @@
-:1000000001C0D1C01124809140008093400083FF43
-:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
-:1000200010920102809182128370813029F58CE553
-:1000300090E0809308089093090881E080930B0872
-:1000400083E0809307081092050880EC80930608EF
-:100050008BE091D0079A87E0815089F4A8950DE94B
-:1000600083E0D82E7CD08134F1F479D0182F8CD055
-:10007000123889F480E013C083E790E0DACF179A52
-:100080002EEC36E5A8959091040897FDE8CF215015
-:100090003109C1F7E1CF89E0113809F083E058D088
-:1000A00080E156D0DFCF823419F484E175D0F8CFE7
-:1000B000853411F485E0FACF853531F450D0C82F5E
-:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
-:1000D000D1CF8436B9F443D042D0182F40D08634E3
-:1000E00079F4D0583CD0888321961150D9F74CD060
-:1000F00004BFD0920010809102108370E1F7D0CF3E
-:10010000DC5EF0CF843791F42AD029D0182F27D085
-:10011000F82E3AD086E4F81207C0D058888121968C
-:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
-:100130002BD0809100110CD08091011109D08091B9
-:100140000211ADCF813509F0BDCF81E014D0BACF17
-:100150009091040895FFFCCF809302080895809148
-:10016000040887FFFCCF909101088091000892FD60
-:1001700001C0A89508959091010190FDFCCF98EDE4
-:1001800094BF809300010895EADF803219F081E086
-:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
-:1001A000E9F7CF91F1CF88ED84BF60930001809192
-:0801B00002108370E1F70895CD
-:0201FE000009F6
-:00000001FF
+:1000000001C0D1C01124809140008093400083FF43
+:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
+:1000200010920102809182128370813029F58CE553
+:1000300090E0809308089093090881E080930B0872
+:1000400083E0809307081092050880EC80930608EF
+:100050008BE091D0079A87E0815089F4A8950DE94B
+:1000600083E0D82E7CD08134F1F479D0182F8CD055
+:10007000123889F480E013C083E790E0DACF179A52
+:100080002EEC36E5A8959091040897FDE8CF215015
+:100090003109C1F7E1CF89E0113809F083E058D088
+:1000A00080E156D0DFCF823419F484E175D0F8CFE7
+:1000B000853411F485E0FACF853531F450D0C82F5E
+:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
+:1000D000D1CF8436B9F443D042D0182F40D08634E3
+:1000E00079F4D0583CD0888321961150D9F74CD060
+:1000F00004BFD0920010809102108370E1F7D0CF3E
+:10010000DC5EF0CF843791F42AD029D0182F27D085
+:10011000F82E3AD086E4F81207C0D058888121968C
+:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
+:100130002BD0809100110CD08091011109D08091B9
+:100140000211ADCF813509F0BDCF81E014D0BACF17
+:100150009091040895FFFCCF809302080895809148
+:10016000040887FFFCCF909101088091000892FD60
+:1001700001C0A89508959091010190FDFCCF98EDE4
+:1001800094BF809300010895EADF803219F081E086
+:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
+:1001A000E9F7CF91F1CF88ED84BF60930001809192
+:0801B00002108370E1F70895CD
+:0201FE000009F6
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy4_alt.hex b/bootloaders/optiboot_x/optiboot_txy4_alt.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy4_alt.hex
rename to bootloaders/optiboot_x/optiboot_txy4_alt.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy4_alt_rst.hex b/bootloaders/optiboot_x/optiboot_txy4_alt_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy4_alt_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy4_alt_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy4_rst.hex b/bootloaders/optiboot_x/optiboot_txy4_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy4_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy4_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy6.hex b/bootloaders/optiboot_x/optiboot_txy6.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy6.hex
rename to bootloaders/optiboot_x/optiboot_txy6.hex
index f67c6d17..3e7b8842 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_txy6.hex
+++ b/bootloaders/optiboot_x/optiboot_txy6.hex
@@ -1,30 +1,30 @@
-:1000000001C0D1C01124809140008093400083FF43
-:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
-:1000200010920102809182128370813029F58CE553
-:1000300090E0809308089093090881E080930B0872
-:1000400083E0809307081092050880EC80930608EF
-:100050008BE091D0079A87E0815089F4A8950DE94B
-:1000600083E0D82E7CD08134F1F479D0182F8CD055
-:10007000123889F480E013C083E790E0DACF179A52
-:100080002EEC36E5A8959091040897FDE8CF215015
-:100090003109C1F7E1CF89E0113809F083E058D088
-:1000A00080E156D0DFCF823419F484E175D0F8CFE7
-:1000B000853411F485E0FACF853531F450D0C82F5E
-:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
-:1000D000D1CF8436B9F443D042D0182F40D08634E3
-:1000E00079F4D0583CD0888321961150D9F74CD060
-:1000F00004BFD0920010809102108370E1F7D0CF3E
-:10010000DC5EF0CF843791F42AD029D0182F27D085
-:10011000F82E3AD086E4F81207C0D058888121968C
-:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
-:100130002BD0809100110CD08091011109D08091B9
-:100140000211ADCF813509F0BDCF81E014D0BACF17
-:100150009091040895FFFCCF809302080895809148
-:10016000040887FFFCCF909101088091000892FD60
-:1001700001C0A89508959091010190FDFCCF98EDE4
-:1001800094BF809300010895EADF803219F081E086
-:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
-:1001A000E9F7CF91F1CF88ED84BF60930001809192
-:0801B00002108370E1F70895CD
-:0201FE000009F6
-:00000001FF
+:1000000001C0D1C01124809140008093400083FF43
+:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
+:1000200010920102809182128370813029F58CE553
+:1000300090E0809308089093090881E080930B0872
+:1000400083E0809307081092050880EC80930608EF
+:100050008BE091D0079A87E0815089F4A8950DE94B
+:1000600083E0D82E7CD08134F1F479D0182F8CD055
+:10007000123889F480E013C083E790E0DACF179A52
+:100080002EEC36E5A8959091040897FDE8CF215015
+:100090003109C1F7E1CF89E0113809F083E058D088
+:1000A00080E156D0DFCF823419F484E175D0F8CFE7
+:1000B000853411F485E0FACF853531F450D0C82F5E
+:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
+:1000D000D1CF8436B9F443D042D0182F40D08634E3
+:1000E00079F4D0583CD0888321961150D9F74CD060
+:1000F00004BFD0920010809102108370E1F7D0CF3E
+:10010000DC5EF0CF843791F42AD029D0182F27D085
+:10011000F82E3AD086E4F81207C0D058888121968C
+:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
+:100130002BD0809100110CD08091011109D08091B9
+:100140000211ADCF813509F0BDCF81E014D0BACF17
+:100150009091040895FFFCCF809302080895809148
+:10016000040887FFFCCF909101088091000892FD60
+:1001700001C0A89508959091010190FDFCCF98EDE4
+:1001800094BF809300010895EADF803219F081E086
+:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
+:1001A000E9F7CF91F1CF88ED84BF60930001809192
+:0801B00002108370E1F70895CD
+:0201FE000009F6
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy6_alt.hex b/bootloaders/optiboot_x/optiboot_txy6_alt.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy6_alt.hex
rename to bootloaders/optiboot_x/optiboot_txy6_alt.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy6_alt_rst.hex b/bootloaders/optiboot_x/optiboot_txy6_alt_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy6_alt_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy6_alt_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy6_rst.hex b/bootloaders/optiboot_x/optiboot_txy6_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy6_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy6_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy7.hex b/bootloaders/optiboot_x/optiboot_txy7.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy7.hex
rename to bootloaders/optiboot_x/optiboot_txy7.hex
index f67c6d17..3e7b8842 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_txy7.hex
+++ b/bootloaders/optiboot_x/optiboot_txy7.hex
@@ -1,30 +1,30 @@
-:1000000001C0D1C01124809140008093400083FF43
-:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
-:1000200010920102809182128370813029F58CE553
-:1000300090E0809308089093090881E080930B0872
-:1000400083E0809307081092050880EC80930608EF
-:100050008BE091D0079A87E0815089F4A8950DE94B
-:1000600083E0D82E7CD08134F1F479D0182F8CD055
-:10007000123889F480E013C083E790E0DACF179A52
-:100080002EEC36E5A8959091040897FDE8CF215015
-:100090003109C1F7E1CF89E0113809F083E058D088
-:1000A00080E156D0DFCF823419F484E175D0F8CFE7
-:1000B000853411F485E0FACF853531F450D0C82F5E
-:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
-:1000D000D1CF8436B9F443D042D0182F40D08634E3
-:1000E00079F4D0583CD0888321961150D9F74CD060
-:1000F00004BFD0920010809102108370E1F7D0CF3E
-:10010000DC5EF0CF843791F42AD029D0182F27D085
-:10011000F82E3AD086E4F81207C0D058888121968C
-:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
-:100130002BD0809100110CD08091011109D08091B9
-:100140000211ADCF813509F0BDCF81E014D0BACF17
-:100150009091040895FFFCCF809302080895809148
-:10016000040887FFFCCF909101088091000892FD60
-:1001700001C0A89508959091010190FDFCCF98EDE4
-:1001800094BF809300010895EADF803219F081E086
-:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
-:1001A000E9F7CF91F1CF88ED84BF60930001809192
-:0801B00002108370E1F70895CD
-:0201FE000009F6
-:00000001FF
+:1000000001C0D1C01124809140008093400083FF43
+:1000100004C0282E80E0AFD0F3C0A895229A2A9A77
+:1000200010920102809182128370813029F58CE553
+:1000300090E0809308089093090881E080930B0872
+:1000400083E0809307081092050880EC80930608EF
+:100050008BE091D0079A87E0815089F4A8950DE94B
+:1000600083E0D82E7CD08134F1F479D0182F8CD055
+:10007000123889F480E013C083E790E0DACF179A52
+:100080002EEC36E5A8959091040897FDE8CF215015
+:100090003109C1F7E1CF89E0113809F083E058D088
+:1000A00080E156D0DFCF823419F484E175D0F8CFE7
+:1000B000853411F485E0FACF853531F450D0C82F5E
+:1000C0004ED0D82F61D0ECCF863519F484E064D0BF
+:1000D000D1CF8436B9F443D042D0182F40D08634E3
+:1000E00079F4D0583CD0888321961150D9F74CD060
+:1000F00004BFD0920010809102108370E1F7D0CF3E
+:10010000DC5EF0CF843791F42AD029D0182F27D085
+:10011000F82E3AD086E4F81207C0D058888121968C
+:1001200017D01150D9F7BCCFDC5EF8CF853751F42A
+:100130002BD0809100110CD08091011109D08091B9
+:100140000211ADCF813509F0BDCF81E014D0BACF17
+:100150009091040895FFFCCF809302080895809148
+:10016000040887FFFCCF909101088091000892FD60
+:1001700001C0A89508959091010190FDFCCF98EDE4
+:1001800094BF809300010895EADF803219F081E086
+:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
+:1001A000E9F7CF91F1CF88ED84BF60930001809192
+:0801B00002108370E1F70895CD
+:0201FE000009F6
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy7_alt.hex b/bootloaders/optiboot_x/optiboot_txy7_alt.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy7_alt.hex
rename to bootloaders/optiboot_x/optiboot_txy7_alt.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy7_alt_rst.hex b/bootloaders/optiboot_x/optiboot_txy7_alt_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy7_alt_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy7_alt_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_txy7_rst.hex b/bootloaders/optiboot_x/optiboot_txy7_rst.hex
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_txy7_rst.hex
rename to bootloaders/optiboot_x/optiboot_txy7_rst.hex
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_x.c b/bootloaders/optiboot_x/optiboot_x.c
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/optiboot_x.c
rename to bootloaders/optiboot_x/optiboot_x.c
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_xplained416.hex b/bootloaders/optiboot_x/optiboot_xplained416.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_xplained416.hex
rename to bootloaders/optiboot_x/optiboot_xplained416.hex
index 4d2583e5..e55e0142 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_xplained416.hex
+++ b/bootloaders/optiboot_x/optiboot_xplained416.hex
@@ -1,32 +1,32 @@
-:1000000001C0D1C01124809140008093400083FF43
-:1000100004C0282E80E0AFD0F3C0A895019A099AB9
-:1000200081E080930102809182128370813019F403
-:1000300089EB90E002C087EE90E0809308089093EF
-:10004000090881E080930B0883E0809307081092F1
-:10005000050880EC809306088BE08DD0259A88E017
-:10006000815061F0359A2EEC36E5A8959091040800
-:1000700097FD05C021503109C1F7F2CFA8950DE9D0
-:1000800083E0D82E6CD0813461F469D0182F7CD0F5
-:100090001238D9F0113811F489E001C083E058D04A
-:1000A00054C0823411F484E103C0853419F485E02E
-:1000B00073D04BC0853529F452D0C82F50D0D82FDB
-:1000C00043C0863521F484E067D080E0E8CF8436F1
-:1000D000B9F445D044D0182F42D0863411F4D0580A
-:1000E00001C0DC5E3CD0888321961150D9F74CD0FA
-:1000F00004BFD0920010809102108370E1F725C0F8
-:10010000843791F42CD02BD0182F29D0F82E3CD046
-:1001100086E4F81202C0D05801C0DC5E88812196C6
-:1001200017D01150D9F711C0853751F42DD08091D7
-:1001300000110ED0809101110BD080910211AFCF30
-:10014000813511F481E017D01FD080E101D09ACF22
-:100150009091040895FFFCCF809302080895809148
-:10016000040887FFFCCF909101088091000892FD60
-:1001700001C0A89508959091010190FDFCCF98EDE4
-:1001800094BF809300010895EADF803219F081E086
-:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
-:1001A000E9F7CF91F1CF88ED84BF60930001809192
-:0801B00002108370E1F70895CD
-:0201FE000009F6
-:10020000E0E4F0E0808180838091FE019091FF0125
-:1002100040E050E064E080E090E0C5DF0C94000036
-:00000001FF
+:1000000001C0D1C01124809140008093400083FF43
+:1000100004C0282E80E0AFD0F3C0A895019A099AB9
+:1000200081E080930102809182128370813019F403
+:1000300089EB90E002C087EE90E0809308089093EF
+:10004000090881E080930B0883E0809307081092F1
+:10005000050880EC809306088BE08DD0259A88E017
+:10006000815061F0359A2EEC36E5A8959091040800
+:1000700097FD05C021503109C1F7F2CFA8950DE9D0
+:1000800083E0D82E6CD0813461F469D0182F7CD0F5
+:100090001238D9F0113811F489E001C083E058D04A
+:1000A00054C0823411F484E103C0853419F485E02E
+:1000B00073D04BC0853529F452D0C82F50D0D82FDB
+:1000C00043C0863521F484E067D080E0E8CF8436F1
+:1000D000B9F445D044D0182F42D0863411F4D0580A
+:1000E00001C0DC5E3CD0888321961150D9F74CD0FA
+:1000F00004BFD0920010809102108370E1F725C0F8
+:10010000843791F42CD02BD0182F29D0F82E3CD046
+:1001100086E4F81202C0D05801C0DC5E88812196C6
+:1001200017D01150D9F711C0853751F42DD08091D7
+:1001300000110ED0809101110BD080910211AFCF30
+:10014000813511F481E017D01FD080E101D09ACF22
+:100150009091040895FFFCCF809302080895809148
+:10016000040887FFFCCF909101088091000892FD60
+:1001700001C0A89508959091010190FDFCCF98EDE4
+:1001800094BF809300010895EADF803219F081E086
+:10019000F2DFFFCF84E1DCCFCF93C82FE0DFC15087
+:1001A000E9F7CF91F1CF88ED84BF60930001809192
+:0801B00002108370E1F70895CD
+:0201FE000009F6
+:10020000E0E4F0E0808180838091FE019091FF0125
+:1002100040E050E064E080E090E0C5DF0C94000036
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/optiboot_xplained817.hex b/bootloaders/optiboot_x/optiboot_xplained817.hex
similarity index 97%
rename from megaavr/bootloaders/optiboot_x/optiboot_xplained817.hex
rename to bootloaders/optiboot_x/optiboot_xplained817.hex
index 2dbd352d..c0084ed7 100644
--- a/megaavr/bootloaders/optiboot_x/optiboot_xplained817.hex
+++ b/bootloaders/optiboot_x/optiboot_xplained817.hex
@@ -1,32 +1,32 @@
-:1000000001C0CEC01124809140008093400083FF46
-:1000100004C0282E80E0ACD0F3C0A895229A2A9A7A
-:10002000809182128370813019F489EB90E002C0D4
-:1000300087EE90E0809308089093090881E0809310
-:100040000B0883E0809307081092050880EC8093EA
-:1000500006088BE08DD0409A87E0815061F0509A7D
-:100060002EEC36E5A8959091040897FD05C0215027
-:100070003109C1F7F2CFA8950DE983E0D82E6CD0F5
-:10008000813461F469D0182F7CD01238D9F011383E
-:1000900011F489E001C083E058D054C0823411F4D7
-:1000A00084E103C0853419F485E073D04BC08535F5
-:1000B00029F452D0C82F50D0D82F43C0863521F410
-:1000C00084E067D080E0E8CF8436B9F445D044D0EE
-:1000D000182F42D0863411F4D05801C0DC5E3CD0D9
-:1000E000888321961150D9F74CD004BFD0920010CC
-:1000F000809102108370E1F725C0843791F42CD0F1
-:100100002BD0182F29D0F82E3CD086E4F81202C04C
-:10011000D05801C0DC5E8881219617D01150D9F7E4
-:1001200011C0853751F42DD0809100110ED08091EF
-:1001300001110BD080910211AFCF813511F481E014
-:1001400017D01FD080E101D09ACF9091040895FF7D
-:10015000FCCF8093020808958091040887FFFCCFAC
-:10016000909101088091000892FD01C0A895089522
-:100170009091010190FDFCCF98ED94BF8093000118
-:100180000895EADF803219F081E0F2DFFFCF84E1E9
-:10019000DCCFCF93C82FE0DFC150E9F7CF91F1CF8B
-:1001A00088ED84BF60930001809102108370E1F7B5
-:0201B0000895B0
-:0201FE000009F6
-:10020000E0E4F0E0808180838091FE019091FF0125
-:1002100040E050E064E080E090E0C2DF0C94000039
-:00000001FF
+:1000000001C0CEC01124809140008093400083FF46
+:1000100004C0282E80E0ACD0F3C0A895229A2A9A7A
+:10002000809182128370813019F489EB90E002C0D4
+:1000300087EE90E0809308089093090881E0809310
+:100040000B0883E0809307081092050880EC8093EA
+:1000500006088BE08DD0409A87E0815061F0509A7D
+:100060002EEC36E5A8959091040897FD05C0215027
+:100070003109C1F7F2CFA8950DE983E0D82E6CD0F5
+:10008000813461F469D0182F7CD01238D9F011383E
+:1000900011F489E001C083E058D054C0823411F4D7
+:1000A00084E103C0853419F485E073D04BC08535F5
+:1000B00029F452D0C82F50D0D82F43C0863521F410
+:1000C00084E067D080E0E8CF8436B9F445D044D0EE
+:1000D000182F42D0863411F4D05801C0DC5E3CD0D9
+:1000E000888321961150D9F74CD004BFD0920010CC
+:1000F000809102108370E1F725C0843791F42CD0F1
+:100100002BD0182F29D0F82E3CD086E4F81202C04C
+:10011000D05801C0DC5E8881219617D01150D9F7E4
+:1001200011C0853751F42DD0809100110ED08091EF
+:1001300001110BD080910211AFCF813511F481E014
+:1001400017D01FD080E101D09ACF9091040895FF7D
+:10015000FCCF8093020808958091040887FFFCCFAC
+:10016000909101088091000892FD01C0A895089522
+:100170009091010190FDFCCF98ED94BF8093000118
+:100180000895EADF803219F081E0F2DFFFCF84E1E9
+:10019000DCCFCF93C82FE0DFC150E9F7CF91F1CF8B
+:1001A00088ED84BF60930001809102108370E1F7B5
+:0201B0000895B0
+:0201FE000009F6
+:10020000E0E4F0E0808180838091FE019091FF0125
+:1002100040E050E064E080E090E0C2DF0C94000039
+:00000001FF
diff --git a/megaavr/bootloaders/optiboot_x/parse_options.mk b/bootloaders/optiboot_x/parse_options.mk
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/parse_options.mk
rename to bootloaders/optiboot_x/parse_options.mk
diff --git a/megaavr/bootloaders/optiboot_x/pin_defs.h b/bootloaders/optiboot_x/pin_defs.h
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/pin_defs.h
rename to bootloaders/optiboot_x/pin_defs.h
diff --git a/megaavr/bootloaders/optiboot_x/pin_defs_x.h b/bootloaders/optiboot_x/pin_defs_x.h
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/pin_defs_x.h
rename to bootloaders/optiboot_x/pin_defs_x.h
diff --git a/megaavr/bootloaders/optiboot_x/stk500.h b/bootloaders/optiboot_x/stk500.h
similarity index 100%
rename from megaavr/bootloaders/optiboot_x/stk500.h
rename to bootloaders/optiboot_x/stk500.h
diff --git a/megaavr/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
similarity index 100%
rename from megaavr/cores/arduino/Arduino.h
rename to cores/arduino/Arduino.h
diff --git a/megaavr/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
similarity index 100%
rename from megaavr/cores/arduino/Tone.cpp
rename to cores/arduino/Tone.cpp
diff --git a/megaavr/cores/arduino/UART.cpp b/cores/arduino/UART.cpp
similarity index 100%
rename from megaavr/cores/arduino/UART.cpp
rename to cores/arduino/UART.cpp
diff --git a/megaavr/cores/arduino/UART.h b/cores/arduino/UART.h
similarity index 100%
rename from megaavr/cores/arduino/UART.h
rename to cores/arduino/UART.h
diff --git a/megaavr/cores/arduino/UART0.cpp b/cores/arduino/UART0.cpp
similarity index 100%
rename from megaavr/cores/arduino/UART0.cpp
rename to cores/arduino/UART0.cpp
diff --git a/megaavr/cores/arduino/UART1.cpp b/cores/arduino/UART1.cpp
similarity index 100%
rename from megaavr/cores/arduino/UART1.cpp
rename to cores/arduino/UART1.cpp
diff --git a/megaavr/cores/arduino/UART2.cpp b/cores/arduino/UART2.cpp
similarity index 100%
rename from megaavr/cores/arduino/UART2.cpp
rename to cores/arduino/UART2.cpp
diff --git a/megaavr/cores/arduino/UART3.cpp b/cores/arduino/UART3.cpp
similarity index 100%
rename from megaavr/cores/arduino/UART3.cpp
rename to cores/arduino/UART3.cpp
diff --git a/megaavr/cores/arduino/UART_private.h b/cores/arduino/UART_private.h
similarity index 100%
rename from megaavr/cores/arduino/UART_private.h
rename to cores/arduino/UART_private.h
diff --git a/megaavr/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
similarity index 100%
rename from megaavr/cores/arduino/WInterrupts.c
rename to cores/arduino/WInterrupts.c
diff --git a/megaavr/cores/arduino/WMath.cpp b/cores/arduino/WMath.cpp
similarity index 100%
rename from megaavr/cores/arduino/WMath.cpp
rename to cores/arduino/WMath.cpp
diff --git a/megaavr/cores/arduino/abi.cpp b/cores/arduino/abi.cpp
similarity index 100%
rename from megaavr/cores/arduino/abi.cpp
rename to cores/arduino/abi.cpp
diff --git a/megaavr/cores/arduino/api/ArduinoAPI.h b/cores/arduino/api/ArduinoAPI.h
similarity index 100%
rename from megaavr/cores/arduino/api/ArduinoAPI.h
rename to cores/arduino/api/ArduinoAPI.h
diff --git a/megaavr/cores/arduino/api/Binary.h b/cores/arduino/api/Binary.h
similarity index 100%
rename from megaavr/cores/arduino/api/Binary.h
rename to cores/arduino/api/Binary.h
diff --git a/megaavr/cores/arduino/api/Client.h b/cores/arduino/api/Client.h
similarity index 100%
rename from megaavr/cores/arduino/api/Client.h
rename to cores/arduino/api/Client.h
diff --git a/megaavr/cores/arduino/api/Common.cpp b/cores/arduino/api/Common.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/Common.cpp
rename to cores/arduino/api/Common.cpp
diff --git a/megaavr/cores/arduino/api/Common.h b/cores/arduino/api/Common.h
similarity index 100%
rename from megaavr/cores/arduino/api/Common.h
rename to cores/arduino/api/Common.h
diff --git a/megaavr/cores/arduino/api/HardwareI2C.h b/cores/arduino/api/HardwareI2C.h
similarity index 100%
rename from megaavr/cores/arduino/api/HardwareI2C.h
rename to cores/arduino/api/HardwareI2C.h
diff --git a/megaavr/cores/arduino/api/HardwareSerial.h b/cores/arduino/api/HardwareSerial.h
similarity index 100%
rename from megaavr/cores/arduino/api/HardwareSerial.h
rename to cores/arduino/api/HardwareSerial.h
diff --git a/megaavr/cores/arduino/api/IPAddress.cpp b/cores/arduino/api/IPAddress.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/IPAddress.cpp
rename to cores/arduino/api/IPAddress.cpp
diff --git a/megaavr/cores/arduino/api/IPAddress.h b/cores/arduino/api/IPAddress.h
similarity index 100%
rename from megaavr/cores/arduino/api/IPAddress.h
rename to cores/arduino/api/IPAddress.h
diff --git a/megaavr/cores/arduino/api/PluggableUSB.cpp b/cores/arduino/api/PluggableUSB.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/PluggableUSB.cpp
rename to cores/arduino/api/PluggableUSB.cpp
diff --git a/megaavr/cores/arduino/api/PluggableUSB.h b/cores/arduino/api/PluggableUSB.h
similarity index 100%
rename from megaavr/cores/arduino/api/PluggableUSB.h
rename to cores/arduino/api/PluggableUSB.h
diff --git a/megaavr/cores/arduino/api/Print.cpp b/cores/arduino/api/Print.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/Print.cpp
rename to cores/arduino/api/Print.cpp
diff --git a/megaavr/cores/arduino/api/Print.h b/cores/arduino/api/Print.h
similarity index 100%
rename from megaavr/cores/arduino/api/Print.h
rename to cores/arduino/api/Print.h
diff --git a/megaavr/cores/arduino/api/Printable.h b/cores/arduino/api/Printable.h
similarity index 100%
rename from megaavr/cores/arduino/api/Printable.h
rename to cores/arduino/api/Printable.h
diff --git a/megaavr/cores/arduino/api/RingBuffer.cpp b/cores/arduino/api/RingBuffer.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/RingBuffer.cpp
rename to cores/arduino/api/RingBuffer.cpp
diff --git a/megaavr/cores/arduino/api/RingBuffer.h b/cores/arduino/api/RingBuffer.h
similarity index 100%
rename from megaavr/cores/arduino/api/RingBuffer.h
rename to cores/arduino/api/RingBuffer.h
diff --git a/megaavr/cores/arduino/api/Server.h b/cores/arduino/api/Server.h
similarity index 100%
rename from megaavr/cores/arduino/api/Server.h
rename to cores/arduino/api/Server.h
diff --git a/megaavr/cores/arduino/api/Stream.cpp b/cores/arduino/api/Stream.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/Stream.cpp
rename to cores/arduino/api/Stream.cpp
diff --git a/megaavr/cores/arduino/api/Stream.h b/cores/arduino/api/Stream.h
similarity index 100%
rename from megaavr/cores/arduino/api/Stream.h
rename to cores/arduino/api/Stream.h
diff --git a/megaavr/cores/arduino/api/String.cpp b/cores/arduino/api/String.cpp
similarity index 100%
rename from megaavr/cores/arduino/api/String.cpp
rename to cores/arduino/api/String.cpp
diff --git a/megaavr/cores/arduino/api/String.h b/cores/arduino/api/String.h
similarity index 100%
rename from megaavr/cores/arduino/api/String.h
rename to cores/arduino/api/String.h
diff --git a/megaavr/cores/arduino/api/USBAPI.h b/cores/arduino/api/USBAPI.h
similarity index 100%
rename from megaavr/cores/arduino/api/USBAPI.h
rename to cores/arduino/api/USBAPI.h
diff --git a/megaavr/cores/arduino/api/Udp.h b/cores/arduino/api/Udp.h
similarity index 100%
rename from megaavr/cores/arduino/api/Udp.h
rename to cores/arduino/api/Udp.h
diff --git a/megaavr/cores/arduino/api/Udp.h.orig b/cores/arduino/api/Udp.h.orig
similarity index 100%
rename from megaavr/cores/arduino/api/Udp.h.orig
rename to cores/arduino/api/Udp.h.orig
diff --git a/megaavr/cores/arduino/api/WCharacter.h b/cores/arduino/api/WCharacter.h
similarity index 100%
rename from megaavr/cores/arduino/api/WCharacter.h
rename to cores/arduino/api/WCharacter.h
diff --git a/megaavr/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.c.impl b/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.c.impl
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.c.impl
rename to cores/arduino/api/deprecated-avr-comp/avr/dtostrf.c.impl
diff --git a/megaavr/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.h b/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated-avr-comp/avr/dtostrf.h
rename to cores/arduino/api/deprecated-avr-comp/avr/dtostrf.h
diff --git a/megaavr/cores/arduino/api/deprecated-avr-comp/avr/interrupt.h b/cores/arduino/api/deprecated-avr-comp/avr/interrupt.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated-avr-comp/avr/interrupt.h
rename to cores/arduino/api/deprecated-avr-comp/avr/interrupt.h
diff --git a/megaavr/cores/arduino/api/deprecated-avr-comp/avr/pgmspace.h b/cores/arduino/api/deprecated-avr-comp/avr/pgmspace.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated-avr-comp/avr/pgmspace.h
rename to cores/arduino/api/deprecated-avr-comp/avr/pgmspace.h
diff --git a/megaavr/cores/arduino/api/deprecated/Client.h b/cores/arduino/api/deprecated/Client.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Client.h
rename to cores/arduino/api/deprecated/Client.h
diff --git a/megaavr/cores/arduino/api/deprecated/IPAddress.h b/cores/arduino/api/deprecated/IPAddress.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/IPAddress.h
rename to cores/arduino/api/deprecated/IPAddress.h
diff --git a/megaavr/cores/arduino/api/deprecated/Print.h b/cores/arduino/api/deprecated/Print.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Print.h
rename to cores/arduino/api/deprecated/Print.h
diff --git a/megaavr/cores/arduino/api/deprecated/Printable.h b/cores/arduino/api/deprecated/Printable.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Printable.h
rename to cores/arduino/api/deprecated/Printable.h
diff --git a/megaavr/cores/arduino/api/deprecated/Server.h b/cores/arduino/api/deprecated/Server.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Server.h
rename to cores/arduino/api/deprecated/Server.h
diff --git a/megaavr/cores/arduino/api/deprecated/Stream.h b/cores/arduino/api/deprecated/Stream.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Stream.h
rename to cores/arduino/api/deprecated/Stream.h
diff --git a/megaavr/cores/arduino/api/deprecated/Udp.h b/cores/arduino/api/deprecated/Udp.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/Udp.h
rename to cores/arduino/api/deprecated/Udp.h
diff --git a/megaavr/cores/arduino/api/deprecated/WString.h b/cores/arduino/api/deprecated/WString.h
similarity index 100%
rename from megaavr/cores/arduino/api/deprecated/WString.h
rename to cores/arduino/api/deprecated/WString.h
diff --git a/megaavr/cores/arduino/api/itoa.h b/cores/arduino/api/itoa.h
similarity index 100%
rename from megaavr/cores/arduino/api/itoa.h
rename to cores/arduino/api/itoa.h
diff --git a/megaavr/cores/arduino/hooks.c b/cores/arduino/hooks.c
similarity index 100%
rename from megaavr/cores/arduino/hooks.c
rename to cores/arduino/hooks.c
diff --git a/megaavr/cores/arduino/main.cpp b/cores/arduino/main.cpp
similarity index 100%
rename from megaavr/cores/arduino/main.cpp
rename to cores/arduino/main.cpp
diff --git a/megaavr/cores/arduino/new.cpp b/cores/arduino/new.cpp
similarity index 100%
rename from megaavr/cores/arduino/new.cpp
rename to cores/arduino/new.cpp
diff --git a/megaavr/cores/arduino/new.h b/cores/arduino/new.h
similarity index 100%
rename from megaavr/cores/arduino/new.h
rename to cores/arduino/new.h
diff --git a/megaavr/cores/arduino/timers.h b/cores/arduino/timers.h
similarity index 100%
rename from megaavr/cores/arduino/timers.h
rename to cores/arduino/timers.h
diff --git a/megaavr/cores/arduino/wiring.c b/cores/arduino/wiring.c
similarity index 100%
rename from megaavr/cores/arduino/wiring.c
rename to cores/arduino/wiring.c
diff --git a/megaavr/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
similarity index 100%
rename from megaavr/cores/arduino/wiring_analog.c
rename to cores/arduino/wiring_analog.c
diff --git a/megaavr/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
similarity index 100%
rename from megaavr/cores/arduino/wiring_digital.c
rename to cores/arduino/wiring_digital.c
diff --git a/megaavr/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h
similarity index 100%
rename from megaavr/cores/arduino/wiring_private.h
rename to cores/arduino/wiring_private.h
diff --git a/megaavr/cores/arduino/wiring_pulse.S b/cores/arduino/wiring_pulse.S
similarity index 100%
rename from megaavr/cores/arduino/wiring_pulse.S
rename to cores/arduino/wiring_pulse.S
diff --git a/megaavr/cores/arduino/wiring_pulse.c b/cores/arduino/wiring_pulse.c
similarity index 100%
rename from megaavr/cores/arduino/wiring_pulse.c
rename to cores/arduino/wiring_pulse.c
diff --git a/megaavr/cores/arduino/wiring_shift.c b/cores/arduino/wiring_shift.c
similarity index 100%
rename from megaavr/cores/arduino/wiring_shift.c
rename to cores/arduino/wiring_shift.c
diff --git a/megaavr/create_disassembler_listing.sh b/create_disassembler_listing.sh
old mode 100755
new mode 100644
similarity index 100%
rename from megaavr/create_disassembler_listing.sh
rename to create_disassembler_listing.sh
diff --git a/megaavr/delete_merged_output.bat b/delete_merged_output.bat
similarity index 100%
rename from megaavr/delete_merged_output.bat
rename to delete_merged_output.bat
diff --git a/megaavr/delete_merged_output.sh b/delete_merged_output.sh
similarity index 100%
rename from megaavr/delete_merged_output.sh
rename to delete_merged_output.sh
diff --git a/megaavr/extras/ATtiny_x02.gif b/extras/ATtiny_x02.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x02.gif
rename to extras/ATtiny_x02.gif
diff --git a/megaavr/extras/ATtiny_x02.md b/extras/ATtiny_x02.md
similarity index 100%
rename from megaavr/extras/ATtiny_x02.md
rename to extras/ATtiny_x02.md
diff --git a/megaavr/extras/ATtiny_x04.gif b/extras/ATtiny_x04.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x04.gif
rename to extras/ATtiny_x04.gif
diff --git a/megaavr/extras/ATtiny_x04.md b/extras/ATtiny_x04.md
similarity index 100%
rename from megaavr/extras/ATtiny_x04.md
rename to extras/ATtiny_x04.md
diff --git a/megaavr/extras/ATtiny_x06.gif b/extras/ATtiny_x06.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x06.gif
rename to extras/ATtiny_x06.gif
diff --git a/megaavr/extras/ATtiny_x06.md b/extras/ATtiny_x06.md
similarity index 100%
rename from megaavr/extras/ATtiny_x06.md
rename to extras/ATtiny_x06.md
diff --git a/megaavr/extras/ATtiny_x07.gif b/extras/ATtiny_x07.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x07.gif
rename to extras/ATtiny_x07.gif
diff --git a/megaavr/extras/ATtiny_x07.md b/extras/ATtiny_x07.md
similarity index 100%
rename from megaavr/extras/ATtiny_x07.md
rename to extras/ATtiny_x07.md
diff --git a/megaavr/extras/ATtiny_x12.gif b/extras/ATtiny_x12.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x12.gif
rename to extras/ATtiny_x12.gif
diff --git a/megaavr/extras/ATtiny_x12.md b/extras/ATtiny_x12.md
similarity index 100%
rename from megaavr/extras/ATtiny_x12.md
rename to extras/ATtiny_x12.md
diff --git a/megaavr/extras/ATtiny_x14.gif b/extras/ATtiny_x14.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x14.gif
rename to extras/ATtiny_x14.gif
diff --git a/megaavr/extras/ATtiny_x14.md b/extras/ATtiny_x14.md
similarity index 100%
rename from megaavr/extras/ATtiny_x14.md
rename to extras/ATtiny_x14.md
diff --git a/megaavr/extras/ATtiny_x16.gif b/extras/ATtiny_x16.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x16.gif
rename to extras/ATtiny_x16.gif
diff --git a/megaavr/extras/ATtiny_x16.md b/extras/ATtiny_x16.md
similarity index 100%
rename from megaavr/extras/ATtiny_x16.md
rename to extras/ATtiny_x16.md
diff --git a/megaavr/extras/ATtiny_x17.gif b/extras/ATtiny_x17.gif
similarity index 100%
rename from megaavr/extras/ATtiny_x17.gif
rename to extras/ATtiny_x17.gif
diff --git a/megaavr/extras/ATtiny_x17.md b/extras/ATtiny_x17.md
similarity index 100%
rename from megaavr/extras/ATtiny_x17.md
rename to extras/ATtiny_x17.md
diff --git a/megaavr/extras/DevConfigUPDI.png b/extras/DevConfigUPDI.png
similarity index 100%
rename from megaavr/extras/DevConfigUPDI.png
rename to extras/DevConfigUPDI.png
diff --git a/megaavr/extras/DirectPortManipulation.md b/extras/DirectPortManipulation.md
similarity index 100%
rename from megaavr/extras/DirectPortManipulation.md
rename to extras/DirectPortManipulation.md
diff --git a/megaavr/extras/ImportantInfo.md b/extras/ImportantInfo.md
similarity index 100%
rename from megaavr/extras/ImportantInfo.md
rename to extras/ImportantInfo.md
diff --git a/megaavr/extras/InteruptVectorNames.md b/extras/InteruptVectorNames.md
similarity index 100%
rename from megaavr/extras/InteruptVectorNames.md
rename to extras/InteruptVectorNames.md
diff --git a/megaavr/extras/MinimalConnectionsUPDI.png b/extras/MinimalConnectionsUPDI.png
similarity index 100%
rename from megaavr/extras/MinimalConnectionsUPDI.png
rename to extras/MinimalConnectionsUPDI.png
diff --git a/megaavr/extras/NanoAsUPDI.png b/extras/NanoAsUPDI.png
similarity index 100%
rename from megaavr/extras/NanoAsUPDI.png
rename to extras/NanoAsUPDI.png
diff --git a/megaavr/extras/NotesOnPeripherals.md b/extras/NotesOnPeripherals.md
similarity index 100%
rename from megaavr/extras/NotesOnPeripherals.md
rename to extras/NotesOnPeripherals.md
diff --git a/megaavr/extras/PWMandTimers.md b/extras/PWMandTimers.md
similarity index 100%
rename from megaavr/extras/PWMandTimers.md
rename to extras/PWMandTimers.md
diff --git a/megaavr/extras/Performance.md b/extras/Performance.md
similarity index 100%
rename from megaavr/extras/Performance.md
rename to extras/Performance.md
diff --git a/megaavr/extras/PinInterrupts.md b/extras/PinInterrupts.md
similarity index 100%
rename from megaavr/extras/PinInterrupts.md
rename to extras/PinInterrupts.md
diff --git a/megaavr/extras/PowerSave.md b/extras/PowerSave.md
similarity index 100%
rename from megaavr/extras/PowerSave.md
rename to extras/PowerSave.md
diff --git a/megaavr/extras/ProMiniAsUPDI.png b/extras/ProMiniAsUPDI.png
similarity index 100%
rename from megaavr/extras/ProMiniAsUPDI.png
rename to extras/ProMiniAsUPDI.png
diff --git a/megaavr/extras/TakingOverTCA0.md b/extras/TakingOverTCA0.md
similarity index 100%
rename from megaavr/extras/TakingOverTCA0.md
rename to extras/TakingOverTCA0.md
diff --git a/megaavr/extras/tinyNeoPixel.md b/extras/tinyNeoPixel.md
similarity index 100%
rename from megaavr/extras/tinyNeoPixel.md
rename to extras/tinyNeoPixel.md
diff --git a/megaavr/libraries/EEPROM/README.md b/libraries/EEPROM/README.md
similarity index 100%
rename from megaavr/libraries/EEPROM/README.md
rename to libraries/EEPROM/README.md
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino b/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
rename to libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino b/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
rename to libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino b/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
rename to libraries/EEPROM/examples/eeprom_get/eeprom_get.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino b/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
rename to libraries/EEPROM/examples/eeprom_iteration/eeprom_iteration.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino b/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
rename to libraries/EEPROM/examples/eeprom_put/eeprom_put.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino b/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
rename to libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino b/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
rename to libraries/EEPROM/examples/eeprom_update/eeprom_update.ino
diff --git a/megaavr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino b/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
similarity index 100%
rename from megaavr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
rename to libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
diff --git a/megaavr/libraries/EEPROM/keywords.txt b/libraries/EEPROM/keywords.txt
similarity index 100%
rename from megaavr/libraries/EEPROM/keywords.txt
rename to libraries/EEPROM/keywords.txt
diff --git a/megaavr/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
similarity index 100%
rename from megaavr/libraries/EEPROM/library.properties
rename to libraries/EEPROM/library.properties
diff --git a/megaavr/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
similarity index 100%
rename from megaavr/libraries/EEPROM/src/EEPROM.h
rename to libraries/EEPROM/src/EEPROM.h
diff --git a/megaavr/libraries/Logic/README.md b/libraries/Logic/README.md
similarity index 100%
rename from megaavr/libraries/Logic/README.md
rename to libraries/Logic/README.md
diff --git a/megaavr/libraries/Logic/examples/Five_input_NOR/Five_input_NOR.ino b/libraries/Logic/examples/Five_input_NOR/Five_input_NOR.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Five_input_NOR/Five_input_NOR.ino
rename to libraries/Logic/examples/Five_input_NOR/Five_input_NOR.ino
diff --git a/megaavr/libraries/Logic/examples/Interrupt/Interrupt.ino b/libraries/Logic/examples/Interrupt/Interrupt.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Interrupt/Interrupt.ino
rename to libraries/Logic/examples/Interrupt/Interrupt.ino
diff --git a/megaavr/libraries/Logic/examples/Three_input_AND/Three_input_AND.ino b/libraries/Logic/examples/Three_input_AND/Three_input_AND.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Three_input_AND/Three_input_AND.ino
rename to libraries/Logic/examples/Three_input_AND/Three_input_AND.ino
diff --git a/megaavr/libraries/Logic/examples/Three_input_NAND/Three_input_NAND.ino b/libraries/Logic/examples/Three_input_NAND/Three_input_NAND.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Three_input_NAND/Three_input_NAND.ino
rename to libraries/Logic/examples/Three_input_NAND/Three_input_NAND.ino
diff --git a/megaavr/libraries/Logic/examples/Three_input_OR/Three_input_OR.ino b/libraries/Logic/examples/Three_input_OR/Three_input_OR.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Three_input_OR/Three_input_OR.ino
rename to libraries/Logic/examples/Three_input_OR/Three_input_OR.ino
diff --git a/megaavr/libraries/Logic/examples/Two_input_AND/Two_input_AND.ino b/libraries/Logic/examples/Two_input_AND/Two_input_AND.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Two_input_AND/Two_input_AND.ino
rename to libraries/Logic/examples/Two_input_AND/Two_input_AND.ino
diff --git a/megaavr/libraries/Logic/examples/Two_input_NAND/Two_input_NAND.ino b/libraries/Logic/examples/Two_input_NAND/Two_input_NAND.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Two_input_NAND/Two_input_NAND.ino
rename to libraries/Logic/examples/Two_input_NAND/Two_input_NAND.ino
diff --git a/megaavr/libraries/Logic/examples/Two_input_OR/Two_input_OR.ino b/libraries/Logic/examples/Two_input_OR/Two_input_OR.ino
similarity index 100%
rename from megaavr/libraries/Logic/examples/Two_input_OR/Two_input_OR.ino
rename to libraries/Logic/examples/Two_input_OR/Two_input_OR.ino
diff --git a/megaavr/libraries/Logic/keywords.txt b/libraries/Logic/keywords.txt
similarity index 100%
rename from megaavr/libraries/Logic/keywords.txt
rename to libraries/Logic/keywords.txt
diff --git a/megaavr/libraries/Logic/library.properties b/libraries/Logic/library.properties
similarity index 100%
rename from megaavr/libraries/Logic/library.properties
rename to libraries/Logic/library.properties
diff --git a/megaavr/libraries/Logic/src/Logic.cpp b/libraries/Logic/src/Logic.cpp
similarity index 100%
rename from megaavr/libraries/Logic/src/Logic.cpp
rename to libraries/Logic/src/Logic.cpp
diff --git a/megaavr/libraries/Logic/src/Logic.h b/libraries/Logic/src/Logic.h
similarity index 100%
rename from megaavr/libraries/Logic/src/Logic.h
rename to libraries/Logic/src/Logic.h
diff --git a/megaavr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino b/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
similarity index 100%
rename from megaavr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
rename to libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
diff --git a/megaavr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
similarity index 100%
rename from megaavr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
rename to libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
diff --git a/megaavr/libraries/SPI/keywords.txt b/libraries/SPI/keywords.txt
similarity index 100%
rename from megaavr/libraries/SPI/keywords.txt
rename to libraries/SPI/keywords.txt
diff --git a/megaavr/libraries/SPI/library.properties b/libraries/SPI/library.properties
similarity index 100%
rename from megaavr/libraries/SPI/library.properties
rename to libraries/SPI/library.properties
diff --git a/megaavr/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp
similarity index 100%
rename from megaavr/libraries/SPI/src/SPI.cpp
rename to libraries/SPI/src/SPI.cpp
diff --git a/megaavr/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
similarity index 100%
rename from megaavr/libraries/SPI/src/SPI.h
rename to libraries/SPI/src/SPI.h
diff --git a/megaavr/libraries/Servo/examples/Knob/Knob.ino b/libraries/Servo/examples/Knob/Knob.ino
similarity index 100%
rename from megaavr/libraries/Servo/examples/Knob/Knob.ino
rename to libraries/Servo/examples/Knob/Knob.ino
diff --git a/megaavr/libraries/Servo/examples/ServoMaxTest/ServoMaxTest.ino b/libraries/Servo/examples/ServoMaxTest/ServoMaxTest.ino
similarity index 100%
rename from megaavr/libraries/Servo/examples/ServoMaxTest/ServoMaxTest.ino
rename to libraries/Servo/examples/ServoMaxTest/ServoMaxTest.ino
diff --git a/megaavr/libraries/Servo/examples/Sweep/Sweep.ino b/libraries/Servo/examples/Sweep/Sweep.ino
similarity index 100%
rename from megaavr/libraries/Servo/examples/Sweep/Sweep.ino
rename to libraries/Servo/examples/Sweep/Sweep.ino
diff --git a/megaavr/libraries/Servo/keywords.txt b/libraries/Servo/keywords.txt
similarity index 100%
rename from megaavr/libraries/Servo/keywords.txt
rename to libraries/Servo/keywords.txt
diff --git a/megaavr/libraries/Servo/library.properties b/libraries/Servo/library.properties
similarity index 100%
rename from megaavr/libraries/Servo/library.properties
rename to libraries/Servo/library.properties
diff --git a/megaavr/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h
similarity index 100%
rename from megaavr/libraries/Servo/src/Servo.h
rename to libraries/Servo/src/Servo.h
diff --git a/megaavr/libraries/Servo/src/megaavr/Servo.cpp b/libraries/Servo/src/megaavr/Servo.cpp
similarity index 100%
rename from megaavr/libraries/Servo/src/megaavr/Servo.cpp
rename to libraries/Servo/src/megaavr/Servo.cpp
diff --git a/megaavr/libraries/Servo/src/megaavr/ServoTimers.h b/libraries/Servo/src/megaavr/ServoTimers.h
similarity index 100%
rename from megaavr/libraries/Servo/src/megaavr/ServoTimers.h
rename to libraries/Servo/src/megaavr/ServoTimers.h
diff --git a/megaavr/libraries/Servo_megaTinyCore/examples/Knob/Knob.ino b/libraries/Servo_megaTinyCore/examples/Knob/Knob.ino
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/examples/Knob/Knob.ino
rename to libraries/Servo_megaTinyCore/examples/Knob/Knob.ino
diff --git a/megaavr/libraries/Servo_megaTinyCore/examples/ServoMaxTest/ServoMaxTest.ino b/libraries/Servo_megaTinyCore/examples/ServoMaxTest/ServoMaxTest.ino
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/examples/ServoMaxTest/ServoMaxTest.ino
rename to libraries/Servo_megaTinyCore/examples/ServoMaxTest/ServoMaxTest.ino
diff --git a/megaavr/libraries/Servo_megaTinyCore/examples/Sweep/Sweep.ino b/libraries/Servo_megaTinyCore/examples/Sweep/Sweep.ino
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/examples/Sweep/Sweep.ino
rename to libraries/Servo_megaTinyCore/examples/Sweep/Sweep.ino
diff --git a/megaavr/libraries/Servo_megaTinyCore/keywords.txt b/libraries/Servo_megaTinyCore/keywords.txt
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/keywords.txt
rename to libraries/Servo_megaTinyCore/keywords.txt
diff --git a/megaavr/libraries/Servo_megaTinyCore/library.properties b/libraries/Servo_megaTinyCore/library.properties
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/library.properties
rename to libraries/Servo_megaTinyCore/library.properties
diff --git a/megaavr/libraries/Servo_megaTinyCore/src/Servo_megaTinyCore.h b/libraries/Servo_megaTinyCore/src/Servo_megaTinyCore.h
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/src/Servo_megaTinyCore.h
rename to libraries/Servo_megaTinyCore/src/Servo_megaTinyCore.h
diff --git a/megaavr/libraries/Servo_megaTinyCore/src/megaavr/ServoTimers.h b/libraries/Servo_megaTinyCore/src/megaavr/ServoTimers.h
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/src/megaavr/ServoTimers.h
rename to libraries/Servo_megaTinyCore/src/megaavr/ServoTimers.h
diff --git a/megaavr/libraries/Servo_megaTinyCore/src/megaavr/Servo_megaTinyCore.cpp b/libraries/Servo_megaTinyCore/src/megaavr/Servo_megaTinyCore.cpp
similarity index 100%
rename from megaavr/libraries/Servo_megaTinyCore/src/megaavr/Servo_megaTinyCore.cpp
rename to libraries/Servo_megaTinyCore/src/megaavr/Servo_megaTinyCore.cpp
diff --git a/megaavr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
rename to libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
diff --git a/megaavr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino b/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
rename to libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
diff --git a/megaavr/libraries/SoftwareSerial/keywords.txt b/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/keywords.txt
rename to libraries/SoftwareSerial/keywords.txt
diff --git a/megaavr/libraries/SoftwareSerial/library.properties b/libraries/SoftwareSerial/library.properties
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/library.properties
rename to libraries/SoftwareSerial/library.properties
diff --git a/megaavr/libraries/SoftwareSerial/src/SoftwareSerial.cpp b/libraries/SoftwareSerial/src/SoftwareSerial.cpp
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/src/SoftwareSerial.cpp
rename to libraries/SoftwareSerial/src/SoftwareSerial.cpp
diff --git a/megaavr/libraries/SoftwareSerial/src/SoftwareSerial.h b/libraries/SoftwareSerial/src/SoftwareSerial.h
similarity index 100%
rename from megaavr/libraries/SoftwareSerial/src/SoftwareSerial.h
rename to libraries/SoftwareSerial/src/SoftwareSerial.h
diff --git a/megaavr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino b/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
rename to libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
diff --git a/megaavr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino b/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
rename to libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
diff --git a/megaavr/libraries/Wire/examples/master_reader/master_reader.ino b/libraries/Wire/examples/master_reader/master_reader.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/master_reader/master_reader.ino
rename to libraries/Wire/examples/master_reader/master_reader.ino
diff --git a/megaavr/libraries/Wire/examples/master_writer/master_writer.ino b/libraries/Wire/examples/master_writer/master_writer.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/master_writer/master_writer.ino
rename to libraries/Wire/examples/master_writer/master_writer.ino
diff --git a/megaavr/libraries/Wire/examples/slave_receiver/slave_receiver.ino b/libraries/Wire/examples/slave_receiver/slave_receiver.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/slave_receiver/slave_receiver.ino
rename to libraries/Wire/examples/slave_receiver/slave_receiver.ino
diff --git a/megaavr/libraries/Wire/examples/slave_sender/slave_sender.ino b/libraries/Wire/examples/slave_sender/slave_sender.ino
similarity index 100%
rename from megaavr/libraries/Wire/examples/slave_sender/slave_sender.ino
rename to libraries/Wire/examples/slave_sender/slave_sender.ino
diff --git a/megaavr/libraries/Wire/keywords.txt b/libraries/Wire/keywords.txt
similarity index 100%
rename from megaavr/libraries/Wire/keywords.txt
rename to libraries/Wire/keywords.txt
diff --git a/megaavr/libraries/Wire/library.properties b/libraries/Wire/library.properties
similarity index 100%
rename from megaavr/libraries/Wire/library.properties
rename to libraries/Wire/library.properties
diff --git a/megaavr/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
similarity index 100%
rename from megaavr/libraries/Wire/src/Wire.cpp
rename to libraries/Wire/src/Wire.cpp
diff --git a/megaavr/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
similarity index 100%
rename from megaavr/libraries/Wire/src/Wire.h
rename to libraries/Wire/src/Wire.h
diff --git a/megaavr/libraries/Wire/src/utility/twi.c b/libraries/Wire/src/utility/twi.c
similarity index 100%
rename from megaavr/libraries/Wire/src/utility/twi.c
rename to libraries/Wire/src/utility/twi.c
diff --git a/megaavr/libraries/Wire/src/utility/twi.h b/libraries/Wire/src/utility/twi.h
similarity index 100%
rename from megaavr/libraries/Wire/src/utility/twi.h
rename to libraries/Wire/src/utility/twi.h
diff --git a/megaavr/libraries/megaTinyCore/examples/TCA0Demo/TCA0Demo.ino b/libraries/megaTinyCore/examples/TCA0Demo/TCA0Demo.ino
similarity index 100%
rename from megaavr/libraries/megaTinyCore/examples/TCA0Demo/TCA0Demo.ino
rename to libraries/megaTinyCore/examples/TCA0Demo/TCA0Demo.ino
diff --git a/megaavr/libraries/megaTinyCore/examples/TCA0Demo2/TCA0Demo2.ino b/libraries/megaTinyCore/examples/TCA0Demo2/TCA0Demo2.ino
similarity index 100%
rename from megaavr/libraries/megaTinyCore/examples/TCA0Demo2/TCA0Demo2.ino
rename to libraries/megaTinyCore/examples/TCA0Demo2/TCA0Demo2.ino
diff --git a/megaavr/libraries/megaTinyCore/examples/TCA0Demo3/TCA0Demo3.ino b/libraries/megaTinyCore/examples/TCA0Demo3/TCA0Demo3.ino
similarity index 100%
rename from megaavr/libraries/megaTinyCore/examples/TCA0Demo3/TCA0Demo3.ino
rename to libraries/megaTinyCore/examples/TCA0Demo3/TCA0Demo3.ino
diff --git a/megaavr/libraries/megaTinyCore/examples/TCA0Demo4/TCA0Demo4.ino b/libraries/megaTinyCore/examples/TCA0Demo4/TCA0Demo4.ino
similarity index 100%
rename from megaavr/libraries/megaTinyCore/examples/TCA0Demo4/TCA0Demo4.ino
rename to libraries/megaTinyCore/examples/TCA0Demo4/TCA0Demo4.ino
diff --git a/megaavr/libraries/megaTinyCore/examples/readTempVcc/readTempVcc.ino b/libraries/megaTinyCore/examples/readTempVcc/readTempVcc.ino
similarity index 100%
rename from megaavr/libraries/megaTinyCore/examples/readTempVcc/readTempVcc.ino
rename to libraries/megaTinyCore/examples/readTempVcc/readTempVcc.ino
diff --git a/megaavr/libraries/megaTinyCore/library.properties b/libraries/megaTinyCore/library.properties
similarity index 100%
rename from megaavr/libraries/megaTinyCore/library.properties
rename to libraries/megaTinyCore/library.properties
diff --git a/megaavr/libraries/megaTinyCore/src/megaTinyCore.h b/libraries/megaTinyCore/src/megaTinyCore.h
similarity index 100%
rename from megaavr/libraries/megaTinyCore/src/megaTinyCore.h
rename to libraries/megaTinyCore/src/megaTinyCore.h
diff --git a/megaavr/libraries/tinyNeoPixel/COPYING b/libraries/tinyNeoPixel/COPYING
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/COPYING
rename to libraries/tinyNeoPixel/COPYING
diff --git a/megaavr/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino b/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
rename to libraries/tinyNeoPixel/examples/RGBWstrandtest/RGBWstrandtest.ino
diff --git a/megaavr/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino b/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
rename to libraries/tinyNeoPixel/examples/buttoncycler/buttoncycler.ino
diff --git a/megaavr/libraries/tinyNeoPixel/examples/simple/simple.ino b/libraries/tinyNeoPixel/examples/simple/simple.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/examples/simple/simple.ino
rename to libraries/tinyNeoPixel/examples/simple/simple.ino
diff --git a/megaavr/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino b/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
rename to libraries/tinyNeoPixel/examples/strandtest/strandtest.ino
diff --git a/megaavr/libraries/tinyNeoPixel/keywords.txt b/libraries/tinyNeoPixel/keywords.txt
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/keywords.txt
rename to libraries/tinyNeoPixel/keywords.txt
diff --git a/megaavr/libraries/tinyNeoPixel/library.properties b/libraries/tinyNeoPixel/library.properties
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/library.properties
rename to libraries/tinyNeoPixel/library.properties
diff --git a/megaavr/libraries/tinyNeoPixel/tinyNeoPixel.cpp b/libraries/tinyNeoPixel/tinyNeoPixel.cpp
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/tinyNeoPixel.cpp
rename to libraries/tinyNeoPixel/tinyNeoPixel.cpp
diff --git a/megaavr/libraries/tinyNeoPixel/tinyNeoPixel.h b/libraries/tinyNeoPixel/tinyNeoPixel.h
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel/tinyNeoPixel.h
rename to libraries/tinyNeoPixel/tinyNeoPixel.h
diff --git a/megaavr/libraries/tinyNeoPixel_Static/COPYING b/libraries/tinyNeoPixel_Static/COPYING
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/COPYING
rename to libraries/tinyNeoPixel_Static/COPYING
diff --git a/megaavr/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino b/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
rename to libraries/tinyNeoPixel_Static/examples/buttoncycler/buttoncycler.ino
diff --git a/megaavr/libraries/tinyNeoPixel_Static/examples/simple/simple.ino b/libraries/tinyNeoPixel_Static/examples/simple/simple.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/examples/simple/simple.ino
rename to libraries/tinyNeoPixel_Static/examples/simple/simple.ino
diff --git a/megaavr/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino b/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
rename to libraries/tinyNeoPixel_Static/examples/strandtest/strandtest.ino
diff --git a/megaavr/libraries/tinyNeoPixel_Static/keywords.txt b/libraries/tinyNeoPixel_Static/keywords.txt
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/keywords.txt
rename to libraries/tinyNeoPixel_Static/keywords.txt
diff --git a/megaavr/libraries/tinyNeoPixel_Static/library.properties b/libraries/tinyNeoPixel_Static/library.properties
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/library.properties
rename to libraries/tinyNeoPixel_Static/library.properties
diff --git a/megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp b/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
rename to libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp
diff --git a/megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h b/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
similarity index 100%
rename from megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
rename to libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h
diff --git a/megaavr/platform.txt b/platform.txt
similarity index 100%
rename from megaavr/platform.txt
rename to platform.txt
diff --git a/megaavr/programmers.txt b/programmers.txt
similarity index 100%
rename from megaavr/programmers.txt
rename to programmers.txt
diff --git a/megaavr/variants/txy2/pins_arduino.h b/variants/txy2/pins_arduino.h
similarity index 100%
rename from megaavr/variants/txy2/pins_arduino.h
rename to variants/txy2/pins_arduino.h
diff --git a/megaavr/variants/txy4/pins_arduino.h b/variants/txy4/pins_arduino.h
similarity index 100%
rename from megaavr/variants/txy4/pins_arduino.h
rename to variants/txy4/pins_arduino.h
diff --git a/megaavr/variants/txy6/pins_arduino.h b/variants/txy6/pins_arduino.h
similarity index 100%
rename from megaavr/variants/txy6/pins_arduino.h
rename to variants/txy6/pins_arduino.h
diff --git a/megaavr/variants/txy7/pins_arduino.h b/variants/txy7/pins_arduino.h
similarity index 100%
rename from megaavr/variants/txy7/pins_arduino.h
rename to variants/txy7/pins_arduino.h