diff --git a/hardware/arduino/boards.txt b/hardware/avr/boards.txt
similarity index 100%
rename from hardware/arduino/boards.txt
rename to hardware/avr/boards.txt
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
diff --git a/hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex b/hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
rename to hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
diff --git a/hardware/arduino/bootloaders/atmega/Makefile b/hardware/avr/bootloaders/atmega/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/atmega/Makefile
rename to hardware/avr/bootloaders/atmega/Makefile
diff --git a/hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c b/hardware/avr/bootloaders/atmega8/ATmegaBOOT.c
similarity index 100%
rename from hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c
rename to hardware/avr/bootloaders/atmega8/ATmegaBOOT.c
diff --git a/hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex b/hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex
similarity index 100%
rename from hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex
rename to hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex
diff --git a/hardware/arduino/bootloaders/atmega8/Makefile b/hardware/avr/bootloaders/atmega8/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/atmega8/Makefile
rename to hardware/avr/bootloaders/atmega8/Makefile
diff --git a/hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c b/hardware/avr/bootloaders/bt/ATmegaBOOT_168.c
similarity index 100%
rename from hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c
rename to hardware/avr/bootloaders/bt/ATmegaBOOT_168.c
diff --git a/hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex b/hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex
similarity index 100%
rename from hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex
rename to hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex
diff --git a/hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex b/hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
similarity index 100%
rename from hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
rename to hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
diff --git a/hardware/arduino/bootloaders/bt/Makefile b/hardware/avr/bootloaders/bt/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/bt/Makefile
rename to hardware/avr/bootloaders/bt/Makefile
diff --git a/hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex b/hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
similarity index 100%
rename from hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex
rename to hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
diff --git a/hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c b/hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c
similarity index 100%
rename from hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c
rename to hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c
diff --git a/hardware/arduino/bootloaders/lilypad/src/Makefile b/hardware/avr/bootloaders/lilypad/src/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/lilypad/src/Makefile
rename to hardware/avr/bootloaders/lilypad/src/Makefile
diff --git a/hardware/arduino/bootloaders/optiboot/Makefile b/hardware/avr/bootloaders/optiboot/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/Makefile
rename to hardware/avr/bootloaders/optiboot/Makefile
diff --git a/hardware/arduino/bootloaders/optiboot/makeall b/hardware/avr/bootloaders/optiboot/makeall
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/makeall
rename to hardware/avr/bootloaders/optiboot/makeall
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot.c b/hardware/avr/bootloaders/optiboot/optiboot.c
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot.c
rename to hardware/avr/bootloaders/optiboot/optiboot.c
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex b/hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst b/hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex b/hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst b/hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_diecimila.hex b/hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_diecimila.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_diecimila.lst b/hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_diecimila.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_lilypad.hex b/hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_lilypad.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_lilypad.lst b/hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_lilypad.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.hex b/hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.lst b/hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_luminet.hex b/hardware/avr/bootloaders/optiboot/optiboot_luminet.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_luminet.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_luminet.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_luminet.lst b/hardware/avr/bootloaders/optiboot/optiboot_luminet.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_luminet.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_luminet.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.hex b/hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.lst b/hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.hex b/hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.lst b/hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.hex b/hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.hex
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex
diff --git a/hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.lst b/hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst
similarity index 100%
rename from hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.lst
rename to hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst
diff --git a/hardware/arduino/bootloaders/stk500v2/License.txt b/hardware/avr/bootloaders/stk500v2/License.txt
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/License.txt
rename to hardware/avr/bootloaders/stk500v2/License.txt
diff --git a/hardware/arduino/bootloaders/stk500v2/Makefile b/hardware/avr/bootloaders/stk500v2/Makefile
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/Makefile
rename to hardware/avr/bootloaders/stk500v2/Makefile
diff --git a/hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj b/hardware/avr/bootloaders/stk500v2/STK500V2.pnproj
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj
rename to hardware/avr/bootloaders/stk500v2/STK500V2.pnproj
diff --git a/hardware/arduino/bootloaders/stk500v2/STK500V2.pnps b/hardware/avr/bootloaders/stk500v2/STK500V2.pnps
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/STK500V2.pnps
rename to hardware/avr/bootloaders/stk500v2/STK500V2.pnps
diff --git a/hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h b/hardware/avr/bootloaders/stk500v2/avrinterruptnames.h
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h
rename to hardware/avr/bootloaders/stk500v2/avrinterruptnames.h
diff --git a/hardware/arduino/bootloaders/stk500v2/command.h b/hardware/avr/bootloaders/stk500v2/command.h
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/command.h
rename to hardware/avr/bootloaders/stk500v2/command.h
diff --git a/hardware/arduino/bootloaders/stk500v2/stk500boot.c b/hardware/avr/bootloaders/stk500v2/stk500boot.c
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/stk500boot.c
rename to hardware/avr/bootloaders/stk500v2/stk500boot.c
diff --git a/hardware/arduino/bootloaders/stk500v2/stk500boot.ppg b/hardware/avr/bootloaders/stk500v2/stk500boot.ppg
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/stk500boot.ppg
rename to hardware/avr/bootloaders/stk500v2/stk500boot.ppg
diff --git a/hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex b/hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
similarity index 100%
rename from hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
rename to hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
diff --git a/hardware/arduino/cores/arduino/Arduino.h b/hardware/avr/cores/arduino/Arduino.h
similarity index 100%
rename from hardware/arduino/cores/arduino/Arduino.h
rename to hardware/avr/cores/arduino/Arduino.h
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.cpp b/hardware/avr/cores/arduino/HardwareSerial.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/HardwareSerial.cpp
rename to hardware/avr/cores/arduino/HardwareSerial.cpp
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.h b/hardware/avr/cores/arduino/HardwareSerial.h
similarity index 100%
rename from hardware/arduino/cores/arduino/HardwareSerial.h
rename to hardware/avr/cores/arduino/HardwareSerial.h
diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/avr/cores/arduino/Print.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/Print.cpp
rename to hardware/avr/cores/arduino/Print.cpp
diff --git a/hardware/arduino/cores/arduino/Print.h b/hardware/avr/cores/arduino/Print.h
similarity index 100%
rename from hardware/arduino/cores/arduino/Print.h
rename to hardware/avr/cores/arduino/Print.h
diff --git a/hardware/arduino/cores/arduino/Stream.h b/hardware/avr/cores/arduino/Stream.h
similarity index 100%
rename from hardware/arduino/cores/arduino/Stream.h
rename to hardware/avr/cores/arduino/Stream.h
diff --git a/hardware/arduino/cores/arduino/Tone.cpp b/hardware/avr/cores/arduino/Tone.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/Tone.cpp
rename to hardware/avr/cores/arduino/Tone.cpp
diff --git a/hardware/arduino/cores/arduino/WCharacter.h b/hardware/avr/cores/arduino/WCharacter.h
similarity index 100%
rename from hardware/arduino/cores/arduino/WCharacter.h
rename to hardware/avr/cores/arduino/WCharacter.h
diff --git a/hardware/arduino/cores/arduino/WInterrupts.c b/hardware/avr/cores/arduino/WInterrupts.c
similarity index 100%
rename from hardware/arduino/cores/arduino/WInterrupts.c
rename to hardware/avr/cores/arduino/WInterrupts.c
diff --git a/hardware/arduino/cores/arduino/WMath.cpp b/hardware/avr/cores/arduino/WMath.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/WMath.cpp
rename to hardware/avr/cores/arduino/WMath.cpp
diff --git a/hardware/arduino/cores/arduino/WString.cpp b/hardware/avr/cores/arduino/WString.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/WString.cpp
rename to hardware/avr/cores/arduino/WString.cpp
diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/avr/cores/arduino/WString.h
similarity index 100%
rename from hardware/arduino/cores/arduino/WString.h
rename to hardware/avr/cores/arduino/WString.h
diff --git a/hardware/arduino/cores/arduino/binary.h b/hardware/avr/cores/arduino/binary.h
similarity index 100%
rename from hardware/arduino/cores/arduino/binary.h
rename to hardware/avr/cores/arduino/binary.h
diff --git a/hardware/arduino/cores/arduino/main.cpp b/hardware/avr/cores/arduino/main.cpp
similarity index 100%
rename from hardware/arduino/cores/arduino/main.cpp
rename to hardware/avr/cores/arduino/main.cpp
diff --git a/hardware/arduino/cores/arduino/wiring.c b/hardware/avr/cores/arduino/wiring.c
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring.c
rename to hardware/avr/cores/arduino/wiring.c
diff --git a/hardware/arduino/cores/arduino/wiring_analog.c b/hardware/avr/cores/arduino/wiring_analog.c
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring_analog.c
rename to hardware/avr/cores/arduino/wiring_analog.c
diff --git a/hardware/arduino/cores/arduino/wiring_digital.c b/hardware/avr/cores/arduino/wiring_digital.c
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring_digital.c
rename to hardware/avr/cores/arduino/wiring_digital.c
diff --git a/hardware/arduino/cores/arduino/wiring_private.h b/hardware/avr/cores/arduino/wiring_private.h
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring_private.h
rename to hardware/avr/cores/arduino/wiring_private.h
diff --git a/hardware/arduino/cores/arduino/wiring_pulse.c b/hardware/avr/cores/arduino/wiring_pulse.c
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring_pulse.c
rename to hardware/avr/cores/arduino/wiring_pulse.c
diff --git a/hardware/arduino/cores/arduino/wiring_shift.c b/hardware/avr/cores/arduino/wiring_shift.c
similarity index 100%
rename from hardware/arduino/cores/arduino/wiring_shift.c
rename to hardware/avr/cores/arduino/wiring_shift.c
diff --git a/hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex b/hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
similarity index 100%
rename from hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex
rename to hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
diff --git a/hardware/arduino/firmwares/README.txt b/hardware/avr/firmwares/README.txt
similarity index 100%
rename from hardware/arduino/firmwares/README.txt
rename to hardware/avr/firmwares/README.txt
diff --git a/hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex b/hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
similarity index 100%
rename from hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex
rename to hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c b/hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c
rename to hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h b/hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h
rename to hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h b/hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h
rename to hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c b/hardware/avr/firmwares/arduino-usbdfu/Descriptors.c
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c
rename to hardware/avr/firmwares/arduino-usbdfu/Descriptors.c
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h b/hardware/avr/firmwares/arduino-usbdfu/Descriptors.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h
rename to hardware/avr/firmwares/arduino-usbdfu/Descriptors.h
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/makefile b/hardware/avr/firmwares/arduino-usbdfu/makefile
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/makefile
rename to hardware/avr/firmwares/arduino-usbdfu/makefile
diff --git a/hardware/arduino/firmwares/arduino-usbdfu/readme.txt b/hardware/avr/firmwares/arduino-usbdfu/readme.txt
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbdfu/readme.txt
rename to hardware/avr/firmwares/arduino-usbdfu/readme.txt
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex b/hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
rename to hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex b/hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
rename to hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c b/hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c
rename to hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h b/hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h
rename to hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h b/hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h
rename to hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Descriptors.c b/hardware/avr/firmwares/arduino-usbserial/Descriptors.c
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Descriptors.c
rename to hardware/avr/firmwares/arduino-usbserial/Descriptors.c
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Descriptors.h b/hardware/avr/firmwares/arduino-usbserial/Descriptors.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Descriptors.h
rename to hardware/avr/firmwares/arduino-usbserial/Descriptors.h
diff --git a/hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h b/hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
rename to hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
diff --git a/hardware/arduino/firmwares/arduino-usbserial/makefile b/hardware/avr/firmwares/arduino-usbserial/makefile
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/makefile
rename to hardware/avr/firmwares/arduino-usbserial/makefile
diff --git a/hardware/arduino/firmwares/arduino-usbserial/readme.txt b/hardware/avr/firmwares/arduino-usbserial/readme.txt
similarity index 100%
rename from hardware/arduino/firmwares/arduino-usbserial/readme.txt
rename to hardware/avr/firmwares/arduino-usbserial/readme.txt
diff --git a/hardware/arduino/pins/mega/pins_arduino.h b/hardware/avr/pins/mega/pins_arduino.h
similarity index 100%
rename from hardware/arduino/pins/mega/pins_arduino.h
rename to hardware/avr/pins/mega/pins_arduino.h
diff --git a/hardware/arduino/pins/standard/pins_arduino.h b/hardware/avr/pins/standard/pins_arduino.h
similarity index 100%
rename from hardware/arduino/pins/standard/pins_arduino.h
rename to hardware/avr/pins/standard/pins_arduino.h
diff --git a/hardware/arduino/programmers.txt b/hardware/avr/programmers.txt
similarity index 100%
rename from hardware/arduino/programmers.txt
rename to hardware/avr/programmers.txt
diff --git a/hardware/atmel/boards.txt b/hardware/sam/boards.txt
similarity index 100%
rename from hardware/atmel/boards.txt
rename to hardware/sam/boards.txt
diff --git a/hardware/atmel/cores/sam/Arduino.h b/hardware/sam/cores/sam/Arduino.h
similarity index 100%
rename from hardware/atmel/cores/sam/Arduino.h
rename to hardware/sam/cores/sam/Arduino.h
diff --git a/hardware/atmel/cores/sam/HardwareSerial.cpp b/hardware/sam/cores/sam/HardwareSerial.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/HardwareSerial.cpp
rename to hardware/sam/cores/sam/HardwareSerial.cpp
diff --git a/hardware/atmel/cores/sam/HardwareSerial.h b/hardware/sam/cores/sam/HardwareSerial.h
similarity index 100%
rename from hardware/atmel/cores/sam/HardwareSerial.h
rename to hardware/sam/cores/sam/HardwareSerial.h
diff --git a/hardware/atmel/cores/sam/Print.cpp b/hardware/sam/cores/sam/Print.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/Print.cpp
rename to hardware/sam/cores/sam/Print.cpp
diff --git a/hardware/atmel/cores/sam/Print.h b/hardware/sam/cores/sam/Print.h
similarity index 100%
rename from hardware/atmel/cores/sam/Print.h
rename to hardware/sam/cores/sam/Print.h
diff --git a/hardware/atmel/cores/sam/Stream.h b/hardware/sam/cores/sam/Stream.h
similarity index 100%
rename from hardware/atmel/cores/sam/Stream.h
rename to hardware/sam/cores/sam/Stream.h
diff --git a/hardware/atmel/cores/sam/Tone.cpp b/hardware/sam/cores/sam/Tone.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/Tone.cpp
rename to hardware/sam/cores/sam/Tone.cpp
diff --git a/hardware/atmel/cores/sam/UART.cpp b/hardware/sam/cores/sam/UART.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/UART.cpp
rename to hardware/sam/cores/sam/UART.cpp
diff --git a/hardware/atmel/cores/sam/UART.h b/hardware/sam/cores/sam/UART.h
similarity index 100%
rename from hardware/atmel/cores/sam/UART.h
rename to hardware/sam/cores/sam/UART.h
diff --git a/hardware/atmel/cores/sam/USART.cpp b/hardware/sam/cores/sam/USART.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/USART.cpp
rename to hardware/sam/cores/sam/USART.cpp
diff --git a/hardware/atmel/cores/sam/USART.h b/hardware/sam/cores/sam/USART.h
similarity index 100%
rename from hardware/atmel/cores/sam/USART.h
rename to hardware/sam/cores/sam/USART.h
diff --git a/hardware/atmel/cores/sam/WCharacter.h b/hardware/sam/cores/sam/WCharacter.h
similarity index 100%
rename from hardware/atmel/cores/sam/WCharacter.h
rename to hardware/sam/cores/sam/WCharacter.h
diff --git a/hardware/atmel/cores/sam/WInterrupts.c b/hardware/sam/cores/sam/WInterrupts.c
similarity index 100%
rename from hardware/atmel/cores/sam/WInterrupts.c
rename to hardware/sam/cores/sam/WInterrupts.c
diff --git a/hardware/atmel/cores/sam/WMath.cpp b/hardware/sam/cores/sam/WMath.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/WMath.cpp
rename to hardware/sam/cores/sam/WMath.cpp
diff --git a/hardware/atmel/cores/sam/WString.cpp b/hardware/sam/cores/sam/WString.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/WString.cpp
rename to hardware/sam/cores/sam/WString.cpp
diff --git a/hardware/atmel/cores/sam/WString.h b/hardware/sam/cores/sam/WString.h
similarity index 100%
rename from hardware/atmel/cores/sam/WString.h
rename to hardware/sam/cores/sam/WString.h
diff --git a/hardware/atmel/cores/sam/binary.h b/hardware/sam/cores/sam/binary.h
similarity index 100%
rename from hardware/atmel/cores/sam/binary.h
rename to hardware/sam/cores/sam/binary.h
diff --git a/hardware/atmel/cores/sam/build_gcc/Makefile b/hardware/sam/cores/sam/build_gcc/Makefile
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/Makefile
rename to hardware/sam/cores/sam/build_gcc/Makefile
diff --git a/hardware/atmel/cores/sam/build_gcc/arduino_sam3s_ek.mk b/hardware/sam/cores/sam/build_gcc/arduino_sam3s_ek.mk
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/arduino_sam3s_ek.mk
rename to hardware/sam/cores/sam/build_gcc/arduino_sam3s_ek.mk
diff --git a/hardware/atmel/cores/sam/build_gcc/debug.mk b/hardware/sam/cores/sam/build_gcc/debug.mk
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug.mk
rename to hardware/sam/cores/sam/build_gcc/debug.mk
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/HardwareSerial.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/HardwareSerial.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/HardwareSerial.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/HardwareSerial.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/Print.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/Print.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/Print.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/Print.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/UART.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/UART.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/UART.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/UART.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/USART.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/USART.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/USART.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/USART.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/WInterrupts.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/WInterrupts.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/WInterrupts.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/WInterrupts.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/main.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/main.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/main.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/main.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/wiring.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/wiring.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/wiring.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/wiring.o
diff --git a/hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/wiring_shift.o b/hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/wiring_shift.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/debug_sam3s_ek/wiring_shift.o
rename to hardware/sam/cores/sam/build_gcc/debug_sam3s_ek/wiring_shift.o
diff --git a/hardware/atmel/cores/sam/build_gcc/gcc.mk b/hardware/sam/cores/sam/build_gcc/gcc.mk
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/gcc.mk
rename to hardware/sam/cores/sam/build_gcc/gcc.mk
diff --git a/hardware/atmel/cores/sam/build_gcc/release.mk b/hardware/sam/cores/sam/build_gcc/release.mk
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release.mk
rename to hardware/sam/cores/sam/build_gcc/release.mk
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/HardwareSerial.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/HardwareSerial.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/HardwareSerial.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/HardwareSerial.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/Print.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/Print.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/Print.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/Print.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/UART.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/UART.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/UART.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/UART.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/USART.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/USART.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/USART.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/USART.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/WInterrupts.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/WInterrupts.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/WInterrupts.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/WInterrupts.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/main.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/main.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/main.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/main.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/wiring.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/wiring.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/wiring.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/wiring.o
diff --git a/hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/wiring_shift.o b/hardware/sam/cores/sam/build_gcc/release_sam3s_ek/wiring_shift.o
similarity index 100%
rename from hardware/atmel/cores/sam/build_gcc/release_sam3s_ek/wiring_shift.o
rename to hardware/sam/cores/sam/build_gcc/release_sam3s_ek/wiring_shift.o
diff --git a/hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a b/hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a
similarity index 100%
rename from hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a
rename to hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a
diff --git a/hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a.txt b/hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a.txt
similarity index 100%
rename from hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a.txt
rename to hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_dbg.a.txt
diff --git a/hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a b/hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a
similarity index 100%
rename from hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a
rename to hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a
diff --git a/hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a.txt b/hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a.txt
similarity index 100%
rename from hardware/atmel/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a.txt
rename to hardware/sam/cores/sam/lib/arduino_sam3s_ek_gcc_rel.a.txt
diff --git a/hardware/atmel/cores/sam/main.cpp b/hardware/sam/cores/sam/main.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/main.cpp
rename to hardware/sam/cores/sam/main.cpp
diff --git a/hardware/tools/libchip_sam3s/build_gcc/Makefile b/hardware/sam/cores/sam/sam3s/build_gcc/Makefile
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/Makefile
rename to hardware/sam/cores/sam/sam3s/build_gcc/Makefile
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/debug.mk b/hardware/sam/cores/sam/sam3s/build_gcc/debug.mk
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/debug.mk
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug.mk
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/acc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/acc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/acc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/acc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/adc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/adc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/adc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/adc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/async.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/async.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/async.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/async.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/core_cm3.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/core_cm3.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/core_cm3.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/core_cm3.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/crccu.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/crccu.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/crccu.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/crccu.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/dacc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/dacc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/dacc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/dacc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/efc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/efc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/efc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/efc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/exceptions.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/exceptions.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/exceptions.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/exceptions.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/flashd.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/flashd.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/flashd.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/flashd.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pio.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pio.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pio_capture.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio_capture.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pio_capture.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio_capture.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pmc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pmc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pmc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pmc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pwmc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pwmc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/pwmc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pwmc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/rtc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/rtc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/rtt.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtt.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/rtt.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtt.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/spi.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/spi.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/spi_pdc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi_pdc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/spi_pdc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi_pdc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/ssc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/ssc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/ssc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/ssc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/tc.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/tc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/tc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/tc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/twi.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twi.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/twi.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twi.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/twid.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twid.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/twid.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twid.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/usart.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/usart.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/usart.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/usart.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/wdt.o b/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/wdt.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug_sam3s4/wdt.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/wdt.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/gcc.mk b/hardware/sam/cores/sam/sam3s/build_gcc/gcc.mk
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/gcc.mk
rename to hardware/sam/cores/sam/sam3s/build_gcc/gcc.mk
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/release.mk b/hardware/sam/cores/sam/sam3s/build_gcc/release.mk
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/release.mk
rename to hardware/sam/cores/sam/sam3s/build_gcc/release.mk
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/acc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/acc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/acc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/acc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/adc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/adc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/adc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/adc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/async.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/async.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/async.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/async.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/core_cm3.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/core_cm3.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/core_cm3.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/core_cm3.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/crccu.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/crccu.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/crccu.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/crccu.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/dacc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/dacc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/dacc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/dacc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/efc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/efc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/efc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/efc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/exceptions.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/exceptions.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/exceptions.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/exceptions.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/flashd.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/flashd.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/flashd.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/flashd.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pio.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pio.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pio_capture.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio_capture.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pio_capture.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio_capture.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pmc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pmc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pmc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pmc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pwmc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pwmc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/pwmc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pwmc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/rtc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/rtc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/rtt.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtt.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/rtt.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtt.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/spi.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/spi.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/spi_pdc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi_pdc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/spi_pdc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi_pdc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/ssc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/ssc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/ssc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/ssc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/tc.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/tc.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/tc.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/tc.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/twi.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twi.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/twi.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twi.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/twid.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twid.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/twid.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twid.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/usart.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/usart.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/usart.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/usart.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/wdt.o b/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/wdt.o
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release_sam3s4/wdt.o
rename to hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/wdt.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/sam3s.mk b/hardware/sam/cores/sam/sam3s/build_gcc/sam3s.mk
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/sam3s.mk
rename to hardware/sam/cores/sam/sam3s/build_gcc/sam3s.mk
diff --git a/hardware/tools/libchip_sam3s/chip.h b/hardware/sam/cores/sam/sam3s/chip.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/chip.h
rename to hardware/sam/cores/sam/sam3s/chip.h
diff --git a/hardware/tools/libchip_sam3s/cmsis/core_cm3.c b/hardware/sam/cores/sam/sam3s/cmsis/core_cm3.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/cmsis/core_cm3.c
rename to hardware/sam/cores/sam/sam3s/cmsis/core_cm3.c
diff --git a/hardware/tools/libchip_sam3s/cmsis/core_cm3.h b/hardware/sam/cores/sam/sam3s/cmsis/core_cm3.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/cmsis/core_cm3.h
rename to hardware/sam/cores/sam/sam3s/cmsis/core_cm3.h
diff --git a/hardware/tools/libchip_sam3s/cmsis/core_cmFunc.h b/hardware/sam/cores/sam/sam3s/cmsis/core_cmFunc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/cmsis/core_cmFunc.h
rename to hardware/sam/cores/sam/sam3s/cmsis/core_cmFunc.h
diff --git a/hardware/tools/libchip_sam3s/cmsis/core_cmInstr.h b/hardware/sam/cores/sam/sam3s/cmsis/core_cmInstr.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/cmsis/core_cmInstr.h
rename to hardware/sam/cores/sam/sam3s/cmsis/core_cmInstr.h
diff --git a/hardware/tools/libchip_sam3s/include/SAM3S.h b/hardware/sam/cores/sam/sam3s/include/SAM3S.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/SAM3S.h
rename to hardware/sam/cores/sam/sam3s/include/SAM3S.h
diff --git a/hardware/tools/libchip_sam3s/include/acc.h b/hardware/sam/cores/sam/sam3s/include/acc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/acc.h
rename to hardware/sam/cores/sam/sam3s/include/acc.h
diff --git a/hardware/tools/libchip_sam3s/include/adc.h b/hardware/sam/cores/sam/sam3s/include/adc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/adc.h
rename to hardware/sam/cores/sam/sam3s/include/adc.h
diff --git a/hardware/tools/libchip_sam3s/include/async.h b/hardware/sam/cores/sam/sam3s/include/async.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/async.h
rename to hardware/sam/cores/sam/sam3s/include/async.h
diff --git a/hardware/tools/libchip_sam3s/include/crccu.h b/hardware/sam/cores/sam/sam3s/include/crccu.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/crccu.h
rename to hardware/sam/cores/sam/sam3s/include/crccu.h
diff --git a/hardware/tools/libchip_sam3s/include/dacc.h b/hardware/sam/cores/sam/sam3s/include/dacc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/dacc.h
rename to hardware/sam/cores/sam/sam3s/include/dacc.h
diff --git a/hardware/tools/libchip_sam3s/include/efc.h b/hardware/sam/cores/sam/sam3s/include/efc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/efc.h
rename to hardware/sam/cores/sam/sam3s/include/efc.h
diff --git a/hardware/tools/libchip_sam3s/include/exceptions.h b/hardware/sam/cores/sam/sam3s/include/exceptions.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/exceptions.h
rename to hardware/sam/cores/sam/sam3s/include/exceptions.h
diff --git a/hardware/tools/libchip_sam3s/include/flashd.h b/hardware/sam/cores/sam/sam3s/include/flashd.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/flashd.h
rename to hardware/sam/cores/sam/sam3s/include/flashd.h
diff --git a/hardware/tools/libchip_sam3s/include/pio.h b/hardware/sam/cores/sam/sam3s/include/pio.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/pio.h
rename to hardware/sam/cores/sam/sam3s/include/pio.h
diff --git a/hardware/tools/libchip_sam3s/include/pio_capture.h b/hardware/sam/cores/sam/sam3s/include/pio_capture.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/pio_capture.h
rename to hardware/sam/cores/sam/sam3s/include/pio_capture.h
diff --git a/hardware/tools/libchip_sam3s/include/pio_it.h b/hardware/sam/cores/sam/sam3s/include/pio_it.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/pio_it.h
rename to hardware/sam/cores/sam/sam3s/include/pio_it.h
diff --git a/hardware/tools/libchip_sam3s/include/pmc.h b/hardware/sam/cores/sam/sam3s/include/pmc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/pmc.h
rename to hardware/sam/cores/sam/sam3s/include/pmc.h
diff --git a/hardware/tools/libchip_sam3s/include/pwmc.h b/hardware/sam/cores/sam/sam3s/include/pwmc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/pwmc.h
rename to hardware/sam/cores/sam/sam3s/include/pwmc.h
diff --git a/hardware/tools/libchip_sam3s/include/rtc.h b/hardware/sam/cores/sam/sam3s/include/rtc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/rtc.h
rename to hardware/sam/cores/sam/sam3s/include/rtc.h
diff --git a/hardware/tools/libchip_sam3s/include/rtt.h b/hardware/sam/cores/sam/sam3s/include/rtt.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/rtt.h
rename to hardware/sam/cores/sam/sam3s/include/rtt.h
diff --git a/hardware/tools/libchip_sam3s/include/spi.h b/hardware/sam/cores/sam/sam3s/include/spi.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/spi.h
rename to hardware/sam/cores/sam/sam3s/include/spi.h
diff --git a/hardware/tools/libchip_sam3s/include/spi_pdc.h b/hardware/sam/cores/sam/sam3s/include/spi_pdc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/spi_pdc.h
rename to hardware/sam/cores/sam/sam3s/include/spi_pdc.h
diff --git a/hardware/tools/libchip_sam3s/include/ssc.h b/hardware/sam/cores/sam/sam3s/include/ssc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/ssc.h
rename to hardware/sam/cores/sam/sam3s/include/ssc.h
diff --git a/hardware/tools/libchip_sam3s/include/tc.h b/hardware/sam/cores/sam/sam3s/include/tc.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/tc.h
rename to hardware/sam/cores/sam/sam3s/include/tc.h
diff --git a/hardware/tools/libchip_sam3s/include/twi.h b/hardware/sam/cores/sam/sam3s/include/twi.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/twi.h
rename to hardware/sam/cores/sam/sam3s/include/twi.h
diff --git a/hardware/tools/libchip_sam3s/include/twid.h b/hardware/sam/cores/sam/sam3s/include/twid.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/twid.h
rename to hardware/sam/cores/sam/sam3s/include/twid.h
diff --git a/hardware/tools/libchip_sam3s/include/usart.h b/hardware/sam/cores/sam/sam3s/include/usart.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/usart.h
rename to hardware/sam/cores/sam/sam3s/include/usart.h
diff --git a/hardware/tools/libchip_sam3s/include/wdt.h b/hardware/sam/cores/sam/sam3s/include/wdt.h
similarity index 100%
rename from hardware/tools/libchip_sam3s/include/wdt.h
rename to hardware/sam/cores/sam/sam3s/include/wdt.h
diff --git a/hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a b/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a
similarity index 100%
rename from hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a
rename to hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a
diff --git a/hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt b/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
similarity index 100%
rename from hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
rename to hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
diff --git a/hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a b/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a
similarity index 100%
rename from hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a
rename to hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a
diff --git a/hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt b/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
similarity index 100%
rename from hardware/tools/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
rename to hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
diff --git a/hardware/tools/libchip_sam3s/source/acc.c b/hardware/sam/cores/sam/sam3s/source/acc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/acc.c
rename to hardware/sam/cores/sam/sam3s/source/acc.c
diff --git a/hardware/tools/libchip_sam3s/source/adc.c b/hardware/sam/cores/sam/sam3s/source/adc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/adc.c
rename to hardware/sam/cores/sam/sam3s/source/adc.c
diff --git a/hardware/tools/libchip_sam3s/source/async.c b/hardware/sam/cores/sam/sam3s/source/async.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/async.c
rename to hardware/sam/cores/sam/sam3s/source/async.c
diff --git a/hardware/tools/libchip_sam3s/source/crccu.c b/hardware/sam/cores/sam/sam3s/source/crccu.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/crccu.c
rename to hardware/sam/cores/sam/sam3s/source/crccu.c
diff --git a/hardware/tools/libchip_sam3s/source/dacc.c b/hardware/sam/cores/sam/sam3s/source/dacc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/dacc.c
rename to hardware/sam/cores/sam/sam3s/source/dacc.c
diff --git a/hardware/tools/libchip_sam3s/source/efc.c b/hardware/sam/cores/sam/sam3s/source/efc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/efc.c
rename to hardware/sam/cores/sam/sam3s/source/efc.c
diff --git a/hardware/tools/libchip_sam3s/source/exceptions.c b/hardware/sam/cores/sam/sam3s/source/exceptions.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/exceptions.c
rename to hardware/sam/cores/sam/sam3s/source/exceptions.c
diff --git a/hardware/tools/libchip_sam3s/source/flashd.c b/hardware/sam/cores/sam/sam3s/source/flashd.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/flashd.c
rename to hardware/sam/cores/sam/sam3s/source/flashd.c
diff --git a/hardware/tools/libchip_sam3s/source/pio.c b/hardware/sam/cores/sam/sam3s/source/pio.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/pio.c
rename to hardware/sam/cores/sam/sam3s/source/pio.c
diff --git a/hardware/tools/libchip_sam3s/source/pio_capture.c b/hardware/sam/cores/sam/sam3s/source/pio_capture.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/pio_capture.c
rename to hardware/sam/cores/sam/sam3s/source/pio_capture.c
diff --git a/hardware/tools/libchip_sam3s/source/pio_it.c b/hardware/sam/cores/sam/sam3s/source/pio_it.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/pio_it.c
rename to hardware/sam/cores/sam/sam3s/source/pio_it.c
diff --git a/hardware/tools/libchip_sam3s/source/pmc.c b/hardware/sam/cores/sam/sam3s/source/pmc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/pmc.c
rename to hardware/sam/cores/sam/sam3s/source/pmc.c
diff --git a/hardware/tools/libchip_sam3s/source/pwmc.c b/hardware/sam/cores/sam/sam3s/source/pwmc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/pwmc.c
rename to hardware/sam/cores/sam/sam3s/source/pwmc.c
diff --git a/hardware/tools/libchip_sam3s/source/rtc.c b/hardware/sam/cores/sam/sam3s/source/rtc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/rtc.c
rename to hardware/sam/cores/sam/sam3s/source/rtc.c
diff --git a/hardware/tools/libchip_sam3s/source/rtt.c b/hardware/sam/cores/sam/sam3s/source/rtt.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/rtt.c
rename to hardware/sam/cores/sam/sam3s/source/rtt.c
diff --git a/hardware/tools/libchip_sam3s/source/spi.c b/hardware/sam/cores/sam/sam3s/source/spi.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/spi.c
rename to hardware/sam/cores/sam/sam3s/source/spi.c
diff --git a/hardware/tools/libchip_sam3s/source/spi_pdc.c b/hardware/sam/cores/sam/sam3s/source/spi_pdc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/spi_pdc.c
rename to hardware/sam/cores/sam/sam3s/source/spi_pdc.c
diff --git a/hardware/tools/libchip_sam3s/source/ssc.c b/hardware/sam/cores/sam/sam3s/source/ssc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/ssc.c
rename to hardware/sam/cores/sam/sam3s/source/ssc.c
diff --git a/hardware/tools/libchip_sam3s/source/tc.c b/hardware/sam/cores/sam/sam3s/source/tc.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/tc.c
rename to hardware/sam/cores/sam/sam3s/source/tc.c
diff --git a/hardware/tools/libchip_sam3s/source/twi.c b/hardware/sam/cores/sam/sam3s/source/twi.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/twi.c
rename to hardware/sam/cores/sam/sam3s/source/twi.c
diff --git a/hardware/tools/libchip_sam3s/source/twid.c b/hardware/sam/cores/sam/sam3s/source/twid.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/twid.c
rename to hardware/sam/cores/sam/sam3s/source/twid.c
diff --git a/hardware/tools/libchip_sam3s/source/usart.c b/hardware/sam/cores/sam/sam3s/source/usart.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/usart.c
rename to hardware/sam/cores/sam/sam3s/source/usart.c
diff --git a/hardware/tools/libchip_sam3s/source/wdt.c b/hardware/sam/cores/sam/sam3s/source/wdt.c
similarity index 100%
rename from hardware/tools/libchip_sam3s/source/wdt.c
rename to hardware/sam/cores/sam/sam3s/source/wdt.c
diff --git a/hardware/atmel/cores/sam/validation/test.cpp b/hardware/sam/cores/sam/validation/test.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/validation/test.cpp
rename to hardware/sam/cores/sam/validation/test.cpp
diff --git a/hardware/atmel/cores/sam/wiring.c b/hardware/sam/cores/sam/wiring.c
similarity index 100%
rename from hardware/atmel/cores/sam/wiring.c
rename to hardware/sam/cores/sam/wiring.c
diff --git a/hardware/atmel/cores/sam/wiring_analog.c b/hardware/sam/cores/sam/wiring_analog.c
similarity index 100%
rename from hardware/atmel/cores/sam/wiring_analog.c
rename to hardware/sam/cores/sam/wiring_analog.c
diff --git a/hardware/atmel/cores/sam/wiring_digital.c b/hardware/sam/cores/sam/wiring_digital.c
similarity index 100%
rename from hardware/atmel/cores/sam/wiring_digital.c
rename to hardware/sam/cores/sam/wiring_digital.c
diff --git a/hardware/atmel/cores/sam/wiring_private.h b/hardware/sam/cores/sam/wiring_private.h
similarity index 100%
rename from hardware/atmel/cores/sam/wiring_private.h
rename to hardware/sam/cores/sam/wiring_private.h
diff --git a/hardware/atmel/cores/sam/wiring_pulse.c b/hardware/sam/cores/sam/wiring_pulse.c
similarity index 100%
rename from hardware/atmel/cores/sam/wiring_pulse.c
rename to hardware/sam/cores/sam/wiring_pulse.c
diff --git a/hardware/atmel/cores/sam/wiring_shift.c b/hardware/sam/cores/sam/wiring_shift.c
similarity index 100%
rename from hardware/atmel/cores/sam/wiring_shift.c
rename to hardware/sam/cores/sam/wiring_shift.c
diff --git a/hardware/tools/libboard_sam3s-ek/board.h b/hardware/sam/pins/sam3s-ek/board.h
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/board.h
rename to hardware/sam/pins/sam3s-ek/board.h
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/Makefile b/hardware/sam/pins/sam3s-ek/build_gcc/Makefile
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/Makefile
rename to hardware/sam/pins/sam3s-ek/build_gcc/Makefile
diff --git a/hardware/tools/libchip_sam3s/build_gcc/debug.mk b/hardware/sam/pins/sam3s-ek/build_gcc/debug.mk
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/debug.mk
rename to hardware/sam/pins/sam3s-ek/build_gcc/debug.mk
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o b/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o b/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o b/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o b/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
diff --git a/hardware/tools/libchip_sam3s/build_gcc/gcc.mk b/hardware/sam/pins/sam3s-ek/build_gcc/gcc.mk
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/gcc.mk
rename to hardware/sam/pins/sam3s-ek/build_gcc/gcc.mk
diff --git a/hardware/tools/libchip_sam3s/build_gcc/release.mk b/hardware/sam/pins/sam3s-ek/build_gcc/release.mk
similarity index 100%
rename from hardware/tools/libchip_sam3s/build_gcc/release.mk
rename to hardware/sam/pins/sam3s-ek/build_gcc/release.mk
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o b/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o b/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o b/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/timetick.o b/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
rename to hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
diff --git a/hardware/tools/libboard_sam3s-ek/build_gcc/sam3s_ek.mk b/hardware/sam/pins/sam3s-ek/build_gcc/sam3s_ek.mk
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/build_gcc/sam3s_ek.mk
rename to hardware/sam/pins/sam3s-ek/build_gcc/sam3s_ek.mk
diff --git a/hardware/tools/libboard_sam3s-ek/include/bitbanding.h b/hardware/sam/pins/sam3s-ek/include/bitbanding.h
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/include/bitbanding.h
rename to hardware/sam/pins/sam3s-ek/include/bitbanding.h
diff --git a/hardware/tools/libboard_sam3s-ek/include/board_lowlevel.h b/hardware/sam/pins/sam3s-ek/include/board_lowlevel.h
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/include/board_lowlevel.h
rename to hardware/sam/pins/sam3s-ek/include/board_lowlevel.h
diff --git a/hardware/tools/libboard_sam3s-ek/include/syscalls.h b/hardware/sam/pins/sam3s-ek/include/syscalls.h
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/include/syscalls.h
rename to hardware/sam/pins/sam3s-ek/include/syscalls.h
diff --git a/hardware/tools/libboard_sam3s-ek/include/timetick.h b/hardware/sam/pins/sam3s-ek/include/timetick.h
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/include/timetick.h
rename to hardware/sam/pins/sam3s-ek/include/timetick.h
diff --git a/hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a b/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
rename to hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
diff --git a/hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt b/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
rename to hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
diff --git a/hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a b/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
rename to hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
diff --git a/hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt b/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
rename to hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
diff --git a/hardware/tools/libboard_sam3s-ek/pins.txt b/hardware/sam/pins/sam3s-ek/pins.txt
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/pins.txt
rename to hardware/sam/pins/sam3s-ek/pins.txt
diff --git a/hardware/atmel/cores/sam/sam3s_ek/pins_arduino.h b/hardware/sam/pins/sam3s-ek/pins_arduino.h
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/pins_arduino.h
rename to hardware/sam/pins/sam3s-ek/pins_arduino.h
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s-ek.cpp b/hardware/sam/pins/sam3s-ek/sam3s-ek.cpp
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s-ek.cpp
rename to hardware/sam/pins/sam3s-ek/sam3s-ek.cpp
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s-ek.h b/hardware/sam/pins/sam3s-ek/sam3s-ek.h
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s-ek.h
rename to hardware/sam/pins/sam3s-ek/sam3s-ek.h
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_flash.gdb b/hardware/sam/pins/sam3s-ek/sam3s_ek_flash.gdb
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_flash.gdb
rename to hardware/sam/pins/sam3s-ek/sam3s_ek_flash.gdb
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_flash.ld b/hardware/sam/pins/sam3s-ek/sam3s_ek_flash.ld
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_flash.ld
rename to hardware/sam/pins/sam3s-ek/sam3s_ek_flash.ld
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_sram.gdb b/hardware/sam/pins/sam3s-ek/sam3s_ek_sram.gdb
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_sram.gdb
rename to hardware/sam/pins/sam3s-ek/sam3s_ek_sram.gdb
diff --git a/hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_sram.ld b/hardware/sam/pins/sam3s-ek/sam3s_ek_sram.ld
similarity index 100%
rename from hardware/atmel/cores/sam/sam3s_ek/sam3s_ek_sram.ld
rename to hardware/sam/pins/sam3s-ek/sam3s_ek_sram.ld
diff --git a/hardware/tools/libboard_sam3s-ek/source/board_cstartup_gnu.c b/hardware/sam/pins/sam3s-ek/source/board_cstartup_gnu.c
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/source/board_cstartup_gnu.c
rename to hardware/sam/pins/sam3s-ek/source/board_cstartup_gnu.c
diff --git a/hardware/tools/libboard_sam3s-ek/source/board_lowlevel.c b/hardware/sam/pins/sam3s-ek/source/board_lowlevel.c
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/source/board_lowlevel.c
rename to hardware/sam/pins/sam3s-ek/source/board_lowlevel.c
diff --git a/hardware/tools/libboard_sam3s-ek/source/syscalls.c b/hardware/sam/pins/sam3s-ek/source/syscalls.c
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/source/syscalls.c
rename to hardware/sam/pins/sam3s-ek/source/syscalls.c
diff --git a/hardware/tools/libboard_sam3s-ek/source/timetick.c b/hardware/sam/pins/sam3s-ek/source/timetick.c
similarity index 100%
rename from hardware/tools/libboard_sam3s-ek/source/timetick.c
rename to hardware/sam/pins/sam3s-ek/source/timetick.c
diff --git a/hardware/atmel/programmers.txt b/hardware/sam/programmers.txt
similarity index 100%
rename from hardware/atmel/programmers.txt
rename to hardware/sam/programmers.txt