diff --git a/libraries/RobotIRremote/LICENSE.txt b/libraries/RobotIRremote/extras/LICENSE.txt
similarity index 100%
rename from libraries/RobotIRremote/LICENSE.txt
rename to libraries/RobotIRremote/extras/LICENSE.txt
diff --git a/libraries/RobotIRremote/readme b/libraries/RobotIRremote/extras/readme
similarity index 100%
rename from libraries/RobotIRremote/readme
rename to libraries/RobotIRremote/extras/readme
diff --git a/libraries/RobotIRremote/library.properties b/libraries/RobotIRremote/library.properties
new file mode 100644
index 000000000..94ab316ea
--- /dev/null
+++ b/libraries/RobotIRremote/library.properties
@@ -0,0 +1,10 @@
+name=Robot IR Remote
+author=Arduino
+email=info@arduino.cc
+sentence=This library is based on the Ken Shirriff IR-Remote library and is used to send commands to the Arduino Robot Control Board.
+paragraph=
+url=https://github.com/shirriff/Arduino-IRremote
+architectures=avr
+version=1.0
+dependencies=
+core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/RobotIRremote/IRremote.cpp b/libraries/RobotIRremote/src/IRremote.cpp
similarity index 100%
rename from libraries/RobotIRremote/IRremote.cpp
rename to libraries/RobotIRremote/src/IRremote.cpp
diff --git a/libraries/RobotIRremote/IRremote.h b/libraries/RobotIRremote/src/IRremote.h
similarity index 100%
rename from libraries/RobotIRremote/IRremote.h
rename to libraries/RobotIRremote/src/IRremote.h
diff --git a/libraries/RobotIRremote/IRremoteInt.h b/libraries/RobotIRremote/src/IRremoteInt.h
similarity index 100%
rename from libraries/RobotIRremote/IRremoteInt.h
rename to libraries/RobotIRremote/src/IRremoteInt.h
diff --git a/libraries/RobotIRremote/IRremoteTools.cpp b/libraries/RobotIRremote/src/IRremoteTools.cpp
similarity index 100%
rename from libraries/RobotIRremote/IRremoteTools.cpp
rename to libraries/RobotIRremote/src/IRremoteTools.cpp
diff --git a/libraries/RobotIRremote/IRremoteTools.h b/libraries/RobotIRremote/src/IRremoteTools.h
similarity index 100%
rename from libraries/RobotIRremote/IRremoteTools.h
rename to libraries/RobotIRremote/src/IRremoteTools.h