diff --git a/firmwares/Standard_Firmata/Makefile b/firmwares/Standard_Firmata/Makefile
index 8ad2d2c..6edbf97 100644
--- a/firmwares/Standard_Firmata/Makefile
+++ b/firmwares/Standard_Firmata/Makefile
@@ -48,12 +48,12 @@
 PORT = /dev/tty.usbserial-*
 TARGET = Pd_firmware
 ARDUINO = /Applications/arduino-0007
-ARDUINO_SRC = $(ARDUINO)/lib/targets/arduino
-ARDUINO_LIB_SRC = $(ARDUINO)/lib/targets/libraries
-INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/tools/avr/avr/include \
-	-I$(ARDUINO)/lib/targets/libraries/EEPROM \
-	-I$(ARDUINO)/lib/targets/libraries/Firmata \
-	-I$(ARDUINO)/lib/targets/libraries
+ARDUINO_SRC = $(ARDUINO)/hardware/targets/arduino
+ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries
+INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \
+	-I$(ARDUINO_LIB_SRC)/EEPROM \
+	-I$(ARDUINO_LIB_SRC)/Firmata \
+	-I$(ARDUINO_LIB_SRC)
 SRC = $(ARDUINO_SRC)/pins_arduino.c $(ARDUINO_SRC)/wiring.c \
 	$(ARDUINO_SRC)/WInterrupts.c
 CXXSRC = applet/$(TARGET).cpp $(ARDUINO_SRC)/HardwareSerial.cpp \
@@ -242,10 +242,10 @@ etags:
 	etags *.pde \
 		$(ARDUINO_SRC)/*.[ch] \
 		$(ARDUINO_SRC)/*.cpp \
-		$(ARDUINO)/lib/targets/libraries/*/*.[ch] \
-		$(ARDUINO)/lib/targets/libraries/*/*.cpp \
-		$(ARDUINO)/tools/avr/avr/include/avr/*.[ch] \
-		$(ARDUINO)/tools/avr/avr/include/*.[ch]
+		$(ARDUINO_LIB_SRC)/*/*.[ch] \
+		$(ARDUINO_LIB_SRC)/*/*.cpp \
+		$(ARDUINO)/hardware/tools/avr/avr/include/avr/*.[ch] \
+		$(ARDUINO)/hardware/tools/avr/avr/include/*.[ch]
 
 etags_Darwin:
 #	etags -a 
diff --git a/core/arduino/HardwareSerial.cpp b/targets/arduino/HardwareSerial.cpp
similarity index 100%
rename from core/arduino/HardwareSerial.cpp
rename to targets/arduino/HardwareSerial.cpp
diff --git a/core/arduino/HardwareSerial.h b/targets/arduino/HardwareSerial.h
similarity index 100%
rename from core/arduino/HardwareSerial.h
rename to targets/arduino/HardwareSerial.h
diff --git a/core/arduino/Makefile b/targets/arduino/Makefile
similarity index 100%
rename from core/arduino/Makefile
rename to targets/arduino/Makefile
diff --git a/core/arduino/WConstants.h b/targets/arduino/WConstants.h
similarity index 100%
rename from core/arduino/WConstants.h
rename to targets/arduino/WConstants.h
diff --git a/core/arduino/WInterrupts.c b/targets/arduino/WInterrupts.c
similarity index 100%
rename from core/arduino/WInterrupts.c
rename to targets/arduino/WInterrupts.c
diff --git a/core/arduino/WProgram.h b/targets/arduino/WProgram.h
similarity index 100%
rename from core/arduino/WProgram.h
rename to targets/arduino/WProgram.h
diff --git a/core/arduino/WRandom.cpp b/targets/arduino/WRandom.cpp
similarity index 100%
rename from core/arduino/WRandom.cpp
rename to targets/arduino/WRandom.cpp
diff --git a/core/arduino/binary.h b/targets/arduino/binary.h
similarity index 100%
rename from core/arduino/binary.h
rename to targets/arduino/binary.h
diff --git a/core/arduino/main.cxx b/targets/arduino/main.cxx
similarity index 100%
rename from core/arduino/main.cxx
rename to targets/arduino/main.cxx
diff --git a/core/arduino/pins_arduino.c b/targets/arduino/pins_arduino.c
similarity index 100%
rename from core/arduino/pins_arduino.c
rename to targets/arduino/pins_arduino.c
diff --git a/core/arduino/pins_arduino.h b/targets/arduino/pins_arduino.h
similarity index 100%
rename from core/arduino/pins_arduino.h
rename to targets/arduino/pins_arduino.h
diff --git a/core/arduino/wiring.c b/targets/arduino/wiring.c
similarity index 100%
rename from core/arduino/wiring.c
rename to targets/arduino/wiring.c
diff --git a/core/arduino/wiring.h b/targets/arduino/wiring.h
similarity index 100%
rename from core/arduino/wiring.h
rename to targets/arduino/wiring.h
diff --git a/core/arduino/wiring_analog.c b/targets/arduino/wiring_analog.c
similarity index 100%
rename from core/arduino/wiring_analog.c
rename to targets/arduino/wiring_analog.c
diff --git a/core/arduino/wiring_digital.c b/targets/arduino/wiring_digital.c
similarity index 100%
rename from core/arduino/wiring_digital.c
rename to targets/arduino/wiring_digital.c
diff --git a/core/arduino/wiring_private.h b/targets/arduino/wiring_private.h
similarity index 100%
rename from core/arduino/wiring_private.h
rename to targets/arduino/wiring_private.h
diff --git a/core/arduino/wiring_pulse.c b/targets/arduino/wiring_pulse.c
similarity index 100%
rename from core/arduino/wiring_pulse.c
rename to targets/arduino/wiring_pulse.c
diff --git a/core/arduino/wiring_serial.c b/targets/arduino/wiring_serial.c
similarity index 100%
rename from core/arduino/wiring_serial.c
rename to targets/arduino/wiring_serial.c
diff --git a/core/arduino/wiring_shift.c b/targets/arduino/wiring_shift.c
similarity index 100%
rename from core/arduino/wiring_shift.c
rename to targets/arduino/wiring_shift.c
diff --git a/core/atmega8/pins_atmega8.c b/targets/atmega8/pins_atmega8.c
similarity index 100%
rename from core/atmega8/pins_atmega8.c
rename to targets/atmega8/pins_atmega8.c
diff --git a/core/blank/WProgram.h b/targets/blank/WProgram.h
similarity index 100%
rename from core/blank/WProgram.h
rename to targets/blank/WProgram.h
diff --git a/core/blank/main.cxx b/targets/blank/main.cxx
similarity index 100%
rename from core/blank/main.cxx
rename to targets/blank/main.cxx
diff --git a/core/wiring/Binary.h b/targets/wiring/Binary.h
similarity index 100%
rename from core/wiring/Binary.h
rename to targets/wiring/Binary.h
diff --git a/core/wiring/Encoder.h b/targets/wiring/Encoder.h
similarity index 100%
rename from core/wiring/Encoder.h
rename to targets/wiring/Encoder.h
diff --git a/core/wiring/Encoder.o b/targets/wiring/Encoder.o
similarity index 100%
rename from core/wiring/Encoder.o
rename to targets/wiring/Encoder.o
diff --git a/core/wiring/HardwareSerial.h b/targets/wiring/HardwareSerial.h
similarity index 100%
rename from core/wiring/HardwareSerial.h
rename to targets/wiring/HardwareSerial.h
diff --git a/core/wiring/HardwareSerial.o b/targets/wiring/HardwareSerial.o
similarity index 100%
rename from core/wiring/HardwareSerial.o
rename to targets/wiring/HardwareSerial.o
diff --git a/core/wiring/LiquidCrystal.h b/targets/wiring/LiquidCrystal.h
similarity index 100%
rename from core/wiring/LiquidCrystal.h
rename to targets/wiring/LiquidCrystal.h
diff --git a/core/wiring/LiquidCrystal.o b/targets/wiring/LiquidCrystal.o
similarity index 100%
rename from core/wiring/LiquidCrystal.o
rename to targets/wiring/LiquidCrystal.o
diff --git a/core/wiring/Matrix.h b/targets/wiring/Matrix.h
similarity index 100%
rename from core/wiring/Matrix.h
rename to targets/wiring/Matrix.h
diff --git a/core/wiring/Matrix.o b/targets/wiring/Matrix.o
similarity index 100%
rename from core/wiring/Matrix.o
rename to targets/wiring/Matrix.o
diff --git a/core/wiring/QSlide.h b/targets/wiring/QSlide.h
similarity index 100%
rename from core/wiring/QSlide.h
rename to targets/wiring/QSlide.h
diff --git a/core/wiring/QSlide.o b/targets/wiring/QSlide.o
similarity index 100%
rename from core/wiring/QSlide.o
rename to targets/wiring/QSlide.o
diff --git a/core/wiring/Servo.h b/targets/wiring/Servo.h
similarity index 100%
rename from core/wiring/Servo.h
rename to targets/wiring/Servo.h
diff --git a/core/wiring/Servo.o b/targets/wiring/Servo.o
similarity index 100%
rename from core/wiring/Servo.o
rename to targets/wiring/Servo.o
diff --git a/core/wiring/Sprite.h b/targets/wiring/Sprite.h
similarity index 100%
rename from core/wiring/Sprite.h
rename to targets/wiring/Sprite.h
diff --git a/core/wiring/Sprite.o b/targets/wiring/Sprite.o
similarity index 100%
rename from core/wiring/Sprite.o
rename to targets/wiring/Sprite.o
diff --git a/core/wiring/TwoWire.h b/targets/wiring/TwoWire.h
similarity index 100%
rename from core/wiring/TwoWire.h
rename to targets/wiring/TwoWire.h
diff --git a/core/wiring/TwoWire.o b/targets/wiring/TwoWire.o
similarity index 100%
rename from core/wiring/TwoWire.o
rename to targets/wiring/TwoWire.o
diff --git a/core/wiring/WApplet.o b/targets/wiring/WApplet.o
similarity index 100%
rename from core/wiring/WApplet.o
rename to targets/wiring/WApplet.o
diff --git a/core/wiring/WConstants.h b/targets/wiring/WConstants.h
similarity index 100%
rename from core/wiring/WConstants.h
rename to targets/wiring/WConstants.h
diff --git a/core/wiring/WInterrupts.o b/targets/wiring/WInterrupts.o
similarity index 100%
rename from core/wiring/WInterrupts.o
rename to targets/wiring/WInterrupts.o
diff --git a/core/wiring/WProgram.h b/targets/wiring/WProgram.h
similarity index 100%
rename from core/wiring/WProgram.h
rename to targets/wiring/WProgram.h
diff --git a/core/wiring/WRandom.o b/targets/wiring/WRandom.o
similarity index 100%
rename from core/wiring/WRandom.o
rename to targets/wiring/WRandom.o
diff --git a/core/wiring/WTimer.o b/targets/wiring/WTimer.o
similarity index 100%
rename from core/wiring/WTimer.o
rename to targets/wiring/WTimer.o
diff --git a/core/wiring/buffer.h b/targets/wiring/buffer.h
similarity index 100%
rename from core/wiring/buffer.h
rename to targets/wiring/buffer.h
diff --git a/core/wiring/buffer.o b/targets/wiring/buffer.o
similarity index 100%
rename from core/wiring/buffer.o
rename to targets/wiring/buffer.o
diff --git a/core/wiring/twi.h b/targets/wiring/twi.h
similarity index 100%
rename from core/wiring/twi.h
rename to targets/wiring/twi.h
diff --git a/core/wiring/twi.o b/targets/wiring/twi.o
similarity index 100%
rename from core/wiring/twi.o
rename to targets/wiring/twi.o
diff --git a/core/wiring/uart.h b/targets/wiring/uart.h
similarity index 100%
rename from core/wiring/uart.h
rename to targets/wiring/uart.h
diff --git a/core/wiring/uart.o b/targets/wiring/uart.o
similarity index 100%
rename from core/wiring/uart.o
rename to targets/wiring/uart.o