diff --git a/libraries/Bluetooth/examples/BluetoothConfig/BluetoothConfig.ino b/examples/BluetoothConfig/BluetoothConfig.ino
similarity index 100%
rename from libraries/Bluetooth/examples/BluetoothConfig/BluetoothConfig.ino
rename to examples/BluetoothConfig/BluetoothConfig.ino
diff --git a/libraries/Bluetooth/examples/RemoteLED/RemoteLED.ino b/examples/RemoteLED/RemoteLED.ino
similarity index 100%
rename from libraries/Bluetooth/examples/RemoteLED/RemoteLED.ino
rename to examples/RemoteLED/RemoteLED.ino
diff --git a/keywords.txt b/keywords.txt
new file mode 100644
index 0000000..10de43d
--- /dev/null
+++ b/keywords.txt
@@ -0,0 +1,37 @@
+#######################################
+# Syntax Coloring Map For Bluetooth
+# Only 1 tab between values and type!
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+BT	KEYWORD1
+
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin	KEYWORD2
+available	KEYWORD2
+read	KEYWORD2
+write	KEYWORD2
+clearBuffer	KEYWORD2
+connect	KEYWORD2
+disconnect	KEYWORD2
+setName	KEYWORD2
+setPass	KEYWORD2
+setMode	KEYWORD2
+command	KEYWORD2
+search	KEYWORD2
+findBaud	KEYWORD2
+setBaud	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+
+MASTER	LITERAL1
+SLAVE	LITERAL1
+verbose	LITERAL1
\ No newline at end of file
diff --git a/libraries/Bluetooth/keywords.txt b/libraries/Bluetooth/keywords.txt
deleted file mode 100644
index ae093ea..0000000
--- a/libraries/Bluetooth/keywords.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Syntax coloring for Bluetooth library
-#
-
-# Datatypes (Classes)
-BT	KEYWORD3
-Bluetooth	KEYWORD1
-
-# Methods and functions
-begin	KEYWORD2
-available	KEYWORD2
-read	KEYWORD2
-write	KEYWORD2
-clearBuffer	KEYWORD2
-connect	KEYWORD2
-disconnect	KEYWORD2
-setName	KEYWORD2
-setPass	KEYWORD2
-setMode	KEYWORD2
-command	KEYWORD2
-search	KEYWORD2
-findBaud	KEYWORD2
-setBaud	KEYWORD2
-
-# Constants
-MASTER	LITERAL1
-SLAVE	LITERAL1
-verbose	LITERAL1
\ No newline at end of file
diff --git a/library.properties b/library.properties
new file mode 100644
index 0000000..e893aca
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,9 @@
+name=Robopoly Bluetooth
+version=1.5
+author=Karl Kangur, David Perrenoud, Robopoly
+maintainer=Robopoly <robopoly@epfl.ch>
+sentence=This library allows you to use the bluetooth module on the Robopoly Shield.
+paragraph=
+category=Device Control
+url=https://github.com/Robopoly/bluetooth-library
+architectures=avr
\ No newline at end of file
diff --git a/libraries/Bluetooth/Bluetooth.cpp b/src/Bluetooth.cpp
similarity index 100%
rename from libraries/Bluetooth/Bluetooth.cpp
rename to src/Bluetooth.cpp
diff --git a/libraries/Bluetooth/Bluetooth.h b/src/Bluetooth.h
similarity index 100%
rename from libraries/Bluetooth/Bluetooth.h
rename to src/Bluetooth.h