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/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
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/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/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/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/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/txy2/variant.c b/variants/txy2/variant.c
similarity index 100%
rename from megaavr/variants/txy2/variant.c
rename to variants/txy2/variant.c
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/txy4/variant.c b/variants/txy4/variant.c
similarity index 100%
rename from megaavr/variants/txy4/variant.c
rename to variants/txy4/variant.c
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/txy6/variant.c b/variants/txy6/variant.c
similarity index 100%
rename from megaavr/variants/txy6/variant.c
rename to variants/txy6/variant.c
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
diff --git a/megaavr/variants/txy7/variant.c b/variants/txy7/variant.c
similarity index 100%
rename from megaavr/variants/txy7/variant.c
rename to variants/txy7/variant.c