diff --git a/WiFi/WiFi.cpp b/libraries/WiFi/WiFi.cpp
similarity index 100%
rename from WiFi/WiFi.cpp
rename to libraries/WiFi/WiFi.cpp
diff --git a/WiFi/WiFi.h b/libraries/WiFi/WiFi.h
similarity index 100%
rename from WiFi/WiFi.h
rename to libraries/WiFi/WiFi.h
diff --git a/WiFi/WiFiClient.cpp b/libraries/WiFi/WiFiClient.cpp
similarity index 100%
rename from WiFi/WiFiClient.cpp
rename to libraries/WiFi/WiFiClient.cpp
diff --git a/WiFi/WiFiClient.h b/libraries/WiFi/WiFiClient.h
similarity index 100%
rename from WiFi/WiFiClient.h
rename to libraries/WiFi/WiFiClient.h
diff --git a/WiFi/WiFiServer.cpp b/libraries/WiFi/WiFiServer.cpp
similarity index 100%
rename from WiFi/WiFiServer.cpp
rename to libraries/WiFi/WiFiServer.cpp
diff --git a/WiFi/WiFiServer.h b/libraries/WiFi/WiFiServer.h
similarity index 100%
rename from WiFi/WiFiServer.h
rename to libraries/WiFi/WiFiServer.h
diff --git a/WiFi/examples/ConnectNoEncryption/ConnectNoEncryption.ino b/libraries/WiFi/examples/ConnectNoEncryption/ConnectNoEncryption.ino
similarity index 100%
rename from WiFi/examples/ConnectNoEncryption/ConnectNoEncryption.ino
rename to libraries/WiFi/examples/ConnectNoEncryption/ConnectNoEncryption.ino
diff --git a/WiFi/examples/ConnectWithWEP/ConnectWithWEP.ino b/libraries/WiFi/examples/ConnectWithWEP/ConnectWithWEP.ino
similarity index 100%
rename from WiFi/examples/ConnectWithWEP/ConnectWithWEP.ino
rename to libraries/WiFi/examples/ConnectWithWEP/ConnectWithWEP.ino
diff --git a/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino b/libraries/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino
similarity index 100%
rename from WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino
rename to libraries/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino
diff --git a/WiFi/examples/ScanNetworks/ScanNetworks.ino b/libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino
similarity index 100%
rename from WiFi/examples/ScanNetworks/ScanNetworks.ino
rename to libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino
diff --git a/WiFi/examples/WifiChatServer/WifiChatServer.ino b/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
similarity index 100%
rename from WiFi/examples/WifiChatServer/WifiChatServer.ino
rename to libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
diff --git a/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino b/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
similarity index 100%
rename from WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
rename to libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
diff --git a/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino b/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
similarity index 100%
rename from WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
rename to libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
diff --git a/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino b/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
similarity index 100%
rename from WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
rename to libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
diff --git a/WiFi/examples/WifiWebClient/WifiWebClient.ino b/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
similarity index 100%
rename from WiFi/examples/WifiWebClient/WifiWebClient.ino
rename to libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
diff --git a/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino b/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
similarity index 100%
rename from WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
rename to libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
diff --git a/WiFi/examples/WifiWebServer/WifiWebServer.ino b/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
similarity index 100%
rename from WiFi/examples/WifiWebServer/WifiWebServer.ino
rename to libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
diff --git a/WiFi/keywords.txt b/libraries/WiFi/keywords.txt
similarity index 100%
rename from WiFi/keywords.txt
rename to libraries/WiFi/keywords.txt
diff --git a/WiFi/utility/debug.h b/libraries/WiFi/utility/debug.h
similarity index 100%
rename from WiFi/utility/debug.h
rename to libraries/WiFi/utility/debug.h
diff --git a/WiFi/utility/server_drv.cpp b/libraries/WiFi/utility/server_drv.cpp
similarity index 100%
rename from WiFi/utility/server_drv.cpp
rename to libraries/WiFi/utility/server_drv.cpp
diff --git a/WiFi/utility/server_drv.h b/libraries/WiFi/utility/server_drv.h
similarity index 100%
rename from WiFi/utility/server_drv.h
rename to libraries/WiFi/utility/server_drv.h
diff --git a/WiFi/utility/socket.c b/libraries/WiFi/utility/socket.c
similarity index 100%
rename from WiFi/utility/socket.c
rename to libraries/WiFi/utility/socket.c
diff --git a/WiFi/utility/socket.h b/libraries/WiFi/utility/socket.h
similarity index 100%
rename from WiFi/utility/socket.h
rename to libraries/WiFi/utility/socket.h
diff --git a/WiFi/utility/spi_drv.cpp b/libraries/WiFi/utility/spi_drv.cpp
similarity index 100%
rename from WiFi/utility/spi_drv.cpp
rename to libraries/WiFi/utility/spi_drv.cpp
diff --git a/WiFi/utility/spi_drv.h b/libraries/WiFi/utility/spi_drv.h
similarity index 100%
rename from WiFi/utility/spi_drv.h
rename to libraries/WiFi/utility/spi_drv.h
diff --git a/WiFi/utility/wifi_drv.cpp b/libraries/WiFi/utility/wifi_drv.cpp
similarity index 100%
rename from WiFi/utility/wifi_drv.cpp
rename to libraries/WiFi/utility/wifi_drv.cpp
diff --git a/WiFi/utility/wifi_drv.h b/libraries/WiFi/utility/wifi_drv.h
similarity index 100%
rename from WiFi/utility/wifi_drv.h
rename to libraries/WiFi/utility/wifi_drv.h
diff --git a/WiFi/utility/wifi_spi.h b/libraries/WiFi/utility/wifi_spi.h
similarity index 100%
rename from WiFi/utility/wifi_spi.h
rename to libraries/WiFi/utility/wifi_spi.h
diff --git a/WiFi/utility/wl_definitions.h b/libraries/WiFi/utility/wl_definitions.h
similarity index 100%
rename from WiFi/utility/wl_definitions.h
rename to libraries/WiFi/utility/wl_definitions.h
diff --git a/WiFi/utility/wl_types.h b/libraries/WiFi/utility/wl_types.h
similarity index 100%
rename from WiFi/utility/wl_types.h
rename to libraries/WiFi/utility/wl_types.h