diff --git a/examples/arduino/EspLinkSample/EspLink.cpp b/examples/arduino/libraries/EspLink/EspLink.cpp
similarity index 100%
rename from examples/arduino/EspLinkSample/EspLink.cpp
rename to examples/arduino/libraries/EspLink/EspLink.cpp
diff --git a/examples/arduino/EspLinkSample/EspLink.h b/examples/arduino/libraries/EspLink/EspLink.h
similarity index 100%
rename from examples/arduino/EspLinkSample/EspLink.h
rename to examples/arduino/libraries/EspLink/EspLink.h
diff --git a/examples/arduino/EspLinkSample/WebServer.cpp b/examples/arduino/libraries/EspLink/WebServer.cpp
similarity index 100%
rename from examples/arduino/EspLinkSample/WebServer.cpp
rename to examples/arduino/libraries/EspLink/WebServer.cpp
diff --git a/examples/arduino/EspLinkSample/WebServer.h b/examples/arduino/libraries/EspLink/WebServer.h
similarity index 100%
rename from examples/arduino/EspLinkSample/WebServer.h
rename to examples/arduino/libraries/EspLink/WebServer.h
diff --git a/examples/arduino/EspLinkSample/EspLinkSample.ino b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/EspLinkWebApp.ino
similarity index 96%
rename from examples/arduino/EspLinkSample/EspLinkSample.ino
rename to examples/arduino/libraries/EspLink/examples/EspLinkWebApp/EspLinkWebApp.ino
index ee47a9d..3f6dbaf 100644
--- a/examples/arduino/EspLinkSample/EspLinkSample.ino
+++ b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/EspLinkWebApp.ino
@@ -1,3 +1,4 @@
+#include "EspLink.h"
 #include "WebServer.h"
 #include "Pages.h"
 
diff --git a/examples/arduino/EspLinkSample/LedPage.ino b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/LedPage.ino
similarity index 100%
rename from examples/arduino/EspLinkSample/LedPage.ino
rename to examples/arduino/libraries/EspLink/examples/EspLinkWebApp/LedPage.ino
diff --git a/examples/arduino/EspLinkSample/Pages.h b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/Pages.h
similarity index 100%
rename from examples/arduino/EspLinkSample/Pages.h
rename to examples/arduino/libraries/EspLink/examples/EspLinkWebApp/Pages.h
diff --git a/examples/arduino/EspLinkSample/UserPage.ino b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/UserPage.ino
similarity index 100%
rename from examples/arduino/EspLinkSample/UserPage.ino
rename to examples/arduino/libraries/EspLink/examples/EspLinkWebApp/UserPage.ino
diff --git a/examples/arduino/EspLinkSample/VoltagePage.ino b/examples/arduino/libraries/EspLink/examples/EspLinkWebApp/VoltagePage.ino
similarity index 100%
rename from examples/arduino/EspLinkSample/VoltagePage.ino
rename to examples/arduino/libraries/EspLink/examples/EspLinkWebApp/VoltagePage.ino
diff --git a/examples/arduino/libraries/readme.txt b/examples/arduino/libraries/readme.txt
new file mode 100644
index 0000000..96ce674
--- /dev/null
+++ b/examples/arduino/libraries/readme.txt
@@ -0,0 +1 @@
+For information on installing libraries, see: http://www.arduino.cc/en/Guide/Libraries