diff --git a/app/Editor.java b/app/Editor.java
index b0b16c072..22b1bcd87 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -1448,7 +1448,7 @@ public class Editor extends JFrame
         try {
           if (!sketch.handleRun(new Target(
               System.getProperty("user.dir") + File.separator + "hardware" +
-              File.separator + "targets", Preferences.get("build.target"))))
+              File.separator + "cores", Preferences.get("build.target"))))
             return;
     
           //runtime = new Runner(sketch, Editor.this);
@@ -2057,7 +2057,7 @@ public class Editor extends JFrame
             //sketch.exportLibrary() : sketch.exportApplet();
             boolean success = sketch.exportApplet(new Target(
                 System.getProperty("user.dir") + File.separator + "hardware" +
-                File.separator + "targets", Preferences.get("build.target")));
+                File.separator + "cores", Preferences.get("build.target")));
             if (success) {
               message("Done uploading.");
             } else {
diff --git a/app/LibraryManager.java b/app/LibraryManager.java
index 02484c37d..090feb390 100755
--- a/app/LibraryManager.java
+++ b/app/LibraryManager.java
@@ -49,7 +49,7 @@ public class LibraryManager {
       "libraries");
     target = new Target(
       System.getProperty("user.dir") + File.separator + "hardware" +
-      File.separator + "targets", Preferences.get("build.target"));
+      File.separator + "cores", Preferences.get("build.target"));
     refreshLibraries();
   }
   
diff --git a/app/tools/ExportFolder.java b/app/tools/ExportFolder.java
index d85b7dbe7..2ce364947 100755
--- a/app/tools/ExportFolder.java
+++ b/app/tools/ExportFolder.java
@@ -78,7 +78,7 @@ public class ExportFolder {
         // success may not be that useful, usually an ex is thrown
         success = editor.sketch.exportApplet(new Target(
                 System.getProperty("user.dir") + File.separator + "hardware" +
-                File.separator + "targets", Preferences.get("build.target")));
+                File.separator + "cores", Preferences.get("build.target")));
         if (!success) break;
         //System.out.println("success was " + success);
       }
diff --git a/hardware/targets/arduino/HardwareSerial.cpp b/hardware/cores/arduino/HardwareSerial.cpp
similarity index 100%
rename from hardware/targets/arduino/HardwareSerial.cpp
rename to hardware/cores/arduino/HardwareSerial.cpp
diff --git a/hardware/targets/arduino/HardwareSerial.h b/hardware/cores/arduino/HardwareSerial.h
similarity index 100%
rename from hardware/targets/arduino/HardwareSerial.h
rename to hardware/cores/arduino/HardwareSerial.h
diff --git a/hardware/targets/arduino/Makefile b/hardware/cores/arduino/Makefile
similarity index 99%
rename from hardware/targets/arduino/Makefile
rename to hardware/cores/arduino/Makefile
index 9290fcc9f..98990f80b 100755
--- a/hardware/targets/arduino/Makefile
+++ b/hardware/cores/arduino/Makefile
@@ -43,7 +43,7 @@
 #
 #  3. Modify the line containg "ARDUINO" to point the directory that
 #     contains the Arduino core (for normal Arduino installations, this
-#     is the lib/targets/arduino sub-directory).
+#     is the hardware/cores/arduino sub-directory).
 #
 #  4. Modify the line containing "PORT" to refer to the filename
 #     representing the USB or serial connection to your Arduino board
diff --git a/hardware/targets/arduino/WConstants.h b/hardware/cores/arduino/WConstants.h
similarity index 100%
rename from hardware/targets/arduino/WConstants.h
rename to hardware/cores/arduino/WConstants.h
diff --git a/hardware/targets/arduino/WInterrupts.c b/hardware/cores/arduino/WInterrupts.c
similarity index 100%
rename from hardware/targets/arduino/WInterrupts.c
rename to hardware/cores/arduino/WInterrupts.c
diff --git a/hardware/targets/arduino/WProgram.h b/hardware/cores/arduino/WProgram.h
similarity index 100%
rename from hardware/targets/arduino/WProgram.h
rename to hardware/cores/arduino/WProgram.h
diff --git a/hardware/targets/arduino/WRandom.cpp b/hardware/cores/arduino/WRandom.cpp
similarity index 100%
rename from hardware/targets/arduino/WRandom.cpp
rename to hardware/cores/arduino/WRandom.cpp
diff --git a/hardware/targets/arduino/binary.h b/hardware/cores/arduino/binary.h
similarity index 100%
rename from hardware/targets/arduino/binary.h
rename to hardware/cores/arduino/binary.h
diff --git a/hardware/targets/arduino/main.cxx b/hardware/cores/arduino/main.cxx
similarity index 100%
rename from hardware/targets/arduino/main.cxx
rename to hardware/cores/arduino/main.cxx
diff --git a/hardware/targets/arduino/pins_arduino.c b/hardware/cores/arduino/pins_arduino.c
similarity index 100%
rename from hardware/targets/arduino/pins_arduino.c
rename to hardware/cores/arduino/pins_arduino.c
diff --git a/hardware/targets/arduino/pins_arduino.h b/hardware/cores/arduino/pins_arduino.h
similarity index 100%
rename from hardware/targets/arduino/pins_arduino.h
rename to hardware/cores/arduino/pins_arduino.h
diff --git a/hardware/targets/arduino/wiring.c b/hardware/cores/arduino/wiring.c
similarity index 100%
rename from hardware/targets/arduino/wiring.c
rename to hardware/cores/arduino/wiring.c
diff --git a/hardware/targets/arduino/wiring.h b/hardware/cores/arduino/wiring.h
similarity index 100%
rename from hardware/targets/arduino/wiring.h
rename to hardware/cores/arduino/wiring.h
diff --git a/hardware/targets/arduino/wiring_analog.c b/hardware/cores/arduino/wiring_analog.c
similarity index 100%
rename from hardware/targets/arduino/wiring_analog.c
rename to hardware/cores/arduino/wiring_analog.c
diff --git a/hardware/targets/arduino/wiring_digital.c b/hardware/cores/arduino/wiring_digital.c
similarity index 100%
rename from hardware/targets/arduino/wiring_digital.c
rename to hardware/cores/arduino/wiring_digital.c
diff --git a/hardware/targets/arduino/wiring_private.h b/hardware/cores/arduino/wiring_private.h
similarity index 100%
rename from hardware/targets/arduino/wiring_private.h
rename to hardware/cores/arduino/wiring_private.h
diff --git a/hardware/targets/arduino/wiring_pulse.c b/hardware/cores/arduino/wiring_pulse.c
similarity index 100%
rename from hardware/targets/arduino/wiring_pulse.c
rename to hardware/cores/arduino/wiring_pulse.c
diff --git a/hardware/targets/arduino/wiring_serial.c b/hardware/cores/arduino/wiring_serial.c
similarity index 100%
rename from hardware/targets/arduino/wiring_serial.c
rename to hardware/cores/arduino/wiring_serial.c
diff --git a/hardware/targets/arduino/wiring_shift.c b/hardware/cores/arduino/wiring_shift.c
similarity index 100%
rename from hardware/targets/arduino/wiring_shift.c
rename to hardware/cores/arduino/wiring_shift.c
diff --git a/hardware/targets/atmega8/pins_atmega8.c b/hardware/cores/atmega8/pins_atmega8.c
similarity index 100%
rename from hardware/targets/atmega8/pins_atmega8.c
rename to hardware/cores/atmega8/pins_atmega8.c
diff --git a/hardware/targets/blank/WProgram.h b/hardware/cores/blank/WProgram.h
similarity index 100%
rename from hardware/targets/blank/WProgram.h
rename to hardware/cores/blank/WProgram.h
diff --git a/hardware/targets/blank/main.cxx b/hardware/cores/blank/main.cxx
similarity index 100%
rename from hardware/targets/blank/main.cxx
rename to hardware/cores/blank/main.cxx
diff --git a/hardware/targets/wiring/Binary.h b/hardware/cores/wiring/Binary.h
similarity index 100%
rename from hardware/targets/wiring/Binary.h
rename to hardware/cores/wiring/Binary.h
diff --git a/hardware/targets/wiring/Encoder.h b/hardware/cores/wiring/Encoder.h
similarity index 100%
rename from hardware/targets/wiring/Encoder.h
rename to hardware/cores/wiring/Encoder.h
diff --git a/hardware/targets/wiring/Encoder.o b/hardware/cores/wiring/Encoder.o
similarity index 100%
rename from hardware/targets/wiring/Encoder.o
rename to hardware/cores/wiring/Encoder.o
diff --git a/hardware/targets/wiring/HardwareSerial.h b/hardware/cores/wiring/HardwareSerial.h
similarity index 100%
rename from hardware/targets/wiring/HardwareSerial.h
rename to hardware/cores/wiring/HardwareSerial.h
diff --git a/hardware/targets/wiring/HardwareSerial.o b/hardware/cores/wiring/HardwareSerial.o
similarity index 100%
rename from hardware/targets/wiring/HardwareSerial.o
rename to hardware/cores/wiring/HardwareSerial.o
diff --git a/hardware/targets/wiring/LiquidCrystal.h b/hardware/cores/wiring/LiquidCrystal.h
similarity index 100%
rename from hardware/targets/wiring/LiquidCrystal.h
rename to hardware/cores/wiring/LiquidCrystal.h
diff --git a/hardware/targets/wiring/LiquidCrystal.o b/hardware/cores/wiring/LiquidCrystal.o
similarity index 100%
rename from hardware/targets/wiring/LiquidCrystal.o
rename to hardware/cores/wiring/LiquidCrystal.o
diff --git a/hardware/targets/wiring/Matrix.h b/hardware/cores/wiring/Matrix.h
similarity index 100%
rename from hardware/targets/wiring/Matrix.h
rename to hardware/cores/wiring/Matrix.h
diff --git a/hardware/targets/wiring/Matrix.o b/hardware/cores/wiring/Matrix.o
similarity index 100%
rename from hardware/targets/wiring/Matrix.o
rename to hardware/cores/wiring/Matrix.o
diff --git a/hardware/targets/wiring/QSlide.h b/hardware/cores/wiring/QSlide.h
similarity index 100%
rename from hardware/targets/wiring/QSlide.h
rename to hardware/cores/wiring/QSlide.h
diff --git a/hardware/targets/wiring/QSlide.o b/hardware/cores/wiring/QSlide.o
similarity index 100%
rename from hardware/targets/wiring/QSlide.o
rename to hardware/cores/wiring/QSlide.o
diff --git a/hardware/targets/wiring/Servo.h b/hardware/cores/wiring/Servo.h
similarity index 100%
rename from hardware/targets/wiring/Servo.h
rename to hardware/cores/wiring/Servo.h
diff --git a/hardware/targets/wiring/Servo.o b/hardware/cores/wiring/Servo.o
similarity index 100%
rename from hardware/targets/wiring/Servo.o
rename to hardware/cores/wiring/Servo.o
diff --git a/hardware/targets/wiring/Sprite.h b/hardware/cores/wiring/Sprite.h
similarity index 100%
rename from hardware/targets/wiring/Sprite.h
rename to hardware/cores/wiring/Sprite.h
diff --git a/hardware/targets/wiring/Sprite.o b/hardware/cores/wiring/Sprite.o
similarity index 100%
rename from hardware/targets/wiring/Sprite.o
rename to hardware/cores/wiring/Sprite.o
diff --git a/hardware/targets/wiring/TwoWire.h b/hardware/cores/wiring/TwoWire.h
similarity index 100%
rename from hardware/targets/wiring/TwoWire.h
rename to hardware/cores/wiring/TwoWire.h
diff --git a/hardware/targets/wiring/TwoWire.o b/hardware/cores/wiring/TwoWire.o
similarity index 100%
rename from hardware/targets/wiring/TwoWire.o
rename to hardware/cores/wiring/TwoWire.o
diff --git a/hardware/targets/wiring/WApplet.o b/hardware/cores/wiring/WApplet.o
similarity index 100%
rename from hardware/targets/wiring/WApplet.o
rename to hardware/cores/wiring/WApplet.o
diff --git a/hardware/targets/wiring/WConstants.h b/hardware/cores/wiring/WConstants.h
similarity index 100%
rename from hardware/targets/wiring/WConstants.h
rename to hardware/cores/wiring/WConstants.h
diff --git a/hardware/targets/wiring/WInterrupts.o b/hardware/cores/wiring/WInterrupts.o
similarity index 100%
rename from hardware/targets/wiring/WInterrupts.o
rename to hardware/cores/wiring/WInterrupts.o
diff --git a/hardware/targets/wiring/WProgram.h b/hardware/cores/wiring/WProgram.h
similarity index 100%
rename from hardware/targets/wiring/WProgram.h
rename to hardware/cores/wiring/WProgram.h
diff --git a/hardware/targets/wiring/WRandom.o b/hardware/cores/wiring/WRandom.o
similarity index 100%
rename from hardware/targets/wiring/WRandom.o
rename to hardware/cores/wiring/WRandom.o
diff --git a/hardware/targets/wiring/WTimer.o b/hardware/cores/wiring/WTimer.o
similarity index 100%
rename from hardware/targets/wiring/WTimer.o
rename to hardware/cores/wiring/WTimer.o
diff --git a/hardware/targets/wiring/buffer.h b/hardware/cores/wiring/buffer.h
similarity index 100%
rename from hardware/targets/wiring/buffer.h
rename to hardware/cores/wiring/buffer.h
diff --git a/hardware/targets/wiring/buffer.o b/hardware/cores/wiring/buffer.o
similarity index 100%
rename from hardware/targets/wiring/buffer.o
rename to hardware/cores/wiring/buffer.o
diff --git a/hardware/targets/wiring/twi.h b/hardware/cores/wiring/twi.h
similarity index 100%
rename from hardware/targets/wiring/twi.h
rename to hardware/cores/wiring/twi.h
diff --git a/hardware/targets/wiring/twi.o b/hardware/cores/wiring/twi.o
similarity index 100%
rename from hardware/targets/wiring/twi.o
rename to hardware/cores/wiring/twi.o
diff --git a/hardware/targets/wiring/uart.h b/hardware/cores/wiring/uart.h
similarity index 100%
rename from hardware/targets/wiring/uart.h
rename to hardware/cores/wiring/uart.h
diff --git a/hardware/targets/wiring/uart.o b/hardware/cores/wiring/uart.o
similarity index 100%
rename from hardware/targets/wiring/uart.o
rename to hardware/cores/wiring/uart.o
diff --git a/hardware/firmwares/Standard_Firmata/Makefile b/hardware/firmwares/Standard_Firmata/Makefile
index 6edbf9722..6f73a72d9 100644
--- a/hardware/firmwares/Standard_Firmata/Makefile
+++ b/hardware/firmwares/Standard_Firmata/Makefile
@@ -28,7 +28,7 @@
 #
 #  3. Modify the line containg "ARDUINO" to point the directory that
 #     contains the Arduino core (for normal Arduino installations, this
-#     is the lib/targets/arduino sub-directory).
+#     is the hardware/cores/arduino sub-directory).
 #
 #  4. Modify the line containing "PORT" to refer to the filename
 #     representing the USB or serial connection to your Arduino board
@@ -48,7 +48,7 @@
 PORT = /dev/tty.usbserial-*
 TARGET = Pd_firmware
 ARDUINO = /Applications/arduino-0007
-ARDUINO_SRC = $(ARDUINO)/hardware/targets/arduino
+ARDUINO_SRC = $(ARDUINO)/hardware/cores/arduino
 ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries
 INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \
 	-I$(ARDUINO_LIB_SRC)/EEPROM \