diff --git a/libraries/SoftwareSerial/arch/avr/SoftwareSerial.cpp b/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 95%
rename from libraries/SoftwareSerial/arch/avr/SoftwareSerial.cpp
rename to hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
index 2d6db602f..64496febb 100644
--- a/libraries/SoftwareSerial/arch/avr/SoftwareSerial.cpp
+++ b/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
@@ -41,7 +41,7 @@ http://arduiniana.org.
 #include <avr/interrupt.h>
 #include <avr/pgmspace.h>
 #include <Arduino.h>
-#include <SoftwareSerial_Class.h>
+#include <SoftwareSerial.h>
 //
 // Lookup table
 //
diff --git a/libraries/SoftwareSerial/arch/avr/SoftwareSerial_Class.h b/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from libraries/SoftwareSerial/arch/avr/SoftwareSerial_Class.h
rename to hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/hardware/arduino/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
similarity index 100%
rename from libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
rename to hardware/arduino/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
diff --git a/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino b/hardware/arduino/avr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
similarity index 100%
rename from libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
rename to hardware/arduino/avr/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
diff --git a/libraries/SoftwareSerial/keywords.txt b/hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from libraries/SoftwareSerial/keywords.txt
rename to hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt
diff --git a/libraries/SoftwareSerial/library.properties b/libraries/SoftwareSerial/library.properties
deleted file mode 100644
index e542509c9..000000000
--- a/libraries/SoftwareSerial/library.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-name=SoftwareSerial
-author=
-email=
-sentence=Emulate a serial port via software
-paragraph=You can choose two Arduino pins and use them as RX and TX channels of a serial interface.</br>This library emulate in software the behaviour of a serial interface.</br>For the RX pis in mandatory to use a pin with the PinChange interrupt capability.
-url=http://arduino.cc/en/Reference/SoftwareSerial
-architectures=avr
-version=1.0
-dependencies=
-core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.h b/libraries/SoftwareSerial/src/SoftwareSerial.h
deleted file mode 100644
index 3f0d13862..000000000
--- a/libraries/SoftwareSerial/src/SoftwareSerial.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <SoftwareSerial_Class.h>