diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/boards.txt b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/boards.txt
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/boards.txt
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/boards.txt
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/Makefile b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/Makefile
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega/Makefile
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega/Makefile
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/Makefile b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/Makefile
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/Makefile
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/Makefile
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/README.txt b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/README.txt
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/bootloaders/atmega644p/README.txt
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/bootloaders/atmega644p/README.txt
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Arduino.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Arduino.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Arduino.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Arduino.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/CDC.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/CDC.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/CDC.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/CDC.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Client.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Client.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Client.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Client.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HID.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HID.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HID.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HID.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HardwareSerial.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HardwareSerial.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HardwareSerial.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HardwareSerial.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HardwareSerial.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HardwareSerial.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/HardwareSerial.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/HardwareSerial.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/IPAddress.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/IPAddress.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/IPAddress.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/IPAddress.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/IPAddress.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/IPAddress.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/IPAddress.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/IPAddress.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Platform.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Platform.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Platform.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Platform.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Print.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Print.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Print.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Print.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Print.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Print.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Print.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Print.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Printable.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Printable.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Printable.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Printable.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Server.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Server.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Server.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Server.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Stream.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Stream.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Stream.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Stream.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Stream.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Stream.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Stream.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Stream.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Tone.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Tone.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Tone.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Tone.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBAPI.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBAPI.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBAPI.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBAPI.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBCore.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBCore.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBCore.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBCore.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBCore.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBCore.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBCore.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBCore.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBDesc.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBDesc.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/USBDesc.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/USBDesc.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Udp.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Udp.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/Udp.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/Udp.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WCharacter.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WCharacter.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WCharacter.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WCharacter.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WInterrupts.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WInterrupts.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WInterrupts.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WInterrupts.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WMath.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WMath.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WMath.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WMath.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WString.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WString.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WString.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WString.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WString.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WString.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/WString.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/WString.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/binary.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/binary.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/binary.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/binary.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/main.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/main.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/main.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/main.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/new.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/new.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/new.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/new.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/new.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/new.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/new.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/new.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_analog.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_analog.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_analog.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_analog.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_digital.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_digital.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_digital.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_digital.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_private.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_private.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_private.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_private.h
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_pulse.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_pulse.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_pulse.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_pulse.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_shift.c b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_shift.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/cores/arduino/wiring_shift.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/cores/arduino/wiring_shift.c
diff --git a/ArduinoAddons/Arduino_1.x.x/Sanguino/variants/standard/pins_arduino.h b/ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/variants/standard/pins_arduino.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/Sanguino/variants/standard/pins_arduino.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/Sanguino/variants/standard/pins_arduino.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/boards.txt b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/boards.txt
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/boards.txt
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/boards.txt
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Arduino.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Arduino.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Arduino.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Arduino.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/CDC.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/CDC.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/CDC.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/CDC.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Client.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Client.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Client.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Client.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HID.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HID.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HID.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HID.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HardwareSerial.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HardwareSerial.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HardwareSerial.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/HardwareSerial.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/IPAddress.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/IPAddress.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/IPAddress.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/IPAddress.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Platform.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Platform.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Platform.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Platform.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Print.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Print.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Print.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Print.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Printable.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Printable.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Printable.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Printable.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Server.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Server.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Server.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Server.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Stream.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Stream.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Stream.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Stream.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Tone.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Tone.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Tone.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Tone.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBAPI.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBAPI.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBAPI.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBAPI.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBCore.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBCore.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBCore.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBCore.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBDesc.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBDesc.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBDesc.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/USBDesc.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Udp.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Udp.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Udp.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/Udp.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WCharacter.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WCharacter.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WCharacter.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WCharacter.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WInterrupts.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WInterrupts.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WInterrupts.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WInterrupts.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WMath.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WMath.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WMath.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WMath.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WString.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WString.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WString.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/WString.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/binary.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/binary.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/binary.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/binary.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/main.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/main.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/main.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/main.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.cpp b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/new.cpp
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.cpp
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/new.cpp
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/new.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/new.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_analog.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_analog.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_analog.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_analog.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_digital.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_digital.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_digital.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_digital.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_private.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_private.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_private.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_private.h
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_pulse.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_pulse.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_pulse.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_pulse.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_shift.c b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_shift.c
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_shift.c
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/cores/arduino/wiring_shift.c
diff --git a/ArduinoAddons/Arduino_1.x.x/rambo/variants/standard/pins_arduino.h b/ArduinoAddons/Arduino_1.x.x/hardware/rambo/variants/standard/pins_arduino.h
similarity index 100%
rename from ArduinoAddons/Arduino_1.x.x/rambo/variants/standard/pins_arduino.h
rename to ArduinoAddons/Arduino_1.x.x/hardware/rambo/variants/standard/pins_arduino.h