diff --git a/hardware/arduino/avr/libraries/Stepper/examples/MotorKnob/MotorKnob.ino b/libraries/Stepper/examples/MotorKnob/MotorKnob.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/examples/MotorKnob/MotorKnob.ino
rename to libraries/Stepper/examples/MotorKnob/MotorKnob.ino
diff --git a/hardware/arduino/avr/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino b/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino
rename to libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino
diff --git a/hardware/arduino/avr/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino b/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino
rename to libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino
diff --git a/hardware/arduino/avr/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino b/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino
rename to libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino
diff --git a/hardware/arduino/avr/libraries/Stepper/keywords.txt b/libraries/Stepper/keywords.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/keywords.txt
rename to libraries/Stepper/keywords.txt
diff --git a/libraries/Stepper/library.properties b/libraries/Stepper/library.properties
new file mode 100644
index 000000000..9891cfc05
--- /dev/null
+++ b/libraries/Stepper/library.properties
@@ -0,0 +1,10 @@
+name=Stepper
+author= Tom Igoe
+email=info@arduino.cc
+sentence=Drives a unipolar or bipolar stepper motor using 2 wires or 4 wires
+paragraph=This library allows you to control unipolar or bipolar stepper motors. To use it you will need a stepper motor, and the appropriate hardware to control it.
+url=http://arduino.cc/en/Reference/Stepper
+architectures=*
+version=0.4
+dependencies= none
+core-dependencies=arduino (>=1.5.0)
diff --git a/hardware/arduino/avr/libraries/Stepper/Stepper.cpp b/libraries/Stepper/src/Stepper.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/Stepper.cpp
rename to libraries/Stepper/src/Stepper.cpp
diff --git a/hardware/arduino/avr/libraries/Stepper/Stepper.h b/libraries/Stepper/src/Stepper.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Stepper/Stepper.h
rename to libraries/Stepper/src/Stepper.h