diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
index d50c87dca..d499fc1ac 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
@@ -158,7 +158,7 @@ public class GuacamoleClassLoader extends ClassLoader {
     }
 
     @Override
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
+    public Class<?> findClass(String name) throws ClassNotFoundException {
 
         // If no classloader, use default loader
         if (classLoader == null)
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/BasicGuacamoleWebSocketTunnelEndpoint.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/BasicGuacamoleWebSocketTunnelEndpoint.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
index 7eadcadcc..77db63f68 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/BasicGuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jsr;
+package org.glyptodon.guacamole.net.basic.websocket;
 
 import java.util.Map;
 import javax.websocket.EndpointConfig;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
index 3ed3f02a1..e4d85c449 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic.websocket;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -29,6 +29,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
 import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
 import org.glyptodon.guacamole.properties.GuacamoleProperties;
 import org.slf4j.Logger;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/WebSocketTunnelRequest.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
index 3b80b5a96..3442dfc94 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/WebSocketTunnelRequest.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jsr;
+package org.glyptodon.guacamole.net.basic.websocket;
 
 import java.util.List;
 import java.util.Map;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/package-info.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
index f7b79c2e7..1d9d35e1e 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/package-info.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
@@ -24,5 +24,5 @@
  * Standard WebSocket tunnel implementation. The classes here require a recent
  * servlet container that supports JSR 356.
  */
-package org.glyptodon.guacamole.net.basic.websocket.jsr;
+package org.glyptodon.guacamole.net.basic.websocket;
 
diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml
index 0d5e76bde..285470352 100644
--- a/guacamole/src/main/webapp/WEB-INF/web.xml
+++ b/guacamole/src/main/webapp/WEB-INF/web.xml
@@ -34,7 +34,7 @@
 
     <!-- Automatically detect and load WebSocket support -->
     <listener>
-        <listener-class>org.glyptodon.guacamole.net.basic.WebSocketSupportLoader</listener-class>
+        <listener-class>org.glyptodon.guacamole.net.basic.websocket.WebSocketSupportLoader</listener-class>
     </listener>
 
     <!-- Authenticate against service calls and pages -->