diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 3892fd919..baea05dc8 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
+    <groupId>org.glyptodon.guacamole</groupId>
     <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
     <version>0.6.1</version>
@@ -42,7 +42,7 @@
                     <!-- Add files from guacamole-common-js -->
                     <overlays>
                         <overlay>
-                            <groupId>net.sourceforge.guacamole</groupId>
+                            <groupId>org.glyptodon.guacamole</groupId>
                             <artifactId>guacamole-common-js</artifactId>
                             <type>zip</type>
                         </overlay>
@@ -79,21 +79,21 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.6.1</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.6.1</version>
         </dependency>
 
         <!-- Guacamole JavaScript API -->
         <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
+            <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
             <version>0.6.1</version>
             <type>zip</type>
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
similarity index 92%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
index 65cbe4000..20fdde52d 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -9,17 +9,17 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
-import net.sourceforge.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection;
-import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import net.sourceforge.guacamole.net.event.AuthenticationFailureEvent;
-import net.sourceforge.guacamole.net.event.AuthenticationSuccessEvent;
-import net.sourceforge.guacamole.net.event.listener.AuthenticationFailureListener;
-import net.sourceforge.guacamole.net.event.listener.AuthenticationSuccessListener;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection;
+import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent;
+import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent;
+import org.glyptodon.guacamole.net.event.listener.AuthenticationFailureListener;
+import org.glyptodon.guacamole.net.event.listener.AuthenticationSuccessListener;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java
similarity index 97%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java
index c0e9eafbc..959e0bfbe 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -20,7 +20,7 @@ package net.sourceforge.guacamole.net.basic;
  */
 
 import java.io.BufferedReader;
-import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
+import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -30,11 +30,11 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
similarity index 88%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
index efc92d1ad..c731d1251 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -25,21 +25,21 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.GuacamoleSecurityException;
-import net.sourceforge.guacamole.net.InetGuacamoleSocket;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
-import net.sourceforge.guacamole.net.GuacamoleSocket;
-import net.sourceforge.guacamole.net.GuacamoleTunnel;
-import net.sourceforge.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection;
-import net.sourceforge.guacamole.net.event.TunnelCloseEvent;
-import net.sourceforge.guacamole.net.event.TunnelConnectEvent;
-import net.sourceforge.guacamole.net.event.listener.TunnelCloseListener;
-import net.sourceforge.guacamole.net.event.listener.TunnelConnectListener;
-import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
-import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.net.InetGuacamoleSocket;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.net.GuacamoleSocket;
+import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.glyptodon.guacamole.net.auth.Credentials;
+import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection;
+import org.glyptodon.guacamole.net.event.TunnelCloseEvent;
+import org.glyptodon.guacamole.net.event.TunnelConnectEvent;
+import org.glyptodon.guacamole.net.event.listener.TunnelCloseListener;
+import org.glyptodon.guacamole.net.event.listener.TunnelConnectListener;
+import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java
similarity index 93%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java
index 9ee86085b..88716fd13 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java
similarity index 97%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java
index 6188daa04..6a5ab2009 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ConfigurationList.java
similarity index 95%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ConfigurationList.java
index 4e834fb82..0038dd48e 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ConfigurationList.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Simple HttpServlet which outputs XML containing a list of all authorized
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
similarity index 95%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
index dd7c4c238..4c6783f9b 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -47,9 +47,9 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
 
 /**
  * A ClassLoader implementation which finds classes within a configurable
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
similarity index 95%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
index 07f614e89..aefa64ca2 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic;
+package org.glyptodon.guacamole.net.basic;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -24,7 +24,7 @@ import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import net.sourceforge.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.GuacamoleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +54,7 @@ public class WebSocketSupportLoader implements ServletContextListener {
 
             // Attempt to find WebSocket servlet
             Class<Servlet> servlet = (Class<Servlet>) GuacamoleClassLoader.getInstance().findClass(
-                "net.sourceforge.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet"
+                "org.glyptodon.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet"
             );
 
             // Dynamically add servlet IF SERVLET 3.0 API AVAILABLE!
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java
similarity index 94%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java
index 2753f7519..6b4299e1b 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic.event;
+package org.glyptodon.guacamole.net.basic.event;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.AbstractCollection;
@@ -6,9 +6,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import net.sourceforge.guacamole.properties.GuacamoleProperties;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.glyptodon.guacamole.properties.GuacamoleProperties;
 
 /**
  * A collection which iterates over instances of all listeners defined in
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
similarity index 90%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
index 05d3c1bca..8711baa80 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic.properties;
+package org.glyptodon.guacamole.net.basic.properties;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -19,10 +19,10 @@ package net.sourceforge.guacamole.net.basic.properties;
  */
 
 import java.lang.reflect.InvocationTargetException;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
-import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader;
-import net.sourceforge.guacamole.properties.GuacamoleProperty;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
+import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
+import org.glyptodon.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is the name of a class to use to
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
similarity index 93%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
index 549a00b76..91e1d384e 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
@@ -1,5 +1,5 @@
 
-package net.sourceforge.guacamole.net.basic.properties;
+package org.glyptodon.guacamole.net.basic.properties;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -19,7 +19,7 @@ package net.sourceforge.guacamole.net.basic.properties;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
+import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
 
 /**
  * Properties used by the default Guacamole web application.
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java
similarity index 89%
rename from guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java
rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java
index 3f68b7428..5a987eef6 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java
@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.basic.properties;
+package org.glyptodon.guacamole.net.basic.properties;
 
 /*
  *  Guacamole - Clientless Remote Desktop
@@ -20,9 +20,9 @@ package net.sourceforge.guacamole.net.basic.properties;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader;
-import net.sourceforge.guacamole.properties.GuacamoleProperty;
+import org.glyptodon.guacamole.GuacamoleException;
+import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
+import org.glyptodon.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is a comma-separated list of class names,
diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml
index 61ae0b21b..6a3f1c9ec 100644
--- a/guacamole/src/main/webapp/WEB-INF/web.xml
+++ b/guacamole/src/main/webapp/WEB-INF/web.xml
@@ -30,14 +30,14 @@
 
     <!-- Automatically detect and load WebSocket support -->
     <listener>
-        <listener-class>net.sourceforge.guacamole.net.basic.WebSocketSupportLoader</listener-class>
+        <listener-class>org.glyptodon.guacamole.net.basic.WebSocketSupportLoader</listener-class>
     </listener>
     
     <!-- Basic Login Servlet -->
     <servlet>
         <description>Login servlet.</description>
         <servlet-name>Login</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.basic.BasicLogin</servlet-class>
+        <servlet-class>org.glyptodon.guacamole.net.basic.BasicLogin</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Login</servlet-name>
@@ -48,7 +48,7 @@
     <servlet>
         <description>Logout servlet.</description>
         <servlet-name>Logout</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.basic.BasicLogout</servlet-class>
+        <servlet-class>org.glyptodon.guacamole.net.basic.BasicLogout</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Logout</servlet-name>
@@ -59,7 +59,7 @@
     <servlet>
         <description>Configuration list servlet.</description>
         <servlet-name>Configs</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.basic.ConfigurationList</servlet-class>
+        <servlet-class>org.glyptodon.guacamole.net.basic.ConfigurationList</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Configs</servlet-name>
@@ -70,7 +70,7 @@
     <servlet>
         <description>Tunnel servlet.</description>
         <servlet-name>Tunnel</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.basic.BasicGuacamoleTunnelServlet</servlet-class>
+        <servlet-class>org.glyptodon.guacamole.net.basic.BasicGuacamoleTunnelServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Tunnel</servlet-name>