diff --git a/example/brokerClient/brokerClient.ino b/examples/brokerClient/brokerClient.ino
similarity index 100%
rename from example/brokerClient/brokerClient.ino
rename to examples/brokerClient/brokerClient.ino
diff --git a/example/sPSN_Broker/sPSN_Broker.ino b/examples/sPSN_Broker/sPSN_Broker.ino
similarity index 100%
rename from example/sPSN_Broker/sPSN_Broker.ino
rename to examples/sPSN_Broker/sPSN_Broker.ino
diff --git a/example/sPSN_Chat/sPSN_Chat.ino b/examples/sPSN_Chat/sPSN_Chat.ino
similarity index 100%
rename from example/sPSN_Chat/sPSN_Chat.ino
rename to examples/sPSN_Chat/sPSN_Chat.ino
diff --git a/example/sPSN_Client1/sPSN_Client1.ino b/examples/sPSN_Client1/sPSN_Client1.ino
similarity index 100%
rename from example/sPSN_Client1/sPSN_Client1.ino
rename to examples/sPSN_Client1/sPSN_Client1.ino
diff --git a/example/sPSN_Client2/sPSN_Client2.ino b/examples/sPSN_Client2/sPSN_Client2.ino
similarity index 100%
rename from example/sPSN_Client2/sPSN_Client2.ino
rename to examples/sPSN_Client2/sPSN_Client2.ino
diff --git a/example/sPSN_Server/sPSN_Server.ino b/examples/sPSN_Server/sPSN_Server.ino
similarity index 100%
rename from example/sPSN_Server/sPSN_Server.ino
rename to examples/sPSN_Server/sPSN_Server.ino
diff --git a/keywords.txt b/keywords.txt
index b76b4a1f3129a816029dc65565fd85098589e86a..65ad9e5f2a21b798d29803b614b1849510abd967 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -6,9 +6,9 @@
 # Datatypes (KEYWORD1)
 #######################################
 
-didacticPSNet	KEYWORD1	SD
-didacticPSNetBroker	KEYWORD1	SD
-didacticPSNetClient	KEYWORD1	SD
+didacticPSNet		KEYWORD1
+didacticPSNetBroker	KEYWORD1
+didacticPSNetClient	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
@@ -25,16 +25,16 @@ unsubscribe	KEYWORD2
 #######################################
 # Constants (LITERAL1)
 #######################################
-MSG_PRELIMITER	LITERAL1
-MSG_DELIMITER	LITERAL1
-MSG_SEPARATOR	LITERAL1
+MSG_PRELIMITER		LITERAL1
+MSG_DELIMITER		LITERAL1
+MSG_SEPARATOR		LITERAL1
 
-MSG_PUBLISH	LITERAL1
-MSG_SUBSCRIBE	LITERAL1
-MSG_UPDATE	LITERAL1
+MSG_PUBLISH		LITERAL1
+MSG_SUBSCRIBE		LITERAL1
+MSG_UPDATE		LITERAL1
 MSG_TOPIC_MULTI	LITERAL1
 
 MAX_NR_TOPICS_CLIENT	LITERAL1
 MAX_NR_TOPICS_BROKER	LITERAL1
-MAX_LEN_TOPICS	LITERAL1
-MAX_LEN_DATA	LITERAL1
+MAX_LEN_TOPICS		LITERAL1
+MAX_LEN_DATA		LITERAL1