diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserConfigurator.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
similarity index 96%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserConfigurator.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
index 49d770530e7..1c4105122c8 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserConfigurator.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
@@ -16,16 +16,17 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
-import org.eclipse.jetty.http.QuotedCSV;
+import java.util.Collections;
+import java.util.List;
 
 import javax.websocket.Extension;
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import java.util.Collections;
-import java.util.List;
+
+import org.eclipse.jetty.http.QuotedCSV;
 
 public class JsrBrowserConfigurator extends ServerEndpointConfig.Configurator
 {
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
similarity index 98%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
index 75afd0e50cf..21563f1ed7c 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserSocket.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
similarity index 99%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserSocket.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
index a9e9c291598..95ebf8fad8e 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserSocket.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
@@ -16,11 +16,14 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
-import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.Random;
+import java.util.Set;
 
 import javax.websocket.CloseReason;
 import javax.websocket.OnClose;
@@ -29,12 +32,10 @@ import javax.websocket.OnOpen;
 import javax.websocket.RemoteEndpoint.Async;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
+
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
 
 @ServerEndpoint(value = "/", subprotocols = { "tool" }, configurator = JsrBrowserConfigurator.class)
 public class JsrBrowserSocket
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionConfigurator.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
similarity index 95%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionConfigurator.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
index c96964b5ea3..3e8850bd06b 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionConfigurator.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.HandshakeResponse;
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionSocket.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
similarity index 96%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionSocket.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
index 305a6e112c0..926c369a357 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionSocket.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
@@ -16,7 +16,9 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
+
+import java.io.IOException;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.EndpointConfig;
@@ -24,7 +26,6 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
 
 @ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class)
 public class GetHttpSessionSocket
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedConfigurator.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
similarity index 96%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedConfigurator.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
index 000c8e3c9c9..e13d7de1eda 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedConfigurator.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
@@ -16,12 +16,13 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
+
+import java.security.Principal;
 
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import java.security.Principal;
 
 public class MyAuthedConfigurator extends ServerEndpointConfig.Configurator
 {
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedSocket.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
similarity index 95%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedSocket.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
index 74fe7c3e1c9..f09d8f17584 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedSocket.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
 import javax.websocket.OnMessage;
 import javax.websocket.server.ServerEndpoint;
diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/StreamingEchoSocket.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
similarity index 95%
rename from jetty-websocket/javax-websocket-server/src/test/java/examples/StreamingEchoSocket.java
rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
index 7cf4448beae..9fd77e69033 100644
--- a/jetty-websocket/javax-websocket-server/src/test/java/examples/StreamingEchoSocket.java
+++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
@@ -16,16 +16,17 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
-import org.eclipse.jetty.util.IO;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 
 import javax.websocket.OnMessage;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
+
+import org.eclipse.jetty.util.IO;
 
 @ServerEndpoint("/echo")
 public class StreamingEchoSocket