diff --git a/hardware/arduino/avr/libraries/SpacebrewYun/keywords.txt b/libraries/SpacebrewYun/keywords.txt
similarity index 86%
rename from hardware/arduino/avr/libraries/SpacebrewYun/keywords.txt
rename to libraries/SpacebrewYun/keywords.txt
index 7d8667a18..20db0451e 100644
--- a/hardware/arduino/avr/libraries/SpacebrewYun/keywords.txt
+++ b/libraries/SpacebrewYun/keywords.txt
@@ -1,4 +1,4 @@
-SpacebrewYun	KEYWORD1
+SpacebrewYun	KEYWORD3
 addPublish	KEYWORD2
 addSubscribe	KEYWORD2
 connect	KEYWORD2
@@ -12,4 +12,4 @@ onBooleanMessage	KEYWORD2
 onCustomMessage	KEYWORD2
 onOpen	KEYWORD2
 onClose	KEYWORD2
-onError	KEYWORD2
\ No newline at end of file
+onError	KEYWORD2
diff --git a/libraries/SpacebrewYun/library.properties b/libraries/SpacebrewYun/library.properties
new file mode 100644
index 000000000..a29bb7511
--- /dev/null
+++ b/libraries/SpacebrewYun/library.properties
@@ -0,0 +1,10 @@
+name=SpacebrewYun
+author=
+email=
+sentence=
+paragraph=
+url=
+architectures=avr
+version=1.0
+dependencies=
+core-dependencies=arduino (>=1.5.0)
diff --git a/hardware/arduino/avr/libraries/SpacebrewYun/SpacebrewYun.cpp b/libraries/SpacebrewYun/src/SpacebrewYun.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SpacebrewYun/SpacebrewYun.cpp
rename to libraries/SpacebrewYun/src/SpacebrewYun.cpp
diff --git a/hardware/arduino/avr/libraries/SpacebrewYun/SpacebrewYun.h b/libraries/SpacebrewYun/src/SpacebrewYun.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SpacebrewYun/SpacebrewYun.h
rename to libraries/SpacebrewYun/src/SpacebrewYun.h