diff --git a/core/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
similarity index 100%
rename from core/HardwareSerial.cpp
rename to cores/arduino/HardwareSerial.cpp
diff --git a/core/HardwareSerial.h b/cores/arduino/HardwareSerial.h
similarity index 100%
rename from core/HardwareSerial.h
rename to cores/arduino/HardwareSerial.h
diff --git a/core/Makefile b/cores/arduino/Makefile
similarity index 100%
rename from core/Makefile
rename to cores/arduino/Makefile
diff --git a/core/Print.cpp b/cores/arduino/Print.cpp
similarity index 100%
rename from core/Print.cpp
rename to cores/arduino/Print.cpp
diff --git a/core/Print.h b/cores/arduino/Print.h
similarity index 100%
rename from core/Print.h
rename to cores/arduino/Print.h
diff --git a/core/WConstants.h b/cores/arduino/WConstants.h
similarity index 100%
rename from core/WConstants.h
rename to cores/arduino/WConstants.h
diff --git a/core/WInterrupts.c b/cores/arduino/WInterrupts.c
similarity index 100%
rename from core/WInterrupts.c
rename to cores/arduino/WInterrupts.c
diff --git a/core/WMath.cpp b/cores/arduino/WMath.cpp
similarity index 100%
rename from core/WMath.cpp
rename to cores/arduino/WMath.cpp
diff --git a/core/WProgram.h b/cores/arduino/WProgram.h
similarity index 100%
rename from core/WProgram.h
rename to cores/arduino/WProgram.h
diff --git a/core/binary.h b/cores/arduino/binary.h
similarity index 100%
rename from core/binary.h
rename to cores/arduino/binary.h
diff --git a/core/main.cpp b/cores/arduino/main.cpp
similarity index 100%
rename from core/main.cpp
rename to cores/arduino/main.cpp
diff --git a/core/pins_arduino.c b/cores/arduino/pins_arduino.c
similarity index 100%
rename from core/pins_arduino.c
rename to cores/arduino/pins_arduino.c
diff --git a/core/pins_arduino.h b/cores/arduino/pins_arduino.h
similarity index 100%
rename from core/pins_arduino.h
rename to cores/arduino/pins_arduino.h
diff --git a/core/wiring.c b/cores/arduino/wiring.c
similarity index 100%
rename from core/wiring.c
rename to cores/arduino/wiring.c
diff --git a/core/wiring.h b/cores/arduino/wiring.h
similarity index 100%
rename from core/wiring.h
rename to cores/arduino/wiring.h
diff --git a/core/wiring_analog.c b/cores/arduino/wiring_analog.c
similarity index 100%
rename from core/wiring_analog.c
rename to cores/arduino/wiring_analog.c
diff --git a/core/wiring_digital.c b/cores/arduino/wiring_digital.c
similarity index 100%
rename from core/wiring_digital.c
rename to cores/arduino/wiring_digital.c
diff --git a/core/wiring_private.h b/cores/arduino/wiring_private.h
similarity index 100%
rename from core/wiring_private.h
rename to cores/arduino/wiring_private.h
diff --git a/core/wiring_pulse.c b/cores/arduino/wiring_pulse.c
similarity index 100%
rename from core/wiring_pulse.c
rename to cores/arduino/wiring_pulse.c
diff --git a/core/wiring_shift.c b/cores/arduino/wiring_shift.c
similarity index 100%
rename from core/wiring_shift.c
rename to cores/arduino/wiring_shift.c