diff --git a/example/async-rest/async-rest-jar/pom.xml b/examples/example/async-rest/async-rest-jar/pom.xml
similarity index 100%
rename from example/async-rest/async-rest-jar/pom.xml
rename to examples/example/async-rest/async-rest-jar/pom.xml
diff --git a/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java b/examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
rename to examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
diff --git a/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java b/examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
rename to examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
diff --git a/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java b/examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java
rename to examples/example/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java
diff --git a/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html b/examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html
rename to examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html
diff --git a/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png b/examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png
rename to examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png
diff --git a/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png b/examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png
rename to examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png
diff --git a/example/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml b/examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
similarity index 100%
rename from example/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
rename to examples/example/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
diff --git a/example/async-rest/async-rest-webapp/pom.xml b/examples/example/async-rest/async-rest-webapp/pom.xml
similarity index 100%
rename from example/async-rest/async-rest-webapp/pom.xml
rename to examples/example/async-rest/async-rest-webapp/pom.xml
diff --git a/example/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF b/examples/example/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from example/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF
rename to examples/example/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/examples/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
similarity index 100%
rename from example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
rename to examples/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
diff --git a/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml b/examples/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml
rename to examples/example/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/example/async-rest/async-rest-webapp/src/main/webapp/index.html b/examples/example/async-rest/async-rest-webapp/src/main/webapp/index.html
similarity index 100%
rename from example/async-rest/async-rest-webapp/src/main/webapp/index.html
rename to examples/example/async-rest/async-rest-webapp/src/main/webapp/index.html
diff --git a/example/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java b/examples/example/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
similarity index 100%
rename from example/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
rename to examples/example/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
diff --git a/example/async-rest/pom.xml b/examples/example/async-rest/pom.xml
similarity index 100%
rename from example/async-rest/pom.xml
rename to examples/example/async-rest/pom.xml
diff --git a/example/embedded/pom.xml b/examples/example/embedded/pom.xml
similarity index 100%
rename from example/embedded/pom.xml
rename to examples/example/embedded/pom.xml
diff --git a/example/embedded/prodDb.properties b/examples/example/embedded/prodDb.properties
similarity index 100%
rename from example/embedded/prodDb.properties
rename to examples/example/embedded/prodDb.properties
diff --git a/example/embedded/prodDb.script b/examples/example/embedded/prodDb.script
similarity index 100%
rename from example/embedded/prodDb.script
rename to examples/example/embedded/prodDb.script
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
diff --git a/example/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java b/examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java
similarity index 100%
rename from example/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java
rename to examples/example/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java
diff --git a/example/embedded/src/main/resources/fileserver.xml b/examples/example/embedded/src/main/resources/fileserver.xml
similarity index 100%
rename from example/embedded/src/main/resources/fileserver.xml
rename to examples/example/embedded/src/main/resources/fileserver.xml
diff --git a/example/embedded/src/main/resources/jetty-logging.properties b/examples/example/embedded/src/main/resources/jetty-logging.properties
similarity index 100%
rename from example/embedded/src/main/resources/jetty-logging.properties
rename to examples/example/embedded/src/main/resources/jetty-logging.properties
diff --git a/example/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java b/examples/example/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
similarity index 100%
rename from example/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
rename to examples/example/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
diff --git a/example/embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java b/examples/example/embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
similarity index 100%
rename from example/embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
rename to examples/example/embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
diff --git a/example/embedded/src/test/resources/dir0/test0.txt b/examples/example/embedded/src/test/resources/dir0/test0.txt
similarity index 100%
rename from example/embedded/src/test/resources/dir0/test0.txt
rename to examples/example/embedded/src/test/resources/dir0/test0.txt
diff --git a/example/embedded/src/test/resources/dir1/test1.txt b/examples/example/embedded/src/test/resources/dir1/test1.txt
similarity index 100%
rename from example/embedded/src/test/resources/dir1/test1.txt
rename to examples/example/embedded/src/test/resources/dir1/test1.txt
diff --git a/example/embedded/src/test/resources/realm.properties b/examples/example/embedded/src/test/resources/realm.properties
similarity index 100%
rename from example/embedded/src/test/resources/realm.properties
rename to examples/example/embedded/src/test/resources/realm.properties