diff --git a/hardware/arduino/avr/libraries/GSM/GSM3CircularBuffer.cpp b/libraries/GSM/arch/avr/GSM3CircularBuffer.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3CircularBuffer.cpp
rename to libraries/GSM/arch/avr/GSM3CircularBuffer.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3CircularBuffer.h b/libraries/GSM/arch/avr/GSM3CircularBuffer.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3CircularBuffer.h
rename to libraries/GSM/arch/avr/GSM3CircularBuffer.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileAccessProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileAccessProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileAccessProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileAccessProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileAccessProvider.h b/libraries/GSM/arch/avr/GSM3MobileAccessProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileAccessProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileAccessProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileCellManagement.cpp b/libraries/GSM/arch/avr/GSM3MobileCellManagement.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileCellManagement.cpp
rename to libraries/GSM/arch/avr/GSM3MobileCellManagement.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileCellManagement.h b/libraries/GSM/arch/avr/GSM3MobileCellManagement.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileCellManagement.h
rename to libraries/GSM/arch/avr/GSM3MobileCellManagement.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileClientProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileClientProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileClientProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileClientProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileClientProvider.h b/libraries/GSM/arch/avr/GSM3MobileClientProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileClientProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileClientProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileClientService.cpp b/libraries/GSM/arch/avr/GSM3MobileClientService.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileClientService.cpp
rename to libraries/GSM/arch/avr/GSM3MobileClientService.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileClientService.h b/libraries/GSM/arch/avr/GSM3MobileClientService.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileClientService.h
rename to libraries/GSM/arch/avr/GSM3MobileClientService.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileDataNetworkProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileDataNetworkProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileDataNetworkProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileDataNetworkProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileDataNetworkProvider.h b/libraries/GSM/arch/avr/GSM3MobileDataNetworkProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileDataNetworkProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileDataNetworkProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileMockupProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileMockupProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileMockupProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileMockupProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileMockupProvider.h b/libraries/GSM/arch/avr/GSM3MobileMockupProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileMockupProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileMockupProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileNetworkProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileNetworkProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkProvider.h b/libraries/GSM/arch/avr/GSM3MobileNetworkProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileNetworkProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkRegistry.cpp b/libraries/GSM/arch/avr/GSM3MobileNetworkRegistry.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkRegistry.cpp
rename to libraries/GSM/arch/avr/GSM3MobileNetworkRegistry.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkRegistry.h b/libraries/GSM/arch/avr/GSM3MobileNetworkRegistry.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileNetworkRegistry.h
rename to libraries/GSM/arch/avr/GSM3MobileNetworkRegistry.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileSMSProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileSMSProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileSMSProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileSMSProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileSMSProvider.h b/libraries/GSM/arch/avr/GSM3MobileSMSProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileSMSProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileSMSProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileServerProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileServerProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileServerProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileServerProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileServerProvider.h b/libraries/GSM/arch/avr/GSM3MobileServerProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileServerProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileServerProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileServerService.cpp b/libraries/GSM/arch/avr/GSM3MobileServerService.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileServerService.cpp
rename to libraries/GSM/arch/avr/GSM3MobileServerService.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileServerService.h b/libraries/GSM/arch/avr/GSM3MobileServerService.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileServerService.h
rename to libraries/GSM/arch/avr/GSM3MobileServerService.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileVoiceProvider.cpp b/libraries/GSM/arch/avr/GSM3MobileVoiceProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileVoiceProvider.cpp
rename to libraries/GSM/arch/avr/GSM3MobileVoiceProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3MobileVoiceProvider.h b/libraries/GSM/arch/avr/GSM3MobileVoiceProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3MobileVoiceProvider.h
rename to libraries/GSM/arch/avr/GSM3MobileVoiceProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3SMSService.cpp b/libraries/GSM/arch/avr/GSM3SMSService.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3SMSService.cpp
rename to libraries/GSM/arch/avr/GSM3SMSService.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3SMSService.h b/libraries/GSM/arch/avr/GSM3SMSService.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3SMSService.h
rename to libraries/GSM/arch/avr/GSM3SMSService.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1.h b/libraries/GSM/arch/avr/GSM3ShieldV1.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1AccessProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1AccessProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1AccessProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1AccessProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1AccessProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1AccessProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1AccessProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1AccessProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BandManagement.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1BandManagement.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BandManagement.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1BandManagement.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BandManagement.h b/libraries/GSM/arch/avr/GSM3ShieldV1BandManagement.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BandManagement.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1BandManagement.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BaseProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1BaseProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BaseProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1BaseProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BaseProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1BaseProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1BaseProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1BaseProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1CellManagement.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1CellManagement.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1CellManagement.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1CellManagement.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1CellManagement.h b/libraries/GSM/arch/avr/GSM3ShieldV1CellManagement.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1CellManagement.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1CellManagement.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ClientProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1ClientProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ClientProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1ClientProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ClientProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1ClientProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ClientProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1ClientProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DataNetworkProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1DataNetworkProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DataNetworkProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1DataNetworkProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DataNetworkProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1DataNetworkProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DataNetworkProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1DataNetworkProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DirectModemProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1DirectModemProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DirectModemProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1DirectModemProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DirectModemProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1DirectModemProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1DirectModemProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1DirectModemProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemCore.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1ModemCore.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemCore.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1ModemCore.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemCore.h b/libraries/GSM/arch/avr/GSM3ShieldV1ModemCore.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemCore.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1ModemCore.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemVerification.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1ModemVerification.cpp
similarity index 98%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemVerification.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1ModemVerification.cpp
index e5d190fb0..1ad15e9e9 100644
--- a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemVerification.cpp
+++ b/libraries/GSM/arch/avr/GSM3ShieldV1ModemVerification.cpp
@@ -69,7 +69,7 @@ String GSM3ShieldV1ModemVerification::getIMEI()
 	modemResponse.toCharArray(res_to_compare, modemResponse.length());
 	if(strstr(res_to_compare,"OK") == NULL)
 	{	
-		return NULL;
+		return String(NULL);
 	}
 	else
 	{
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemVerification.h b/libraries/GSM/arch/avr/GSM3ShieldV1ModemVerification.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ModemVerification.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1ModemVerification.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiClientProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1MultiClientProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiClientProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1MultiClientProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiClientProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1MultiClientProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiClientProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1MultiClientProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiServerProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1MultiServerProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiServerProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1MultiServerProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiServerProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1MultiServerProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1MultiServerProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1MultiServerProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1PinManagement.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1PinManagement.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1PinManagement.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1PinManagement.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1PinManagement.h b/libraries/GSM/arch/avr/GSM3ShieldV1PinManagement.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1PinManagement.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1PinManagement.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1SMSProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1SMSProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1SMSProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1SMSProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1SMSProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1SMSProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1SMSProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1SMSProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ScanNetworks.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1ScanNetworks.cpp
similarity index 98%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ScanNetworks.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1ScanNetworks.cpp
index 23da8a6b4..9d7ea6b13 100644
--- a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ScanNetworks.cpp
+++ b/libraries/GSM/arch/avr/GSM3ShieldV1ScanNetworks.cpp
@@ -63,7 +63,7 @@ String GSM3ShieldV1ScanNetworks::getCurrentCarrier()
 		String final_result = ptr_token;
 		return final_result;
 	}else{
-		return NULL;
+		return String(NULL);
 	}
 }
 
@@ -82,7 +82,7 @@ String GSM3ShieldV1ScanNetworks::getSignalStrength()
 		final_result.trim();
 		return final_result;
 	}else{
-		return NULL;
+		return String(NULL);
 	}
 }
 
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ScanNetworks.h b/libraries/GSM/arch/avr/GSM3ShieldV1ScanNetworks.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ScanNetworks.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1ScanNetworks.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ServerProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1ServerProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ServerProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1ServerProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ServerProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1ServerProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1ServerProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1ServerProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1VoiceProvider.cpp b/libraries/GSM/arch/avr/GSM3ShieldV1VoiceProvider.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1VoiceProvider.cpp
rename to libraries/GSM/arch/avr/GSM3ShieldV1VoiceProvider.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3ShieldV1VoiceProvider.h b/libraries/GSM/arch/avr/GSM3ShieldV1VoiceProvider.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3ShieldV1VoiceProvider.h
rename to libraries/GSM/arch/avr/GSM3ShieldV1VoiceProvider.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3SoftSerial.cpp b/libraries/GSM/arch/avr/GSM3SoftSerial.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3SoftSerial.cpp
rename to libraries/GSM/arch/avr/GSM3SoftSerial.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3SoftSerial.h b/libraries/GSM/arch/avr/GSM3SoftSerial.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3SoftSerial.h
rename to libraries/GSM/arch/avr/GSM3SoftSerial.h
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3VoiceCallService.cpp b/libraries/GSM/arch/avr/GSM3VoiceCallService.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3VoiceCallService.cpp
rename to libraries/GSM/arch/avr/GSM3VoiceCallService.cpp
diff --git a/hardware/arduino/avr/libraries/GSM/GSM3VoiceCallService.h b/libraries/GSM/arch/avr/GSM3VoiceCallService.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM3VoiceCallService.h
rename to libraries/GSM/arch/avr/GSM3VoiceCallService.h
diff --git a/hardware/arduino/avr/libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino b/libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino
rename to libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino b/libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino
rename to libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/GsmTwitterClient/GsmTwitterClient.ino b/libraries/GSM/examples/GsmTwitterClient/GsmTwitterClient.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/GsmTwitterClient/GsmTwitterClient.ino
rename to libraries/GSM/examples/GsmTwitterClient/GsmTwitterClient.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino b/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
rename to libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino b/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
rename to libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino b/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
rename to libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino b/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino
rename to libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino b/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino
rename to libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/SendSMS/SendSMS.ino b/libraries/GSM/examples/SendSMS/SendSMS.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/SendSMS/SendSMS.ino
rename to libraries/GSM/examples/SendSMS/SendSMS.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino b/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino
rename to libraries/GSM/examples/Tools/BandManagement/BandManagement.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino b/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino
rename to libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino b/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino
rename to libraries/GSM/examples/Tools/PinManagement/PinManagement.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino b/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino
rename to libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/TestModem/TestModem.ino b/libraries/GSM/examples/Tools/TestModem/TestModem.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/TestModem/TestModem.ino
rename to libraries/GSM/examples/Tools/TestModem/TestModem.ino
diff --git a/hardware/arduino/avr/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino b/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
rename to libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
diff --git a/hardware/arduino/avr/libraries/GSM/License.txt b/libraries/GSM/extras/License.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/License.txt
rename to libraries/GSM/extras/License.txt
diff --git a/hardware/arduino/avr/libraries/GSM/keywords.txt b/libraries/GSM/keywords.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/keywords.txt
rename to libraries/GSM/keywords.txt
diff --git a/libraries/GSM/library.properties b/libraries/GSM/library.properties
new file mode 100644
index 000000000..da79c230d
--- /dev/null
+++ b/libraries/GSM/library.properties
@@ -0,0 +1,10 @@
+name=GSM
+author=Arduino, Telefonica+ID
+email=info@arduino.cc
+sentence=With this library you can use the Arduino GSM shield to connect on GSM and GPRS networks
+paragraph=Use this library to make/receive voice calls, to send and receive SMS with the Quectel M10 GSM module.</br>This library also allows you to connect to internet through the GPRS networks. You can either use web Clients and Servers.</br>
+url=http://arduino.cc/en/Reference/GSM
+architectures=avr
+version=1.0
+dependencies= Software Serial
+core-dependencies=arduino (>=1.5.0)
diff --git a/hardware/arduino/avr/libraries/GSM/GSM.h b/libraries/GSM/src/GSM.h
similarity index 100%
rename from hardware/arduino/avr/libraries/GSM/GSM.h
rename to libraries/GSM/src/GSM.h