diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index 71d9d4124..9afb815dc 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-example</artifactId>
     <packaging>war</packaging>
     <version>0.9.9</version>
@@ -40,7 +40,7 @@
                 <configuration>
                     <overlays>
                         <overlay>
-                            <groupId>org.glyptodon.guacamole</groupId>
+                            <groupId>org.apache.guacamole</groupId>
                             <artifactId>guacamole-common-js</artifactId>
                             <type>zip</type>
                         </overlay>
@@ -64,7 +64,7 @@
 
         <!-- Main Guacamole library -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
             <scope>compile</scope>
@@ -72,7 +72,7 @@
 
         <!-- Guacamole JavaScript library -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
             <version>0.9.9</version>
             <type>zip</type>
diff --git a/doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
similarity index 81%
rename from doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java
rename to doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
index 58479ac7b..6704934d0 100644
--- a/doc/guacamole-example/src/main/java/org/glyptodon/guacamole/net/example/DummyGuacamoleTunnelServlet.java
+++ b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.example;
+package org.apache.guacamole.net.example;
 
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.net.SimpleGuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.net.SimpleGuacamoleTunnel;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 
 /**
  * Simple tunnel example with hard-coded configuration parameters.
diff --git a/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml b/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml
index 3cece4577..146f4bec3 100644
--- a/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml
+++ b/doc/guacamole-example/src/main/webapp/WEB-INF/web.xml
@@ -38,7 +38,7 @@
     <servlet>
         <description>Tunnel servlet.</description>
         <servlet-name>Tunnel</servlet-name>
-        <servlet-class>org.glyptodon.guacamole.net.example.DummyGuacamoleTunnelServlet</servlet-class>
+        <servlet-class>org.apache.guacamole.net.example.DummyGuacamoleTunnelServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Tunnel</servlet-name>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index 849379018..3637d7ed2 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc-base</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-base</name>
@@ -13,7 +13,7 @@
     </properties>
 
     <parent>
-        <groupId>org.glyptodon.guacamole</groupId>
+        <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
         <version>0.9.9</version>
         <relativePath>../../</relativePath>
@@ -53,7 +53,7 @@
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
similarity index 61%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
index 7a570e0ee..3cf849c0e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
@@ -20,50 +20,50 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc;
+package org.apache.guacamole.auth.jdbc;
 
-import org.glyptodon.guacamole.auth.jdbc.user.UserContext;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionDirectory;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledGuacamoleConfiguration;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.auth.jdbc.user.UserDirectory;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionMapper;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper;
-import org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.user.UserMapper;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupService;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.auth.jdbc.security.PasswordEncryptionService;
-import org.glyptodon.guacamole.auth.jdbc.security.SHA256PasswordEncryptionService;
-import org.glyptodon.guacamole.auth.jdbc.security.SaltService;
-import org.glyptodon.guacamole.auth.jdbc.security.SecureRandomSaltService;
-import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.user.UserService;
+import org.apache.guacamole.auth.jdbc.user.UserContext;
+import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionDirectory;
+import org.apache.guacamole.auth.jdbc.connection.ModeledGuacamoleConfiguration;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.auth.jdbc.permission.SystemPermissionSet;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.UserDirectory;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionMapper;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionRecordMapper;
+import org.apache.guacamole.auth.jdbc.connection.ParameterMapper;
+import org.apache.guacamole.auth.jdbc.permission.SystemPermissionMapper;
+import org.apache.guacamole.auth.jdbc.user.UserMapper;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupService;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionService;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.auth.jdbc.security.PasswordEncryptionService;
+import org.apache.guacamole.auth.jdbc.security.SHA256PasswordEncryptionService;
+import org.apache.guacamole.auth.jdbc.security.SaltService;
+import org.apache.guacamole.auth.jdbc.security.SecureRandomSaltService;
+import org.apache.guacamole.auth.jdbc.permission.SystemPermissionService;
+import org.apache.guacamole.auth.jdbc.user.UserService;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionSet;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionSet;
-import org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionSet;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionDirectory;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionSet;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionService;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.TrackedActiveConnection;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.RestrictedGuacamoleTunnelService;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionSet;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionSet;
+import org.apache.guacamole.auth.jdbc.permission.UserPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.UserPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.UserPermissionSet;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionDirectory;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionService;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionSet;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionService;
+import org.apache.guacamole.auth.jdbc.activeconnection.TrackedActiveConnection;
+import org.apache.guacamole.auth.jdbc.tunnel.RestrictedGuacamoleTunnelService;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.mybatis.guice.MyBatisModule;
 import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCEnvironment.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
index fe944f9cd..31af41f65 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc;
+package org.apache.guacamole.auth.jdbc;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.LocalEnvironment;
 
 /**
  * A JDBC-specific implementation of Environment that defines generic properties
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
index 72d036813..cf9e6b749 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.Directory;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.Directory;
 
 /**
  * Implementation of a Directory which contains all currently-active
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
similarity index 88%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
index 386df9bb9..8434ead74 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -29,16 +29,16 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.permission.AbstractPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.permission.AbstractPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionService;
+import org.apache.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
similarity index 89%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
index d60350a7e..51dd82ffa 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
 
 import com.google.inject.Inject;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionSet;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionSet;
 
 /**
  * An implementation of ObjectPermissionSet which uses an injected service to
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
index c423885fd..8992be84f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -29,14 +29,14 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectService;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.base.DirectoryObjectService;
+import org.apache.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ActiveConnection;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
similarity index 92%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
index f9e6ed30b..ebf142b1b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
 
 import java.util.Date;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ActiveConnection;
 
 /**
  * An implementation of the ActiveConnection object which has an associated
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
index 018e6303f..95f8a67c6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/activeconnection/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to currently-active connections.
  */
-package org.glyptodon.guacamole.auth.jdbc.activeconnection;
+package org.apache.guacamole.auth.jdbc.activeconnection;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
index 7d755a68f..976aff8c5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/GroupedObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/GroupedObjectModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
index 45b25598a..96b57ffbb 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/GroupedObjectModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 /**
  * Object representation of a Guacamole object, such as a user or connection,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
index 8986f4f2c..db25d63df 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
-import org.glyptodon.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.net.auth.Identifiable;
 
 /**
  * Common base class for objects that will ultimately be made available through
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
index f3dc98582..43e1289f5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
index 034784310..59b1c0b9b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
@@ -20,21 +20,21 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
-import org.glyptodon.guacamole.net.auth.Identifiable;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
index 50c527f9d..5133e33d5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
+import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
 
 /**
  * Common base class for objects that will ultimately be made available through
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
index 9a9aa44df..44312de8f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.Identifiable;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledObject.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
index 276b0909e..7a41fbc5b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ModeledObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
 
 /**
  * Common base class for objects have an underlying model. For the purposes of
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
index e936686cd..690e9da19 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ObjectModel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
 /**
  * Object representation of a Guacamole object, such as a user or connection,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
index d8828c43c..76e2decd4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RestrictedObject.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
 
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
 
 /**
  * Common base class for objects that are associated with the users that
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/package-info.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/package-info.java
index 122dc3ec9..b847590af 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/package-info.java
@@ -25,4 +25,4 @@
  * the relationships between the model and the implementations of guacamole-ext
  * classes.
  */
-package org.glyptodon.guacamole.auth.jdbc.base;
+package org.apache.guacamole.auth.jdbc.base;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
index 2afc98b28..7e0db409f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionDirectory.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.Directory;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.Directory;
 import org.mybatis.guice.transactional.Transactional;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
index 77c29046f..1e501559a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
index f272f43c1..e9b27b451 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
-import org.glyptodon.guacamole.auth.jdbc.base.GroupedObjectModel;
+import org.apache.guacamole.auth.jdbc.base.GroupedObjectModel;
 
 /**
  * Object representation of a Guacamole connection, as represented in the
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
index e829e7a53..291fcf37a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import java.util.Collection;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 
 /**
  * Mapper for connection record objects.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
similarity index 99%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
index 9ac157d17..707504cc6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordModel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import java.util.Date;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
similarity index 99%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
index a03d478f9..7979f79ad 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSearchTerm.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
similarity index 92%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
index f9d00a104..3b2f829a5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -28,9 +28,9 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A JDBC implementation of ConnectionRecordSet. Calls to asCollection() will 
@@ -40,7 +40,7 @@ import org.glyptodon.guacamole.net.auth.ConnectionRecord;
  * @author James Muehlner
  */
 public class ConnectionRecordSet extends RestrictedObject
-        implements org.glyptodon.guacamole.net.auth.ConnectionRecordSet {
+        implements org.apache.guacamole.net.auth.ConnectionRecordSet {
 
     /**
      * Service for managing connection objects.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
index 279321b44..fbcec0956 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordSortPredicate.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
 
 /**
  * A sort predicate which species the property to use when sorting connection
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
index 5d8d82a42..87bfb8844 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -31,23 +31,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObjectService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObjectService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnection.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index bb5e020da..741f195c7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -30,18 +30,18 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObject;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.form.NumericField;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObject;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.form.NumericField;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
index dbd9b0b28..a8975e2fd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A ConnectionRecord which is backed by a database model.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
index b88a936e7..7c347e816 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledGuacamoleConfiguration.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import com.google.inject.Inject;
 import java.util.Map;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Implementation of GuacamoleConfiguration which loads parameter values only
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.java
index b8bb26fb5..5db270676 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 import java.util.Collection;
 import org.apache.ibatis.annotations.Param;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterModel.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterModel.java
index 103bdae49..5a685ec78 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ParameterModel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
 
 /**
  * A single parameter name/value pair belonging to a connection.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/package-info.java
index 6507c59b9..84f8f9596 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to connections and their parameters and history.
  */
-package org.glyptodon.guacamole.auth.jdbc.connection;
+package org.apache.guacamole.auth.jdbc.connection;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
index 6f76dd7c6..e0a4ef4b3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
 import org.mybatis.guice.transactional.Transactional;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
index ee4df9beb..0b4b2ff8e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
index 161f133ed..99bd572e1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
-import org.glyptodon.guacamole.auth.jdbc.base.GroupedObjectModel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.auth.jdbc.base.GroupedObjectModel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
 
 /**
  * Object representation of a Guacamole connection group, as represented in the
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
similarity index 88%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
index fb74f5149..76634954f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java
@@ -20,28 +20,28 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObjectService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObjectService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
index 513409ac6..8105198aa 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.Arrays;
@@ -29,17 +29,17 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService;
-import org.glyptodon.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObject;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.form.NumericField;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionService;
+import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.auth.jdbc.base.ModeledGroupedDirectoryObject;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.form.NumericField;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
index 74fb4295d..9e328b444 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/RootConnectionGroup.java
@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * The root connection group, here represented as its own dedicated object as
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/package-info.java
index a1d0bd250..643cd1067 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to connection groups.
  */
-package org.glyptodon.guacamole.auth.jdbc.connectiongroup;
+package org.apache.guacamole.auth.jdbc.connectiongroup;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/package-info.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/package-info.java
index e4d12fca9..60f756ac1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/package-info.java
@@ -26,4 +26,4 @@
  * driven by relatively-common schemas. The only difference between such
  * implementations are maintained within database-specific MyBatis mappings.
  */
-package org.glyptodon.guacamole.auth.jdbc;
+package org.apache.guacamole.auth.jdbc;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/AbstractPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
similarity index 86%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/AbstractPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
index feff734ff..f647c9ec0 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/AbstractPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * Abstract PermissionService implementation which provides additional
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
index cc791d628..a6bc95ab1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for connection group permissions.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
index b16078efe..a1a9eb127 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionService.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
index 5f057dc2d..c88a36e99 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
index 5dfdd07cd..ef6ce852a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for connection permissions.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
index d0bb6f7f9..3741ffe02 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionService.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
index 6ed57ebbd..8f4754d5b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionSet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
index d939fbd49..a405728d9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledObjectPermissionService.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
similarity index 92%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
index 819ef005d..183f954d6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ModeledPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ModeledPermissionService.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
index fcd54b17f..51be6f46a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.Collection;
 import org.apache.ibatis.annotations.Param;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
 
 /**
  * Mapper for object-related permissions.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
index 0a00081ab..c8dd07853 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionModel.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
 
 /**
  * Object representation of an object-related Guacamole permission, as
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
index 04e66ad1d..3d4c6a5bc 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionService.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
index 3806f046c..ccda6e699 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ObjectPermissionSet.java
@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
 
 /**
  * A database implementation of ObjectPermissionSet which uses an injected
@@ -39,7 +39,7 @@ import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
  * @author Michael Jumper
  */
 public abstract class ObjectPermissionSet extends RestrictedObject
-    implements org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet {
+    implements org.apache.guacamole.net.auth.permission.ObjectPermissionSet {
 
     /**
      * The user associated with this permission set. Each of the permissions in
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
index eff35a1ac..07e476756 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionMapper.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
index d50c9704f..676479a59 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionModel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Generic base permission model which grants a permission of a particular type
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
similarity index 89%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
index c350c3c95..9122d2bba 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java
@@ -20,20 +20,20 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
index fdcb63ce9..fa6701e1b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
 import org.apache.ibatis.annotations.Param;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * Mapper for system-level permissions.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
similarity index 92%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
index 8c1c13ac9..f24feb21a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionModel.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * Object representation of an system-level Guacamole permission, as
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
index a30f9302a..eafc1943f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Collection;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
similarity index 89%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
index 485eaecfe..c2906f0b8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionSet.java
@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
 import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * A database implementation of SystemPermissionSet which uses an injected
@@ -39,7 +39,7 @@ import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
  * @author Michael Jumper
  */
 public class SystemPermissionSet extends RestrictedObject
-    implements org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet {
+    implements org.apache.guacamole.net.auth.permission.SystemPermissionSet {
 
     /**
      * The user associated with this permission set. Each of the permissions in
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
index a6c3275d9..306148c2c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 /**
  * Mapper for user permissions.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
index c70d71706..ea7f67f64 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionService.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.user.ModeledUser;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.user.ModeledUser;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionSet.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
index ca99be759..94bddd08e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/UserPermissionSet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
 
 import com.google.inject.Inject;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/package-info.java
index 01b820ac1..9a643ced9 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to object- and system-level permissions.
  */
-package org.glyptodon.guacamole.auth.jdbc.permission;
+package org.apache.guacamole.auth.jdbc.permission;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
index 2e78725ef..4bcbbf4a5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/PasswordEncryptionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.security;
+package org.apache.guacamole.auth.jdbc.security;
 
 /**
  * A service to perform password encryption and checking.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
index 577bdb0ef..bed96306f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.security;
+package org.apache.guacamole.auth.jdbc.security;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
index 7badde447..5024e3c64 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SaltService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.security;
+package org.apache.guacamole.auth.jdbc.security;
 
 /**
  * A service to generate password salts.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
index 608733b5b..f8fb5e182 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.security;
+package org.apache.guacamole.auth.jdbc.security;
 
 
 import java.security.SecureRandom;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/package-info.java
index 3f1d8b4f7..7e9af6801 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to hashing or encryption.
  */
-package org.glyptodon.guacamole.auth.jdbc.security;
+package org.apache.guacamole.auth.jdbc.security;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
similarity index 92%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
index ea721c020..4705d2978 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -34,29 +34,29 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper;
-import org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel;
-import org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel;
-import org.glyptodon.guacamole.auth.jdbc.user.UserModel;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionMapper;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.token.StandardTokens;
-import org.glyptodon.guacamole.token.TokenFilter;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionRecordMapper;
+import org.apache.guacamole.auth.jdbc.connection.ParameterMapper;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionModel;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel;
+import org.apache.guacamole.auth.jdbc.connection.ParameterModel;
+import org.apache.guacamole.auth.jdbc.user.UserModel;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionMapper;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.token.StandardTokens;
+import org.apache.guacamole.token.TokenFilter;
 import org.mybatis.guice.transactional.Transactional;
 
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
index 26fff00f8..5ab662d6e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionMultimap.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
index 1c2a40a7b..34c4d9c48 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 import java.util.Date;
 import java.util.UUID;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.net.AbstractGuacamoleTunnel;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.net.AbstractGuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionRecord;
 
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
index c965a823b..7666dfc03 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/GuacamoleTunnelService.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
index 739b4776e..64fe60bfd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.InetGuacamoleSocket;
 
 /**
  * Implementation of GuacamoleSocket which connects via TCP to a given hostname
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
index cf3f3804d..0d38c39ac 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.SSLGuacamoleSocket;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.SSLGuacamoleSocket;
 
 /**
  * Implementation of GuacamoleSocket which connects via SSL to a given hostname
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
index 77056a18b..ebea7b9a2 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 import com.google.common.collect.ConcurrentHashMultiset;
 import com.google.inject.Inject;
@@ -29,13 +29,13 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.glyptodon.guacamole.GuacamoleClientTooManyException;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceConflictException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.GuacamoleClientTooManyException;
+import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceConflictException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
 
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/Seat.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/Seat.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
index 008915f00..acff4fe06 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/Seat.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/Seat.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
 
 /**
  * A unique pairing of user and connection or connection group.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/package-info.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/package-info.java
index 61657ffa5..61a5604fe 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/package-info.java
@@ -24,4 +24,4 @@
  * Classes related to obtaining/configuring Guacamole tunnels, and restricting
  * access to those tunnels.
  */
-package org.glyptodon.guacamole.auth.jdbc.tunnel;
+package org.apache.guacamole.auth.jdbc.tunnel;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticatedUser.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticatedUser.java
index 8e8747575..744ee5054 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticatedUser.java
@@ -20,20 +20,20 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * Associates a user with the credentials they used to authenticate.
  *
  * @author Michael Jumper 
  */
-public class AuthenticatedUser implements org.glyptodon.guacamole.net.auth.AuthenticatedUser {
+public class AuthenticatedUser implements org.apache.guacamole.net.auth.AuthenticatedUser {
 
     /**
      * The user that authenticated.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticationProviderService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticationProviderService.java
similarity index 89%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticationProviderService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticationProviderService.java
index 486e96242..7a4e6f12d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/AuthenticationProviderService.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
 
 /**
  * Service which authenticates users based on credentials and provides for
@@ -101,7 +101,7 @@ public class AuthenticationProviderService  {
      *     If an error occurs during authentication, or if the given
      *     credentials are invalid or expired.
      */
-    public UserContext getUserContext(org.glyptodon.guacamole.net.auth.AuthenticatedUser authenticatedUser)
+    public UserContext getUserContext(org.apache.guacamole.net.auth.AuthenticatedUser authenticatedUser)
                 throws GuacamoleException {
 
         // Retrieve user account for already-authenticated user
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/ModeledUser.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
index 586686b67..a787dc98d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/ModeledUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 import com.google.inject.Inject;
 import java.sql.Date;
@@ -33,25 +33,25 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObject;
-import org.glyptodon.guacamole.auth.jdbc.security.PasswordEncryptionService;
-import org.glyptodon.guacamole.auth.jdbc.security.SaltService;
-import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionService;
-import org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionService;
-import org.glyptodon.guacamole.form.BooleanField;
-import org.glyptodon.guacamole.form.DateField;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.form.TimeField;
-import org.glyptodon.guacamole.form.TimeZoneField;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObject;
+import org.apache.guacamole.auth.jdbc.security.PasswordEncryptionService;
+import org.apache.guacamole.auth.jdbc.security.SaltService;
+import org.apache.guacamole.auth.jdbc.permission.SystemPermissionService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionService;
+import org.apache.guacamole.auth.jdbc.permission.UserPermissionService;
+import org.apache.guacamole.form.BooleanField;
+import org.apache.guacamole.form.DateField;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.form.TimeField;
+import org.apache.guacamole.form.TimeZoneField;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
similarity index 80%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContext.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
index 41e7a6f5d..a43283672 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContext.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
@@ -20,28 +20,28 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionDirectory;
+import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionDirectory;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.auth.jdbc.activeconnection.ActiveConnectionDirectory;
-import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordSet;
-import org.glyptodon.guacamole.auth.jdbc.connection.ModeledConnection;
-import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionDirectory;
+import org.apache.guacamole.auth.jdbc.connection.ConnectionRecordSet;
+import org.apache.guacamole.auth.jdbc.connection.ModeledConnection;
+import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
 
 /**
  * UserContext implementation which is driven by an arbitrary, underlying
@@ -51,7 +51,7 @@ import org.glyptodon.guacamole.net.auth.User;
  * @author Michael Jumper
  */
 public class UserContext extends RestrictedObject
-    implements org.glyptodon.guacamole.net.auth.UserContext {
+    implements org.apache.guacamole.net.auth.UserContext {
 
     /**
      * The AuthenticationProvider that created this UserContext.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
index 826957b89..ae7b2d134 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserDirectory.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
 import org.mybatis.guice.transactional.Transactional;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
index 862739026..f6b04190b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserMapper.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
similarity index 99%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
index d1ca7516d..403065a52 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 import java.sql.Date;
 import java.sql.Time;
-import org.glyptodon.guacamole.auth.jdbc.base.ObjectModel;
+import org.apache.guacamole.auth.jdbc.base.ObjectModel;
 
 /**
  * Object representation of a Guacamole user, as represented in the database.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
index 6f609b2b8..abbffd384 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -28,26 +28,26 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
-import org.glyptodon.guacamole.auth.jdbc.base.ModeledDirectoryObjectService;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel;
-import org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionMapper;
-import org.glyptodon.guacamole.auth.jdbc.security.PasswordEncryptionService;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.PasswordField;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
+import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionMapper;
+import org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel;
+import org.apache.guacamole.auth.jdbc.permission.UserPermissionMapper;
+import org.apache.guacamole.auth.jdbc.security.PasswordEncryptionService;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.PasswordField;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -363,7 +363,7 @@ public class UserService extends ModeledDirectoryObjectService<ModeledUser, User
      *     The ModeledUser which corresponds to the given AuthenticatedUser, or
      *     null if no such user exists.
      */
-    public ModeledUser retrieveUser(org.glyptodon.guacamole.net.auth.AuthenticatedUser authenticatedUser) {
+    public ModeledUser retrieveUser(org.apache.guacamole.net.auth.AuthenticatedUser authenticatedUser) {
 
         // If we already queried this user, return that rather than querying again
         if (authenticatedUser instanceof AuthenticatedUser)
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/package-info.java
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/package-info.java
index e5c15703f..a106eeb26 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/package-info.java
@@ -23,4 +23,4 @@
 /**
  * Classes related to Guacamole users.
  */
-package org.glyptodon.guacamole.auth.jdbc.user;
+package org.apache.guacamole.auth.jdbc.user;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index b52a70dc6..8774eed26 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc-mysql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-mysql</name>
@@ -13,7 +13,7 @@
     </properties>
 
     <parent>
-        <groupId>org.glyptodon.guacamole</groupId>
+        <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
         <version>0.9.9</version>
         <relativePath>../../</relativePath>
@@ -65,14 +65,14 @@
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole JDBC Authentication -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-base</artifactId>
             <version>0.9.9</version>
         </dependency>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
index 303401b60..e1c3bc8b5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
@@ -24,13 +24,13 @@ package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.auth.jdbc.JDBCAuthenticationProviderModule;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticationProviderService;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.auth.jdbc.JDBCAuthenticationProviderModule;
+import org.apache.guacamole.auth.jdbc.user.AuthenticationProviderService;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
 
 /**
  * Provides a MySQL based implementation of the AuthenticationProvider
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
index a11c525db..3f1f11a6b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
@@ -26,7 +26,7 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import java.util.Properties;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 import org.mybatis.guice.datasource.helper.JdbcHelper;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java
index e54f2a9de..c81212d44 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java
@@ -22,8 +22,8 @@
 
 package net.sourceforge.guacamole.net.auth.mysql;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
index 7a81daf2f..549b07945 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
@@ -22,9 +22,9 @@
 
 package net.sourceforge.guacamole.net.auth.mysql;
 
-import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the MySQL Authentication plugin.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
index 65dc294e6..dc06ee67a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
@@ -22,6 +22,6 @@
 
 /**
  * The MySQL authentication provider. This package exists outside of
- * org.glyptodon for backwards-compatibility.
+ * org.apache for backwards-compatibility.
  */
 package net.sourceforge.guacamole.net.auth.mysql;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index 8c85bf1a6..7c0788cad 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ConnectionMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel" >
+    <resultMap id="ConnectionResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionModel" >
         <id     column="connection_id"            property="objectID"              jdbcType="INTEGER"/>
         <result column="connection_name"          property="name"                  jdbcType="VARCHAR"/>
         <result column="parent_id"                property="parentIdentifier"      jdbcType="INTEGER"/>
@@ -139,7 +139,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel">
+            parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionModel">
 
         INSERT INTO guacamole_connection (
             connection_name,
@@ -159,7 +159,7 @@
     </insert>
 
     <!-- Update single connection -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionModel">
         UPDATE guacamole_connection
         SET connection_name          = #{object.name,jdbcType=VARCHAR},
             parent_id                = #{object.parentIdentifier,jdbcType=VARCHAR},
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
index 91eec1430..cd2952d01 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="ConnectionRecordResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel">
+    <resultMap id="ConnectionRecordResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel">
         <result column="connection_id"   property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="connection_name" property="connectionName"       jdbcType="VARCHAR"/>
         <result column="user_id"         property="userID"               jdbcType="INTEGER"/>
@@ -58,7 +58,7 @@
     </select>
 
     <!-- Insert the given connection record -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel">
 
         INSERT INTO guacamole_connection_history (
             connection_id,
@@ -114,7 +114,7 @@
         </foreach>
 
         <!-- Bind sort property enum values for sake of readability -->
-        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="START_DATE"      value="@org.apache.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
 
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
@@ -181,7 +181,7 @@
         </foreach>
 
         <!-- Bind sort property enum values for sake of readability -->
-        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="START_DATE"      value="@org.apache.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
 
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
index ccd386c14..1c48222dd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper">
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ParameterMapper">
 
     <!-- Result mapper for connection parameters -->
-    <resultMap id="ParameterResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel">
+    <resultMap id="ParameterResultMap" type="org.apache.guacamole.auth.jdbc.connection.ParameterModel">
         <result column="connection_id"   property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="parameter_name"  property="name"                 jdbcType="VARCHAR"/>
         <result column="parameter_value" property="value"                jdbcType="VARCHAR"/>
@@ -51,7 +51,7 @@
     </delete>
 
     <!-- Insert all given parameters -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.connection.ParameterModel">
 
         INSERT INTO guacamole_connection_parameter (
             connection_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
index 75acaab42..c25b69e5a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
@@ -24,15 +24,15 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionGroupResultMap" type="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel" >
+    <resultMap id="ConnectionGroupResultMap" type="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel" >
         <id     column="connection_group_id"      property="objectID"              jdbcType="INTEGER"/>
         <result column="connection_group_name"    property="name"                  jdbcType="VARCHAR"/>
         <result column="parent_id"                property="parentIdentifier"      jdbcType="INTEGER"/>
         <result column="type"                     property="type"                  jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.ConnectionGroup$Type"/>
+                javaType="org.apache.guacamole.net.auth.ConnectionGroup$Type"/>
         <result column="max_connections"          property="maxConnections"        jdbcType="INTEGER"/>
         <result column="max_connections_per_user" property="maxConnectionsPerUser" jdbcType="INTEGER"/>
     </resultMap>
@@ -140,7 +140,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
+            parameterType="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
 
         INSERT INTO guacamole_connection_group (
             connection_group_name,
@@ -160,7 +160,7 @@
     </insert>
 
     <!-- Update single connection group -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
         UPDATE guacamole_connection_group
         SET connection_group_name    = #{object.name,jdbcType=VARCHAR},
             parent_id                = #{object.parentIdentifier,jdbcType=VARCHAR},
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
index 40ada12a5..65d2ba914 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper" >
 
     <!-- Result mapper for connection permissions -->
-    <resultMap id="ConnectionGroupPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="ConnectionGroupPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"             property="userID"           jdbcType="INTEGER"/>
         <result column="username"            property="username"         jdbcType="VARCHAR"/>
         <result column="permission"          property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="connection_group_id" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -87,7 +87,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_connection_group_permission
         WHERE (user_id, permission, connection_group_id) IN
@@ -101,7 +101,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT IGNORE INTO guacamole_connection_group_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
similarity index 89%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
index 9935f3cfd..4ebbb3b7b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionMapper" >
 
     <!-- Result mapper for connection permissions -->
-    <resultMap id="ConnectionPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="ConnectionPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"       property="userID"           jdbcType="INTEGER"/>
         <result column="username"      property="username"         jdbcType="VARCHAR"/>
         <result column="permission"    property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="connection_id" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -87,7 +87,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_connection_permission
         WHERE (user_id, permission, connection_id) IN
@@ -101,7 +101,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT IGNORE INTO guacamole_connection_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
similarity index 86%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
index 55eacd072..614fd1d9d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.SystemPermissionMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="SystemPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <resultMap id="SystemPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
         <result column="user_id"    property="userID"   jdbcType="INTEGER"/>
         <result column="username"   property="username" jdbcType="VARCHAR"/>
         <result column="permission" property="type"     jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.SystemPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.SystemPermission$Type"/>
     </resultMap>
 
     <!-- Select all permissions for a given user -->
@@ -63,7 +63,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
 
         DELETE FROM guacamole_system_permission
         WHERE (user_id, permission) IN
@@ -76,7 +76,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
 
         INSERT IGNORE INTO guacamole_system_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
index 038bb814f..31f968900 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.UserPermissionMapper" >
 
     <!-- Result mapper for user permissions -->
-    <resultMap id="UserPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="UserPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"           property="userID"           jdbcType="INTEGER"/>
         <result column="username"          property="username"         jdbcType="VARCHAR"/>
         <result column="permission"        property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="affected_username" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -90,7 +90,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_user_permission
         USING guacamole_user_permission
@@ -107,7 +107,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT IGNORE INTO guacamole_user_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
index 6f3734c11..5483003b2 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.user.UserMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.user.UserMapper" >
 
     <!-- Result mapper for user objects -->
-    <resultMap id="UserResultMap" type="org.glyptodon.guacamole.auth.jdbc.user.UserModel" >
+    <resultMap id="UserResultMap" type="org.apache.guacamole.auth.jdbc.user.UserModel" >
         <id     column="user_id"             property="objectID"          jdbcType="INTEGER"/>
         <result column="username"            property="identifier"        jdbcType="VARCHAR"/>
         <result column="password_hash"       property="passwordHash"      jdbcType="BINARY"/>
@@ -136,7 +136,7 @@
 
     <!-- Insert single user -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.user.UserModel">
+            parameterType="org.apache.guacamole.auth.jdbc.user.UserModel">
 
         INSERT INTO guacamole_user (
             username,
@@ -166,7 +166,7 @@
     </insert>
 
     <!-- Update single user -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.user.UserModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.user.UserModel">
         UPDATE guacamole_user
         SET password_hash = #{object.passwordHash,jdbcType=BINARY},
             password_salt = #{object.passwordSalt,jdbcType=BINARY},
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index 2dd28a088..789c9e04e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-postgresql</name>
@@ -13,7 +13,7 @@
     </properties>
 
     <parent>
-        <groupId>org.glyptodon.guacamole</groupId>
+        <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
         <version>0.9.9</version>
         <relativePath>../../</relativePath>
@@ -65,14 +65,14 @@
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole JDBC Authentication -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-base</artifactId>
             <version>0.9.9</version>
         </dependency>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
similarity index 88%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
index 602784bae..f2181d69a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.postgresql;
+package org.apache.guacamole.auth.postgresql;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.auth.jdbc.JDBCAuthenticationProviderModule;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
-import org.glyptodon.guacamole.auth.jdbc.user.AuthenticationProviderService;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.auth.jdbc.JDBCAuthenticationProviderModule;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.auth.jdbc.user.AuthenticationProviderService;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
similarity index 97%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
index efd7b9f4f..1471c8127 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.postgresql;
+package org.apache.guacamole.auth.postgresql;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import java.util.Properties;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 import org.mybatis.guice.datasource.helper.JdbcHelper;
 
 /**
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
similarity index 98%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
index eddc84e7b..739d2e4be 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.postgresql;
+package org.apache.guacamole.auth.postgresql;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.jdbc.JDBCEnvironment;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
index 8b87ce091..bc6b9ac71 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.postgresql;
+package org.apache.guacamole.auth.postgresql;
 
-import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the PostgreSQL Authentication plugin.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/package-info.java
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/package-info.java
index 1a939e1a6..1c5fada9d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/package-info.java
@@ -23,4 +23,4 @@
 /**
  * The PostgreSQL authentication provider.
  */
-package org.glyptodon.guacamole.auth.postgresql;
+package org.apache.guacamole.auth.postgresql;
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
index 77f1f0b02..54a809ca5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
     "namespace" : "guac-postgresql",
 
     "authProviders" : [
-        "org.glyptodon.guacamole.auth.postgresql.PostgreSQLAuthenticationProvider"
+        "org.apache.guacamole.auth.postgresql.PostgreSQLAuthenticationProvider"
     ],
 
     "translations" : [
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index 7bc96e425..dd3258a44 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ConnectionMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel" >
+    <resultMap id="ConnectionResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionModel" >
         <id     column="connection_id"            property="objectID"              jdbcType="INTEGER"/>
         <result column="connection_name"          property="name"                  jdbcType="VARCHAR"/>
         <result column="parent_id"                property="parentIdentifier"      jdbcType="INTEGER"/>
@@ -139,7 +139,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel">
+            parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionModel">
 
         INSERT INTO guacamole_connection (
             connection_name,
@@ -159,7 +159,7 @@
     </insert>
 
     <!-- Update single connection -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionModel">
         UPDATE guacamole_connection
         SET connection_name          = #{object.name,jdbcType=VARCHAR},
             parent_id                = #{object.parentIdentifier,jdbcType=INTEGER}::integer,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
index 87dbee47c..282b9294a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="ConnectionRecordResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel">
+    <resultMap id="ConnectionRecordResultMap" type="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel">
         <result column="connection_id"   property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="connection_name" property="connectionName"       jdbcType="VARCHAR"/>
         <result column="user_id"         property="userID"               jdbcType="INTEGER"/>
@@ -58,7 +58,7 @@
     </select>
 
     <!-- Insert the given connection record -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.connection.ConnectionRecordModel">
 
         INSERT INTO guacamole_connection_history (
             connection_id,
@@ -114,7 +114,7 @@
         </foreach>
 
         <!-- Bind sort property enum values for sake of readability -->
-        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="START_DATE"      value="@org.apache.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
 
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
@@ -181,7 +181,7 @@
         </foreach>
 
         <!-- Bind sort property enum values for sake of readability -->
-        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="START_DATE"      value="@org.apache.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
 
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
index e3fe5d8e9..e908a3371 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ParameterMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper">
+<mapper namespace="org.apache.guacamole.auth.jdbc.connection.ParameterMapper">
 
     <!-- Result mapper for connection parameters -->
-    <resultMap id="ParameterResultMap" type="org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel">
+    <resultMap id="ParameterResultMap" type="org.apache.guacamole.auth.jdbc.connection.ParameterModel">
         <result column="connection_id"   property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="parameter_name"  property="name"                 jdbcType="VARCHAR"/>
         <result column="parameter_value" property="value"                jdbcType="VARCHAR"/>
@@ -51,7 +51,7 @@
     </delete>
 
     <!-- Insert all given parameters -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.connection.ParameterModel">
 
         INSERT INTO guacamole_connection_parameter (
             connection_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
similarity index 93%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
index 75005a663..bdcf91785 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
@@ -24,15 +24,15 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionGroupResultMap" type="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel" >
+    <resultMap id="ConnectionGroupResultMap" type="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel" >
         <id     column="connection_group_id"      property="objectID"              jdbcType="INTEGER"/>
         <result column="connection_group_name"    property="name"                  jdbcType="VARCHAR"/>
         <result column="parent_id"                property="parentIdentifier"      jdbcType="INTEGER"/>
         <result column="type"                     property="type"                  jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.ConnectionGroup$Type"/>
+                javaType="org.apache.guacamole.net.auth.ConnectionGroup$Type"/>
         <result column="max_connections"          property="maxConnections"        jdbcType="INTEGER"/>
         <result column="max_connections_per_user" property="maxConnectionsPerUser" jdbcType="INTEGER"/>
     </resultMap>
@@ -140,7 +140,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
+            parameterType="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
 
         INSERT INTO guacamole_connection_group (
             connection_group_name,
@@ -160,7 +160,7 @@
     </insert>
 
     <!-- Update single connection group -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
         UPDATE guacamole_connection_group
         SET connection_group_name    = #{object.name,jdbcType=VARCHAR},
             parent_id                = #{object.parentIdentifier,jdbcType=INTEGER}::integer,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
index 33b3562ed..cc77bc785 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.ConnectionGroupPermissionMapper" >
 
     <!-- Result mapper for connection permissions -->
-    <resultMap id="ConnectionGroupPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="ConnectionGroupPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"             property="userID"           jdbcType="INTEGER"/>
         <result column="username"            property="username"         jdbcType="VARCHAR"/>
         <result column="permission"          property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="connection_group_id" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -87,7 +87,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_connection_group_permission
         WHERE (user_id, permission, connection_group_id) IN
@@ -101,7 +101,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT INTO guacamole_connection_group_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
similarity index 90%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
index 4ed1ad7e9..4634bab68 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.ConnectionPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.ConnectionPermissionMapper" >
 
     <!-- Result mapper for connection permissions -->
-    <resultMap id="ConnectionPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="ConnectionPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"       property="userID"           jdbcType="INTEGER"/>
         <result column="username"      property="username"         jdbcType="VARCHAR"/>
         <result column="permission"    property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="connection_id" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -87,7 +87,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_connection_permission
         WHERE (user_id, permission, connection_id) IN
@@ -101,7 +101,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT INTO guacamole_connection_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
similarity index 86%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
index f1222012c..fac987f9c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.SystemPermissionMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="SystemPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <resultMap id="SystemPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
         <result column="user_id"    property="userID"   jdbcType="INTEGER"/>
         <result column="username"   property="username" jdbcType="VARCHAR"/>
         <result column="permission" property="type"     jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.SystemPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.SystemPermission$Type"/>
     </resultMap>
 
     <!-- Select all permissions for a given user -->
@@ -63,7 +63,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
 
         DELETE FROM guacamole_system_permission
         WHERE (user_id, permission) IN
@@ -76,7 +76,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.SystemPermissionModel">
 
         INSERT INTO guacamole_system_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
similarity index 91%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
index ce529d0d0..03ace5dc7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
@@ -24,14 +24,14 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.permission.UserPermissionMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.permission.UserPermissionMapper" >
 
     <!-- Result mapper for user permissions -->
-    <resultMap id="UserPermissionResultMap" type="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <resultMap id="UserPermissionResultMap" type="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
         <result column="user_id"           property="userID"           jdbcType="INTEGER"/>
         <result column="username"          property="username"         jdbcType="VARCHAR"/>
         <result column="permission"        property="type"             jdbcType="VARCHAR"
-                javaType="org.glyptodon.guacamole.net.auth.permission.ObjectPermission$Type"/>
+                javaType="org.apache.guacamole.net.auth.permission.ObjectPermission$Type"/>
         <result column="affected_username" property="objectIdentifier" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -90,7 +90,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <delete id="delete" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         DELETE FROM guacamole_user_permission
         USING guacamole_user affected
@@ -107,7 +107,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.jdbc.permission.ObjectPermissionModel">
+    <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.permission.ObjectPermissionModel">
 
         INSERT INTO guacamole_user_permission (
             user_id,
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
similarity index 95%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
index fd9138cfe..b70614a23 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="org.glyptodon.guacamole.auth.jdbc.user.UserMapper" >
+<mapper namespace="org.apache.guacamole.auth.jdbc.user.UserMapper" >
 
     <!-- Result mapper for user objects -->
-    <resultMap id="UserResultMap" type="org.glyptodon.guacamole.auth.jdbc.user.UserModel" >
+    <resultMap id="UserResultMap" type="org.apache.guacamole.auth.jdbc.user.UserModel" >
         <id     column="user_id"             property="objectID"          jdbcType="INTEGER"/>
         <result column="username"            property="identifier"        jdbcType="VARCHAR"/>
         <result column="password_hash"       property="passwordHash"      jdbcType="BINARY"/>
@@ -137,7 +137,7 @@
 
     <!-- Insert single user -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="org.glyptodon.guacamole.auth.jdbc.user.UserModel">
+            parameterType="org.apache.guacamole.auth.jdbc.user.UserModel">
 
         INSERT INTO guacamole_user (
             username,
@@ -167,7 +167,7 @@
     </insert>
 
     <!-- Update single user -->
-    <update id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.user.UserModel">
+    <update id="update" parameterType="org.apache.guacamole.auth.jdbc.user.UserModel">
         UPDATE guacamole_user
         SET password_hash = #{object.passwordHash,jdbcType=BINARY},
             password_salt = #{object.passwordSalt,jdbcType=BINARY},
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 7a9637aad..2098783b2 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -4,7 +4,7 @@
                         http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc</artifactId>
     <packaging>pom</packaging>
     <version>0.9.9</version>
@@ -60,7 +60,7 @@
 
             <!-- Guacamole Extension API -->
             <dependency>
-                <groupId>org.glyptodon.guacamole</groupId>
+                <groupId>org.apache.guacamole</groupId>
                 <artifactId>guacamole-ext</artifactId>
                 <version>0.9.9</version>
                 <scope>provided</scope>
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 3abb23a55..40ebcee12 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-ldap</artifactId>
     <packaging>jar</packaging>
     <version>0.9.9</version>
@@ -81,7 +81,7 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
             <scope>provided</scope>
@@ -89,7 +89,7 @@
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.9</version>
             <scope>provided</scope>
diff --git a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java
index cc6b001e7..ae1722c23 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java
@@ -23,15 +23,15 @@
 package net.sourceforge.guacamole.net.auth.ldap;
 
 
-import org.glyptodon.guacamole.auth.ldap.AuthenticationProviderService;
-import org.glyptodon.guacamole.auth.ldap.LDAPAuthenticationProviderModule;
+import org.apache.guacamole.auth.ldap.AuthenticationProviderService;
+import org.apache.guacamole.auth.ldap.LDAPAuthenticationProviderModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * Allows users to be authenticated against an LDAP server. Each user may have
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
similarity index 93%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
index 24dd17f13..64c53d6d3 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.novell.ldap.LDAPConnection;
 import java.util.List;
-import org.glyptodon.guacamole.auth.ldap.user.AuthenticatedUser;
-import org.glyptodon.guacamole.auth.ldap.user.UserContext;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.auth.ldap.user.UserService;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.auth.ldap.user.AuthenticatedUser;
+import org.apache.guacamole.auth.ldap.user.UserContext;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.auth.ldap.user.UserService;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -255,7 +255,7 @@ public class AuthenticationProviderService {
      * @throws GuacamoleException
      *     If the UserContext cannot be created due to an error.
      */
-    public UserContext getUserContext(org.glyptodon.guacamole.net.auth.AuthenticatedUser authenticatedUser)
+    public UserContext getUserContext(org.apache.guacamole.net.auth.AuthenticatedUser authenticatedUser)
             throws GuacamoleException {
 
         // Bind using credentials associated with AuthenticatedUser
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
similarity index 97%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
index 83e8e8b23..aa643ae1f 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
 
 /**
  * Service for retrieving configuration information regarding the LDAP server.
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethod.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
similarity index 98%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethod.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
index 94c112e13..249887878 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethod.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethod.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 /**
  * All possible encryption methods which may be used when connecting to an LDAP
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethodProperty.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
similarity index 91%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethodProperty.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
index bd41cc29c..286ce68a3 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EncryptionMethodProperty.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EncryptionMethodProperty.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is an EncryptionMethod. The string values
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EscapingService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
similarity index 99%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EscapingService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
index 925ba24cf..7c3341b34 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/EscapingService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 /**
  * Service for escaping LDAP filters, distinguished names (DN's), etc.
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
similarity index 87%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
index c0133baea..5d24a6866 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 import com.google.inject.AbstractModule;
-import org.glyptodon.guacamole.auth.ldap.connection.ConnectionService;
-import org.glyptodon.guacamole.auth.ldap.user.UserService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.auth.ldap.connection.ConnectionService;
+import org.apache.guacamole.auth.ldap.user.UserService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
 
 /**
  * Guice module which configures LDAP-specific injections.
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
similarity index 97%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPConnectionService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
index 27f3edd3d..19a68e57e 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 import com.google.inject.Inject;
 import com.novell.ldap.LDAPConnection;
@@ -28,8 +28,8 @@ import com.novell.ldap.LDAPException;
 import com.novell.ldap.LDAPJSSESecureSocketFactory;
 import com.novell.ldap.LDAPJSSEStartTLSFactory;
 import java.io.UnsupportedEncodingException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
similarity index 96%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
index 39e884861..50a8fbfd7 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 
 /**
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
similarity index 94%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
index e545e56ab..932c137f7 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/StringListProperty.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap;
+package org.apache.guacamole.auth.ldap;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is a List of Strings. The string value
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/connection/ConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
similarity index 94%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/connection/ConnectionService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
index 017bb65c4..651ec4fed 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/connection/ConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap.connection;
+package org.apache.guacamole.auth.ldap.connection;
 
 import com.google.inject.Inject;
 import com.novell.ldap.LDAPAttribute;
@@ -33,16 +33,16 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider;
-import org.glyptodon.guacamole.auth.ldap.ConfigurationService;
-import org.glyptodon.guacamole.auth.ldap.EscapingService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.simple.SimpleConnection;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.token.StandardTokens;
-import org.glyptodon.guacamole.token.TokenFilter;
+import org.apache.guacamole.auth.ldap.ConfigurationService;
+import org.apache.guacamole.auth.ldap.EscapingService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.simple.SimpleConnection;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.token.StandardTokens;
+import org.apache.guacamole.token.TokenFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/AuthenticatedUser.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
similarity index 90%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/AuthenticatedUser.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
index e594193ec..4193b5f63 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap.user;
+package org.apache.guacamole.auth.ldap.user;
 
 import com.google.inject.Inject;
-import org.glyptodon.guacamole.net.auth.AbstractAuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * An LDAP-specific implementation of AuthenticatedUser, associating a
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserContext.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
similarity index 85%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserContext.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
index 5d645e3f1..32d800a17 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserContext.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserContext.java
@@ -20,29 +20,29 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap.user;
+package org.apache.guacamole.auth.ldap.user;
 
 import com.google.inject.Inject;
 import com.novell.ldap.LDAPConnection;
 import java.util.Collection;
 import java.util.Collections;
 import net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider;
-import org.glyptodon.guacamole.auth.ldap.connection.ConnectionService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.simple.SimpleConnectionGroup;
-import org.glyptodon.guacamole.net.auth.simple.SimpleConnectionGroupDirectory;
-import org.glyptodon.guacamole.net.auth.simple.SimpleConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.simple.SimpleDirectory;
-import org.glyptodon.guacamole.net.auth.simple.SimpleUser;
+import org.apache.guacamole.auth.ldap.connection.ConnectionService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.simple.SimpleConnectionGroup;
+import org.apache.guacamole.net.auth.simple.SimpleConnectionGroupDirectory;
+import org.apache.guacamole.net.auth.simple.SimpleConnectionRecordSet;
+import org.apache.guacamole.net.auth.simple.SimpleDirectory;
+import org.apache.guacamole.net.auth.simple.SimpleUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Michael Jumper
  */
-public class UserContext implements org.glyptodon.guacamole.net.auth.UserContext {
+public class UserContext implements org.apache.guacamole.net.auth.UserContext {
 
     /**
      * Logger for this class.
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
similarity index 96%
rename from extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java
rename to extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
index 1f47d4c00..1c32dbfe1 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/UserService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.auth.ldap.user;
+package org.apache.guacamole.auth.ldap.user;
 
 import com.google.inject.Inject;
 import com.novell.ldap.LDAPAttribute;
@@ -32,13 +32,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.auth.ldap.ConfigurationService;
-import org.glyptodon.guacamole.auth.ldap.EscapingService;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.auth.ldap.LDAPGuacamoleProperties;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.simple.SimpleUser;
+import org.apache.guacamole.auth.ldap.ConfigurationService;
+import org.apache.guacamole.auth.ldap.EscapingService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.auth.ldap.LDAPGuacamoleProperties;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.simple.SimpleUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 17a10461a..059d53080 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-noauth</artifactId>
     <packaging>jar</packaging>
     <version>0.9.9</version>
@@ -81,7 +81,7 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
             <scope>provided</scope>
@@ -89,7 +89,7 @@
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.9</version>
             <scope>provided</scope>
diff --git a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java
index 40c27f92d..3e11993ef 100644
--- a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java
+++ b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthConfigContentHandler.java
@@ -25,7 +25,7 @@ package net.sourceforge.guacamole.net.auth.noauth;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
index fe38e13aa..d2c0c47e6 100644
--- a/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
+++ b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
@@ -28,14 +28,14 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.properties.FileGuacamoleProperty;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.xml.sax.InputSource;
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index a199661d0..af6051e33 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-common-js</artifactId>
     <packaging>pom</packaging>
     <version>0.9.9</version>
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index df5ec7fe1..4254e6ea2 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-common</artifactId>
     <packaging>jar</packaging>
     <version>0.9.9</version>
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientBadTypeException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientBadTypeException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
index 9bb9ac1c6..b3056f349 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientBadTypeException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
index 667f416ec..d85450437 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientOverrunException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientOverrunException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
index 1e900013b..6e0da6003 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientOverrunException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTimeoutException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTimeoutException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
index 46378a2b4..7503db3f5 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTimeoutException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTooManyException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTooManyException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
index 91e77c1e1..b30ca2e77 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTooManyException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleConnectionClosedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleConnectionClosedException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
index a88728299..85779c18d 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleConnectionClosedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
index 412c0e961..53f5591a9 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceConflictException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceConflictException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
index 9138bae2e..cd2f40e5f 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceConflictException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
index 3794c2431..28952f629 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
index 417e5d206..327535576 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerBusyException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerBusyException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
index 96473fe71..aa8b21416 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerBusyException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
index d37ec1b9e..35a34609a 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnauthorizedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnauthorizedException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
index a9db5afe4..2a390fb3d 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnauthorizedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnsupportedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnsupportedException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
index 8aa1869ab..7e8bcbdf3 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnsupportedException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
index c0bfb80fe..245d52259 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamTimeoutException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamTimeoutException.java
rename to guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
index e1e0998b3..4538d4ee9 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamTimeoutException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 
 
 /**
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java
rename to guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
index 2c5cf3d1c..040be42f9 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * Provides abstract and raw character read access to a stream of Guacamole
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
similarity index 94%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java
rename to guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
index ec657b9f6..844b0325a 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * Provides abstract and raw character write access to a stream of Guacamole
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java
rename to guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
index 756d93902..9dd89ed5a 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
 
 import java.io.IOException;
@@ -29,11 +29,11 @@ import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.util.Deque;
 import java.util.LinkedList;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
-import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
+import org.apache.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * A GuacamoleReader which wraps a standard Java Reader, using that Reader as
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
similarity index 88%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java
rename to guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
index 1301d68ab..8943bc8d2 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
 
 import java.io.IOException;
 import java.io.Writer;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
-import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
+import org.apache.guacamole.protocol.GuacamoleInstruction;
 
 /**
  * A GuacamoleWriter which wraps a standard Java Writer, using that Writer as
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java b/guacamole-common/src/main/java/org/apache/guacamole/io/package-info.java
similarity index 97%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java
rename to guacamole-common/src/main/java/org/apache/guacamole/io/package-info.java
index 8a12704af..75b526a12 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/io/package-info.java
@@ -23,5 +23,5 @@
 /**
  * All classes relating directly to data input or output.
  */
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/AbstractGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/AbstractGuacamoleTunnel.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
index d8da19477..b6e6653a7 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/AbstractGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
 import java.util.concurrent.locks.ReentrantLock;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * Base GuacamoleTunnel implementation which synchronizes access to the
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/DelegatingGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
similarity index 93%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/DelegatingGuacamoleTunnel.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
index aa562989b..a54f916b9 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/DelegatingGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * GuacamoleTunnel implementation which simply delegates all function calls to
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
similarity index 92%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
index 327ea2930..03d3c2d48 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * Provides abstract socket-like access to a Guacamole connection.
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
index c4e30b0f8..f2a457560 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * Provides a unique identifier and synchronized access to the GuacamoleReader
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
similarity index 91%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
index c4cb6583e..a259f512e 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
-import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.ReaderGuacamoleReader;
+import org.apache.guacamole.io.WriterGuacamoleWriter;
+import org.apache.guacamole.io.GuacamoleWriter;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -37,9 +37,9 @@ import java.io.OutputStreamWriter;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
similarity index 92%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
index 8b9f0c48d..d0056508a 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
 import java.io.IOException;
@@ -32,12 +32,12 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
-import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.io.ReaderGuacamoleReader;
+import org.apache.guacamole.io.WriterGuacamoleWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/SimpleGuacamoleTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
similarity index 98%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/SimpleGuacamoleTunnel.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
index f0c28cb4e..320b34337 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/SimpleGuacamoleTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
 
 import java.util.UUID;
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java b/guacamole-common/src/main/java/org/apache/guacamole/net/package-info.java
similarity index 97%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java
rename to guacamole-common/src/main/java/org/apache/guacamole/net/package-info.java
index 91f14893f..3f3061a50 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/net/package-info.java
@@ -24,5 +24,5 @@
  * Classes which apply to network-specific concepts, such as low-level sockets
  * and tunnels.
  */
-package org.glyptodon.guacamole.net;
+package org.apache.guacamole.net;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java b/guacamole-common/src/main/java/org/apache/guacamole/package-info.java
similarity index 97%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java
rename to guacamole-common/src/main/java/org/apache/guacamole/package-info.java
index 50d76cc5c..e00e020c7 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/package-info.java
@@ -25,5 +25,5 @@
  * and all other web applications which use the API provided by the
  * Guacamole project.
  */
-package org.glyptodon.guacamole;
+package org.apache.guacamole;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
index ab5bffe88..2ab38ab49 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleSocket;
 
 /**
  * A GuacamoleSocket which pre-configures the connection based on a given
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReader.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReader.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
index 2692e1865..bc9f3ad09 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReader.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
 
 /**
  * GuacamoleReader which applies a given GuacamoleFilter to observe or alter all
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleSocket.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
similarity index 92%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleSocket.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
index b6b9635ff..2b4ac6362 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleSocket;
 
 /**
  * Implementation of GuacamoleSocket which allows individual instructions to be
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriter.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
similarity index 94%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriter.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
index 26d8ac615..ccfd0ee7c 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.io.GuacamoleWriter;
 
 /**
  * GuacamoleWriter which applies a given GuacamoleFilter to observe or alter
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
similarity index 99%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
index 3302fab9c..15e17d922 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 
 import java.util.ArrayList;
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
similarity index 99%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
index 1a034b39e..98523c4e7 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 
 import java.io.Serializable;
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleFilter.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleFilter.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
index 334e104c5..02c497043 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleFilter.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Interface which provides for the filtering of individual instructions. Each
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
similarity index 98%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
index 2c050d43b..7a813d3d0 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 
 import java.util.Arrays;
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleParser.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
similarity index 98%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleParser.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
index b061d6bfa..18363fba9 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleParser.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * Parser for the Guacamole protocol. Arbitrary instruction data is appended,
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleStatus.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
similarity index 99%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleStatus.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
index 2ccefb081..c8fe2278a 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleStatus.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 /**
  * All possible statuses returned by various Guacamole instructions, each having
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/package-info.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java
rename to guacamole-common/src/main/java/org/apache/guacamole/protocol/package-info.java
index 00eb6ef30..bf86803a3 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes relating directly to the Guacamole protocol.
  */
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnel.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
similarity index 94%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnel.java
rename to guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
index 40f47ea8b..a5b0e12bd 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnel.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.servlet;
+package org.apache.guacamole.servlet;
 
-import org.glyptodon.guacamole.net.DelegatingGuacamoleTunnel;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.DelegatingGuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * Tracks the last time a particular GuacamoleTunnel was accessed. This
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelMap.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
similarity index 98%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelMap.java
rename to guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
index 184d93303..1e845e237 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelMap.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.servlet;
+package org.apache.guacamole.servlet;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
rename to guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 6dc6fc05f..54cd74674 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.servlet;
+package org.apache.guacamole.servlet;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -32,15 +32,15 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
similarity index 97%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java
rename to guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
index 7099cc855..d64fb6c4d 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.servlet;
+package org.apache.guacamole.servlet;
 
 import javax.servlet.http.HttpSession;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/package-info.java
similarity index 96%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java
rename to guacamole-common/src/main/java/org/apache/guacamole/servlet/package-info.java
index ef62c8b26..61ff588aa 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/package-info.java
@@ -24,5 +24,5 @@
  * Classes which build upon the Java Servlet API, providing an HTTP-based
  * tunnel and session management.
  */
-package org.glyptodon.guacamole.servlet;
+package org.apache.guacamole.servlet;
 
diff --git a/guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
similarity index 95%
rename from guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
rename to guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
index 2a85145e0..1e1c321ca 100644
--- a/guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.websocket;
+package org.apache.guacamole.websocket;
 
 import java.io.IOException;
 import javax.websocket.CloseReason;
@@ -33,13 +33,13 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-common/src/test/java/org/glyptodon/guacamole/io/ReaderGuacamoleReaderTest.java b/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
similarity index 95%
rename from guacamole-common/src/test/java/org/glyptodon/guacamole/io/ReaderGuacamoleReaderTest.java
rename to guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
index 569cb3874..76748d9bd 100644
--- a/guacamole-common/src/test/java/org/glyptodon/guacamole/io/ReaderGuacamoleReaderTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.io;
+package org.apache.guacamole.io;
 
 import java.io.StringReader;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.protocol.GuacamoleInstruction;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff --git a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReaderTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
similarity index 94%
rename from guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReaderTest.java
rename to guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
index 40d6e0305..4a0452e96 100644
--- a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReaderTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 import java.io.StringReader;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.ReaderGuacamoleReader;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
diff --git a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriterTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
similarity index 92%
rename from guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriterTest.java
rename to guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
index 4e7bd7d2d..74f6d97e8 100644
--- a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriterTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
 import java.io.StringWriter;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.io.WriterGuacamoleWriter;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
diff --git a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/GuacamoleParserTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
similarity index 97%
rename from guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/GuacamoleParserTest.java
rename to guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
index 61088d1e0..058a3e1da 100644
--- a/guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/GuacamoleParserTest.java
+++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocol;
+package org.apache.guacamole.protocol;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 0c22a2dc0..0cf27783b 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-ext</artifactId>
     <packaging>jar</packaging>
     <version>0.9.9</version>
@@ -114,7 +114,7 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
             <scope>compile</scope>
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/Environment.java b/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/Environment.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
index 3882cbab3..1ce4e5b34 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/Environment.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java
@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.environment;
+package org.apache.guacamole.environment;
 
 import java.io.File;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.protocols.ProtocolInfo;
 
 /**
  * The environment of an arbitrary Guacamole instance, describing available
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java b/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
index 07fdbab30..aa981f70a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.environment;
+package org.apache.guacamole.environment;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,10 +31,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.protocols.ProtocolInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,7 +251,7 @@ public class LocalEnvironment implements Environment {
             if (!protocols.containsKey(protocol)) {
 
                 InputStream stream = LocalEnvironment.class.getResourceAsStream(
-                        "/org/glyptodon/guacamole/protocols/"
+                        "/org/apache/guacamole/protocols/"
                         + protocol + ".json");
 
                 // Parse JSON if available
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/BooleanField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/BooleanField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
index d033a7dc4..faef3c280 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/BooleanField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.util.Collections;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/DateField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/DateField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
index 20ff2575c..4da76659c 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/DateField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/EnumField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/EnumField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
index 272b52f22..bddc154be 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/EnumField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.util.Collection;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Field.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
similarity index 99%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Field.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
index 7e6f525ac..4148f8949 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Field.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.util.Collection;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/FieldOption.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/FieldOption.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
index 499a069bf..97566e7fd 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/FieldOption.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Form.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Form.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
index 3052d6283..1d2fbffeb 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/Form.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/MultilineField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/MultilineField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
index 158eec786..57c4ac5cc 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/MultilineField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which can contain multiple lines of text.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/NumericField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/NumericField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
index 12f78ed13..26716dd61 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/NumericField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which may contain only integer values.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/PasswordField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/PasswordField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
index c48a6596b..750224c08 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/PasswordField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which contains sensitive text information related to
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TextField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TextField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
index 75cae7bb6..e18d4e035 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TextField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a basic text field. The field may generally contain any data, but
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
index 3d7ee7d48..6e124cb52 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeZoneField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeZoneField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
index 09a5e642e..4aa0e81b8 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/TimeZoneField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a time zone field. The field may contain only valid time zone IDs,
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/UsernameField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/UsernameField.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
index 9b2701df4..8eaadb365 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/UsernameField.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a text field which will contain the uniquely-identifying name of
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/package-info.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/form/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/form/package-info.java
index f8fe65268..8d5ebc54a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/form/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/package-info.java
@@ -24,4 +24,4 @@
  * Provides classes which describe the contents and semantics of forms which
  * may be presented to the user.
  */
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractActiveConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractActiveConnection.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
index 7ce50aa61..0d539c2e7 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractActiveConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 public abstract class AbstractActiveConnection implements ActiveConnection {
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractAuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractAuthenticatedUser.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
index 93256d3cf..b9ed61cdc 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractAuthenticatedUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
index 5cf08e855..89896033a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Basic implementation of a Guacamole connection.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
index 0719394ca..7c92947f1 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 /**
  * Basic implementation of a Guacamole connection group.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
index d3232b6cb..cee201611 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AbstractUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ActiveConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ActiveConnection.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
index 1d20ded1d..d2c23f139 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ActiveConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * A pairing of username and GuacamoleTunnel representing an active usage of a
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticatedUser.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
index 1073d47d3..5aa5c29b9 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticatedUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
index 077edbd5a..5a2951a4b 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/AuthenticationProvider.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Provides means of authorizing users and for accessing and managing data
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connectable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
similarity index 90%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connectable.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
index d81a679af..4d4d91406 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connectable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * An object which Guacamole can connect to.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
index 9de591be6..6c23e0271 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Connection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Represents a pairing of a GuacamoleConfiguration with a unique,
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
index 0b20f2301..6566cec26 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Represents a connection group, which can contain both other connection groups
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
index f5533cf78..5a160c3a5 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Date;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
index 691764485..6109699a6 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * The set of all available connection records, or a subset of those records.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
similarity index 99%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
index 469b77c2f..77826a197 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Credentials.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
index 958a9ad5e..aa01e3e88 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Directory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Provides access to a collection of all objects with associated identifiers,
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Identifiable.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Identifiable.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
index 8490bbf7c..1647c146b 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/Identifiable.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 /**
  * An object which has a deterministic, unique identifier, which may not be
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
similarity index 95%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
index 355dd5def..a20255fc1 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/User.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
index f38fad8f8..35957387d 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.form.Form;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.form.Form;
 
 /**
  * The context of an active user. The functions of this class enforce all
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/CredentialsInfo.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/CredentialsInfo.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
index a0c471686..06e807bb2 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/CredentialsInfo.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.PasswordField;
-import org.glyptodon.guacamole.form.UsernameField;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.PasswordField;
+import org.apache.guacamole.form.UsernameField;
 
 /**
  * Information which describes a set of valid credentials.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
index 6ece39a76..c2640325d 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
 
 /**
  * A security-related exception thrown when access is denied to a user because
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
index ea8675a3b..2b9540eba 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 /**
  * A security-related exception thrown when access is denied to a user because
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
index 903b82bef..719996b43 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 /**
  * A security-related exception thrown when access is denied to a user because
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/package-info.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/package-info.java
index 1e1717827..deb131bbf 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/package-info.java
@@ -24,5 +24,5 @@
  * Provides classes which can be used to extend or replace the authentication
  * functionality of the Guacamole web application.
  */
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
index e0927f30a..346edbe93 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermissionSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
index 7e6399a3d..f52b443b0 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/ObjectPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
index aac252e60..18d51cf65 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/Permission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/PermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/PermissionSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
index 1bfa717f8..535e88021 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/PermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
index 4b50484b1..24014b546 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermissionSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
index 195c46e47..494fe2929 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/SystemPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/package-info.java
similarity index 95%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/package-info.java
index 560792522..9863bde6a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/permission/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/package-info.java
@@ -24,5 +24,5 @@
  * Provides classes which describe the various permissions a Guacamole user
  * can be granted.
  */
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
index 3ee2342dc..133ee1f70 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Map;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AbstractAuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.token.StandardTokens;
-import org.glyptodon.guacamole.token.TokenFilter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.token.StandardTokens;
+import org.apache.guacamole.token.TokenFilter;
 
 /**
  * Provides means of retrieving a set of named GuacamoleConfigurations for a
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
similarity index 83%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
index f59d205b0..fbe72c793 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
@@ -20,24 +20,24 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.net.SSLGuacamoleSocket;
-import org.glyptodon.guacamole.net.SimpleGuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AbstractConnection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.net.SSLGuacamoleSocket;
+import org.apache.guacamole.net.SimpleGuacamoleTunnel;
+import org.apache.guacamole.net.auth.AbstractConnection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely basic Connection implementation.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
index 50e9d4ff5..13a672b99 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.glyptodon.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.Connection;
 
 /**
  * An extremely simple read-only implementation of a Directory of
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
similarity index 90%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
index 179a86b64..13d9a1693 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java
@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.AbstractConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * An extremely simple read-only implementation of a ConnectionGroup which
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
index 8e0a6d6f8..8dbe28e7b 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup;
 
 /**
  * An extremely simple read-only implementation of a Directory of
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
similarity index 89%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
index 28be3955b..f1c2efb25 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
 
 /**
  * An immutable and empty ConnectionRecordSet.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleDirectory.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
index f688350ba..b39be6f28 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.Identifiable;
 
 /**
  * An extremely simple read-only implementation of a Directory which provides
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
index b884263c1..73889d17d 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java
@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * A read-only implementation of ObjectPermissionSet which uses a backing Set
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleSystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
similarity index 92%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
index a83a5d17e..24c2f6a7c 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * A read-only implementation of SystemPermissionSet which uses a backing Set
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
index 046458acb..13228ce3b 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AbstractUser;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AbstractUser;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * An extremely basic User implementation.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
similarity index 91%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
index a47fd0bf5..c564d73f0 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java
@@ -20,24 +20,24 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely simple UserContext implementation which provides access to
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
index e44f1897e..7e4a2d82c 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.User;
 
 /**
  * An extremely simple read-only implementation of a Directory of Users which
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/package-info.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/package-info.java
index c2e6496cd..24e952a79 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/package-info.java
@@ -25,5 +25,5 @@
  * simple AuthenticationProviders in the same way allowed by the old
  * authentication API.
  */
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
similarity index 95%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
index 6067d5e34..1bf878afd 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationFailureEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * An event which is triggered whenever a user's credentials fail to be
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
index 08aa3b15f..d383f38c0 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/AuthenticationSuccessEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a user's credentials pass
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
index 5ce87e7ca..62c9cdc96 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/CredentialEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * Abstract basis for events which may have associated user credentials when
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
index 55b0ad10f..4619f77b6 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelCloseEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being closed. The tunnel
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
index 71f3aaa17..e54f7a2e3 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelConnectEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being connected. The tunnel
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
index 2a583a7ff..d4d3c372a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/TunnelEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * Abstract basis for events associated with tunnels.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
index f851efc3c..790dab460 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/UserEvent.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * Abstract basis for events which may have an associated UserContext when
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
similarity index 92%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
index 2ce854e37..acb30f5e8 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationFailureListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.AuthenticationFailureEvent;
 
 /**
  * A listener whose authenticationFailed() hook will fire immediately
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
index 70f76eca1..e36090603 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/AuthenticationSuccessListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.AuthenticationSuccessEvent;
 
 /**
  * A listener whose hooks will fire immediately before and after a user's
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
similarity index 92%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
index 9aa183d88..7d554dc88 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelCloseListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.TunnelCloseEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.TunnelCloseEvent;
 
 /**
  * A listener whose tunnelClosed() hook will fire immediately after an
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
index c31e6014e..a582bc91e 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/TunnelConnectListener.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.TunnelConnectEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.TunnelConnectEvent;
 
 /**
  * A listener whose tunnelConnected() hook will fire immediately after a new
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/package-info.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/package-info.java
index e5fc9dbe7..9853f5711 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/listener/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/package-info.java
@@ -27,5 +27,5 @@
  * in some cases, prevent the web application from allowing the
  * event to continue for the user that triggered it.
  */
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/package-info.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/net/event/package-info.java
index f604cc4c0..091aa16f3 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/event/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/event/package-info.java
@@ -26,7 +26,7 @@
  * These event classes are most useful when used with hooks implemented
  * using listener classes.
  *
- * @see org.glyptodon.guacamole.net.event.listener
+ * @see org.apache.guacamole.net.event.listener
  */
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
similarity index 92%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
index 0015bc474..e29a5b88f 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/BooleanGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an boolean. Legal true values are "true",
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
similarity index 94%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
index 416dc33b3..0d72f2fe1 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/FileGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a filename.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
index b629183cd..bafa403d3 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleHome.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
 import org.slf4j.Logger;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
index 891667e05..5a1b3cd1c 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperties.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
similarity index 95%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
index c2980c19a..d9da53609 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/GuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * An abstract representation of a property in the guacamole.properties file,
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
similarity index 92%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
index b11a1dba9..f0ca44750 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/IntegerGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an integer.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/LongGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
similarity index 91%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/LongGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
index 9fa238fde..699d4f54d 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/LongGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an long.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
similarity index 93%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
index afad37f8f..8562d4c2b 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/StringGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a simple string.
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/package-info.java
similarity index 96%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/package-info.java
index 2be1bd102..0fc0e4874 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/properties/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/package-info.java
@@ -24,5 +24,5 @@
  * Provides classes for reading properties from the web-application-wide
  * guacamole.properties file.
  */
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/protocols/ProtocolInfo.java b/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/protocols/ProtocolInfo.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
index 36d88b4a8..5580b0659 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/protocols/ProtocolInfo.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocols;
+package org.apache.guacamole.protocols;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.form.Form;
+import org.apache.guacamole.form.Form;
 
 /**
  * Describes a protocol and all forms associated with it, as required by
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/token/StandardTokens.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
index 572eb9f15..e158d7bb2 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/token/StandardTokens.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.token;
+package org.apache.guacamole.token;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * Utility class which provides access to standardized token names, as well as
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/token/TokenFilter.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
similarity index 99%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/token/TokenFilter.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
index 56a5dbabc..4ef94854a 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/token/TokenFilter.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.token;
+package org.apache.guacamole.token;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/DocumentHandler.java b/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
similarity index 99%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/DocumentHandler.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
index bc77ad412..01a32ac48 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/DocumentHandler.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.xml;
+package org.apache.guacamole.xml;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/TagHandler.java b/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
similarity index 98%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/TagHandler.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
index b8904998d..f30718c87 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/TagHandler.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.xml;
+package org.apache.guacamole.xml;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/package-info.java b/guacamole-ext/src/main/java/org/apache/guacamole/xml/package-info.java
similarity index 97%
rename from guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/package-info.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/xml/package-info.java
index 4b6d1562b..eb6e76336 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/xml/package-info.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/xml/package-info.java
@@ -24,5 +24,5 @@
  * Classes driving the SAX-based XML parser used by the Guacamole web
  * application.
  */
-package org.glyptodon.guacamole.xml;
+package org.apache.guacamole.xml;
 
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
similarity index 100%
rename from guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
rename to guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
similarity index 100%
rename from guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/ssh.json
rename to guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
similarity index 100%
rename from guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/telnet.json
rename to guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
similarity index 100%
rename from guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
rename to guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
diff --git a/guacamole-ext/src/test/java/org/glyptodon/guacamole/token/TokenFilterTest.java b/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
similarity index 98%
rename from guacamole-ext/src/test/java/org/glyptodon/guacamole/token/TokenFilterTest.java
rename to guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
index 9d0777c31..beb33060d 100644
--- a/guacamole-ext/src/test/java/org/glyptodon/guacamole/token/TokenFilterTest.java
+++ b/guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.token;
+package org.apache.guacamole.token;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 80b18fdfe..ff5203900 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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
     <version>0.9.9</version>
@@ -87,7 +87,7 @@
                     <!-- Add files from guacamole-common-js -->
                     <overlays>
                         <overlay>
-                            <groupId>org.glyptodon.guacamole</groupId>
+                            <groupId>org.apache.guacamole</groupId>
                             <artifactId>guacamole-common-js</artifactId>
                             <type>zip</type>
                         </overlay>
@@ -219,21 +219,21 @@
         
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.9</version>
         </dependency>
 
         <!-- Guacamole JavaScript API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
             <version>0.9.9</version>
             <type>zip</type>
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index ba3d441fe..4653eb640 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -28,17 +28,17 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.auth.Authorization;
-import org.glyptodon.guacamole.net.basic.auth.UserMapping;
-import org.glyptodon.guacamole.xml.DocumentHandler;
-import org.glyptodon.guacamole.net.basic.xml.usermapping.UserMappingTagHandler;
-import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.net.basic.auth.Authorization;
+import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.xml.DocumentHandler;
+import org.apache.guacamole.net.basic.xml.usermapping.UserMappingTagHandler;
+import org.apache.guacamole.properties.FileGuacamoleProperty;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
similarity index 91%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
index be6e328f6..d2bff1a31 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java
similarity index 85%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java
index d9962fef9..3bf6b9e96 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java
@@ -20,21 +20,21 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
 import com.google.inject.servlet.GuiceServletContextListener;
 import javax.servlet.ServletContextEvent;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.basic.extension.ExtensionModule;
-import org.glyptodon.guacamole.net.basic.log.LogModule;
-import org.glyptodon.guacamole.net.basic.rest.RESTServiceModule;
-import org.glyptodon.guacamole.net.basic.rest.auth.BasicTokenSessionMap;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenSessionMap;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.basic.extension.ExtensionModule;
+import org.apache.guacamole.net.basic.log.LogModule;
+import org.apache.guacamole.net.basic.rest.RESTServiceModule;
+import org.apache.guacamole.net.basic.rest.auth.BasicTokenSessionMap;
+import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java
similarity index 99%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java
index 8a1fca151..dae5d7498 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 /**
  * Provides central storage for a cross-connection clipboard state. This
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java
index 7032d5eb1..76559d101 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.AbstractModule;
-import org.glyptodon.guacamole.environment.Environment;
+import org.apache.guacamole.environment.Environment;
 
 /**
  * Guice module which binds the base Guacamole server environment.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java
index 8c3f40c94..236d366c1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -32,10 +32,10 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
 
 /**
  * A ClassLoader implementation which finds classes within a configurable
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java
index dab83953e..6d9ffc3eb 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.UserContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/HTTPTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/HTTPTunnelRequest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java
index af7b7f025..da6bf22a1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/HTTPTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelLoader.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelLoader.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java
index efcc8a333..960daff04 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelLoader.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Module;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java
index 9ee464628..11685176f 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.servlet.ServletModule;
 import java.lang.reflect.InvocationTargetException;
@@ -43,10 +43,10 @@ public class TunnelModule extends ServletModule {
      * Classnames of all implementation-specific WebSocket tunnel modules.
      */
     private static final String[] WEBSOCKET_MODULES = {
-        "org.glyptodon.guacamole.net.basic.websocket.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.jetty8.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.jetty9.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.tomcat.WebSocketTunnelModule"
+        "org.apache.guacamole.net.basic.websocket.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.jetty8.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.jetty9.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.tomcat.WebSocketTunnelModule"
     };
 
     private boolean loadWebSocketModule(String classname) {
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java
index bb4d4eb8b..5866485a9 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A request object which provides only the functions absolutely required to
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequestService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequestService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java
index 6a2ef7a3b..128b8993c 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelRequestService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java
@@ -20,23 +20,23 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.net.DelegatingGuacamoleTunnel;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.net.DelegatingGuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java
index 1e88ef07d..82974a369 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/Authorization.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.auth;
+package org.apache.guacamole.net.basic.auth;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.TreeMap;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Mapping of username/password pair to configuration set. In addition to basic
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java
index 7a18103d1..3853abc9d 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/UserMapping.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.auth;
+package org.apache.guacamole.net.basic.auth;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java
index 0611b3796..58313778d 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/auth/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java
@@ -24,5 +24,5 @@
  * Classes which drive the default, basic authentication of the Guacamole
  * web application.
  */
-package org.glyptodon.guacamole.net.basic.auth;
+package org.apache.guacamole.net.basic.auth;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/AuthenticationProviderFacade.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/AuthenticationProviderFacade.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java
index 227d43017..b63c84694 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/AuthenticationProviderFacade.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java
@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/DirectoryClassLoader.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/DirectoryClassLoader.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java
index 4a4a8f271..e69c23092 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/DirectoryClassLoader.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -32,7 +32,7 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A ClassLoader implementation which finds classes within .jar files within a
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java
index 517e9c085..120690a30 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,11 +40,11 @@ import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.resource.ClassPathResource;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.basic.resource.ClassPathResource;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * A Guacamole extension, which may provide custom authentication, static
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionManifest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java
similarity index 99%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionManifest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java
index 750d7aa54..44efdaebf 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionManifest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
index deca3c831..bc83f74d2 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import com.google.inject.Provides;
 import com.google.inject.servlet.ServletModule;
@@ -33,15 +33,15 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import net.sourceforge.guacamole.net.basic.BasicFileAuthenticationProvider;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
-import org.glyptodon.guacamole.net.basic.resource.ResourceServlet;
-import org.glyptodon.guacamole.net.basic.resource.SequenceResource;
-import org.glyptodon.guacamole.net.basic.resource.WebApplicationResource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.ResourceServlet;
+import org.apache.guacamole.net.basic.resource.SequenceResource;
+import org.apache.guacamole.net.basic.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java
index dece975e6..6423b5dc8 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,12 +36,12 @@ import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import org.glyptodon.guacamole.net.basic.resource.ByteArrayResource;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
-import org.glyptodon.guacamole.net.basic.resource.WebApplicationResource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.net.basic.resource.ByteArrayResource;
+import org.apache.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/PatchResourceService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/PatchResourceService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java
index 7c882927b..76ef104c0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/PatchResourceService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * Service which provides access to all HTML patches as resources, and allows
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java
index 198e4c4b7..9675904f3 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java
@@ -24,4 +24,4 @@
  * Classes which represent and facilitate the loading of extensions to the
  * Guacamole web application.
  */
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java
index 94589b807..739460ddd 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.log;
+package org.apache.guacamole.net.basic.log;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -28,7 +28,7 @@ import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.util.StatusPrinter;
 import com.google.inject.AbstractModule;
 import java.io.File;
-import org.glyptodon.guacamole.environment.Environment;
+import org.apache.guacamole.environment.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java
index 9da7ed516..183b53031 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java
@@ -24,5 +24,5 @@
  * Classes specific to the general-purpose web application implemented by
  * the Guacamole project using the Guacamole APIs.
  */
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java
similarity index 87%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java
index c2dd97d04..1c1513100 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is the name of a class to use to
@@ -49,7 +49,7 @@ public abstract class AuthenticationProviderProperty implements GuacamolePropert
         try {
 
             // Get authentication provider class
-            Class<?> authProviderClass = org.glyptodon.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName);
+            Class<?> authProviderClass = org.apache.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName);
 
             // Verify the located class is actually a subclass of AuthenticationProvider
             if (!AuthenticationProvider.class.isAssignableFrom(authProviderClass))
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java
similarity index 92%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java
index 2bccfdb5e..b75d1c3b0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
-import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.FileGuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the default Guacamole web application.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/StringSetProperty.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/StringSetProperty.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java
index 037427f3e..34fb58af0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/StringSetProperty.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is a Set of unique Strings. The string value
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java
index 9302914a3..6ca9523ec 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java
@@ -24,5 +24,5 @@
  * Classes related to the properties which the Guacamole web application
  * (and stock parts of it) read from guacamole.properties.
  */
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/AbstractResource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/AbstractResource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java
index 0e0e9f169..c4489a479 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/AbstractResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 /**
  * Base abstract resource implementation which provides an associated mimetype,
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ByteArrayResource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ByteArrayResource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java
index 86bfb568d..af071d8d6 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ByteArrayResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ClassPathResource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ClassPathResource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java
index 1f7537835..5dc539224 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ClassPathResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/Resource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/Resource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java
index 2a50b7595..f8accdd08 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/Resource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ResourceServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ResourceServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java
index 494bebe9e..826604901 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/ResourceServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/SequenceResource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java
similarity index 99%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/SequenceResource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java
index 4f42fe7fe..635adf55f 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/SequenceResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 import java.io.SequenceInputStream;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/WebApplicationResource.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/WebApplicationResource.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java
index ad99181fc..5e22831cc 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/WebApplicationResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 import javax.servlet.ServletContext;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java
index ff6b304cf..6e1829f62 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/resource/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java
@@ -25,4 +25,4 @@
  * the contents of the classpath of a classloader, or files within the web
  * application itself.
  */
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIError.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIError.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java
index 1f8ed261e..642fb3927 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIError.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.Collection;
 import javax.ws.rs.core.Response;
-import org.glyptodon.guacamole.form.Field;
+import org.apache.guacamole.form.Field;
 
 /**
  * Describes an error that occurred within a REST endpoint.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIException.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIException.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java
index 4fff36e5b..50f05a2b0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIException.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.Collection;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
-import org.glyptodon.guacamole.form.Field;
+import org.apache.guacamole.form.Field;
 
 /**
  * An exception that will result in the given error error information being
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIPatch.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIPatch.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java
index c5c2dec8e..3be1eac76 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIPatch.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 /**
  * An object for representing the body of a HTTP PATCH method.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIRequest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java
index c1a79cc7c..566990a12 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/APIRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.Collections;
 import java.util.Enumeration;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/ObjectRetrievalService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/ObjectRetrievalService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java
index a9af8c6c0..90dcf9e61 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/ObjectRetrievalService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java
@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup;
 
 /**
  * Provides easy access and automatic error handling for retrieval of objects,
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/PATCH.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/PATCH.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java
index bca1b3389..84350c6c0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/PATCH.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTExceptionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTExceptionWrapper.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java
index 92bb63f06..319bc628a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTExceptionWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.Inject;
 import java.lang.annotation.Annotation;
@@ -29,14 +29,14 @@ import javax.ws.rs.FormParam;
 import javax.ws.rs.QueryParam;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTMethodMatcher.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTMethodMatcher.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java
index 643addcd9..08f14e140 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTMethodMatcher.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.matcher.AbstractMatcher;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import javax.ws.rs.HttpMethod;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A Guice Matcher which matches only methods which throw GuacamoleException
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServiceModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java
similarity index 77%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServiceModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java
index 72842ba16..9174aad99 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServiceModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.Scopes;
 import com.google.inject.matcher.Matchers;
@@ -28,19 +28,19 @@ import com.google.inject.servlet.ServletModule;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenRESTService;
-import org.glyptodon.guacamole.net.basic.rest.connection.ConnectionRESTService;
-import org.glyptodon.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService;
-import org.glyptodon.guacamole.net.basic.rest.activeconnection.ActiveConnectionRESTService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthTokenGenerator;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.auth.SecureRandomAuthTokenGenerator;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenSessionMap;
-import org.glyptodon.guacamole.net.basic.rest.history.HistoryRESTService;
-import org.glyptodon.guacamole.net.basic.rest.language.LanguageRESTService;
-import org.glyptodon.guacamole.net.basic.rest.patch.PatchRESTService;
-import org.glyptodon.guacamole.net.basic.rest.schema.SchemaRESTService;
-import org.glyptodon.guacamole.net.basic.rest.user.UserRESTService;
+import org.apache.guacamole.net.basic.rest.auth.TokenRESTService;
+import org.apache.guacamole.net.basic.rest.connection.ConnectionRESTService;
+import org.apache.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService;
+import org.apache.guacamole.net.basic.rest.activeconnection.ActiveConnectionRESTService;
+import org.apache.guacamole.net.basic.rest.auth.AuthTokenGenerator;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.auth.SecureRandomAuthTokenGenerator;
+import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap;
+import org.apache.guacamole.net.basic.rest.history.HistoryRESTService;
+import org.apache.guacamole.net.basic.rest.language.LanguageRESTService;
+import org.apache.guacamole.net.basic.rest.patch.PatchRESTService;
+import org.apache.guacamole.net.basic.rest.schema.SchemaRESTService;
+import org.apache.guacamole.net.basic.rest.user.UserRESTService;
 
 /**
  * A Guice Module to set up the servlet mappings and authentication-specific
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java
index 2065c39f6..b695381f4 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.activeconnection;
+package org.apache.guacamole.net.basic.rest.activeconnection;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.ActiveConnection;
 
 /**
  * Information related to active connections which may be exposed through the
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java
similarity index 87%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java
index 2f2b69994..929009bfd 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.activeconnection;
+package org.apache.guacamole.net.basic.rest.activeconnection;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -34,22 +34,22 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIPatch;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.PATCH;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIPatch;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.PATCH;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java
index 6c4126bc9..4bb61e1c5 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 /**
  * A simple object to represent an auth token/username pair in the API.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResult.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java
similarity index 98%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResult.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java
index ab8e50d8d..b7eed272b 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/APIAuthenticationResult.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthTokenGenerator.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java
index 1c35d580e..c6528af75 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthTokenGenerator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 /**
  * Generates an auth token for an authenticated user.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthenticationService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthenticationService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java
index a4727686f..1e11f9b39 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/AuthenticationService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java
@@ -20,25 +20,25 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleCredentialsException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.net.basic.GuacamoleSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
index c92f6a7eb..42f513e05 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -29,10 +29,10 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java
index 7fadd1014..9c32ae2ad 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import java.security.SecureRandom;
 import org.apache.commons.codec.binary.Hex;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java
index da64316c6..df37955c2 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import com.google.inject.Inject;
 import java.io.UnsupportedEncodingException;
@@ -37,13 +37,13 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.bind.DatatypeConverter;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenSessionMap.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java
index 350988608..39764af9a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/TokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.GuacamoleSession;
 
 /**
  * Represents a mapping of auth token to Guacamole session for the REST 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java
index ece55a39c..ef40778e5 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the authentication aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnection.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnection.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java
index 628ee1c30..4c1877ed3 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnection.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * A simple connection to expose through the REST endpoints.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnectionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java
similarity index 89%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnectionWrapper.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java
index ec0b3c7fb..0b5de25c4 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/APIConnectionWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java
@@ -20,21 +20,21 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * A wrapper to make an APIConnection look like a Connection. Useful where a
- * org.glyptodon.guacamole.net.auth.Connection is required.
+ * org.apache.guacamole.net.auth.Connection is required.
  * 
  * @author James Muehlner
  */
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java
similarity index 91%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java
index fad3c4ef4..616d21384 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -36,23 +36,23 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.history.APIConnectionRecord;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.history.APIConnectionRecord;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java
index 3d55216fd..ba92eaae5 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the connection manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java
index 82418b906..bf98a08f0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java
@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.Collection;
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup.Type;
-import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup.Type;
+import org.apache.guacamole.net.basic.rest.connection.APIConnection;
 
 /**
  * A simple connection group to expose through the REST endpoints.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java
index 8d3dd2679..ff3774651 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * A wrapper to make an APIConnection look like a ConnectionGroup.
- * Useful where a org.glyptodon.guacamole.net.auth.ConnectionGroup is required.
+ * Useful where a org.apache.guacamole.net.auth.ConnectionGroup is required.
  * 
  * @author James Muehlner
  */
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
index 1a1bcadee..2f113deea 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.List;
@@ -34,15 +34,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
index 918374db5..7b8946648 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,13 +28,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.basic.rest.connection.APIConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java
index dc404cbc1..0b5d6da68 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java
@@ -24,5 +24,5 @@
  * Classes related to the connection group manipulation aspect
  * of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecord.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecord.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java
index 8c38148cc..d583c15a3 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecord.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A connection record which may be exposed through the REST endpoints.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
index df3dec58c..29971e52f 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.basic.rest.APIError;
-import org.glyptodon.guacamole.net.basic.rest.APIException;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.basic.rest.APIError;
+import org.apache.guacamole.net.basic.rest.APIException;
 
 /**
  * A sort predicate which species the property to use when sorting connection
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java
similarity index 91%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java
index 1f9f4c8b8..e6f0b50e4 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -32,13 +32,13 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java
index 0cd154b8f..3dc031ad3 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java
@@ -24,5 +24,5 @@
  * Classes related to retrieval or maintenance of history records using the
  * Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java
index e1a35f89d..9e878e83f 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.language;
+package org.apache.guacamole.net.basic.rest.language;
 
 import com.google.inject.Inject;
 import java.util.Map;
@@ -28,7 +28,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.net.basic.extension.LanguageResourceService;
+import org.apache.guacamole.net.basic.extension.LanguageResourceService;
 
 
 /**
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java
index e0e7ad697..96203506f 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the language retrieval aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.language;
+package org.apache.guacamole.net.basic.rest.language;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java
index 31a00e57c..e61d11e07 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the basic Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/PatchRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/PatchRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java
index 028c34ac6..4cd90cd89 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/PatchRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.patch;
+package org.apache.guacamole.net.basic.rest.patch;
 
 import com.google.inject.Inject;
 import java.io.IOException;
@@ -32,10 +32,10 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.net.basic.extension.PatchResourceService;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.net.basic.extension.PatchResourceService;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * A REST Service for handling the listing of HTML patches.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java
index 49a979397..549efc2a9 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/patch/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the HTML patch retrieval aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.patch;
+package org.apache.guacamole.net.basic.rest.patch;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/APIPermissionSet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java
similarity index 96%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/APIPermissionSet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java
index d04dd0bb5..2965bfc72 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/APIPermissionSet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.permission;
+package org.apache.guacamole.net.basic.rest.permission;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * The set of permissions which are granted to a specific user, organized by
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java
index 274d74b0b..8312852fe 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the permission manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.permission;
+package org.apache.guacamole.net.basic.rest.permission;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/SchemaRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java
similarity index 92%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/SchemaRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java
index 66a2aa78f..dfd92989d 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/SchemaRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.net.basic.rest.schema;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -32,15 +32,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.protocols.ProtocolInfo;
 
 /**
  * A REST service which provides access to descriptions of the properties,
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java
index e9aaaa552..a005d7eee 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java
@@ -24,4 +24,4 @@
  * Classes related to the self-description of the Guacamole REST API, such as
  * the attributes or parameters applicable to specific objects.
  */
-package org.glyptodon.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.net.basic.rest.schema;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUser.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUser.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java
index a278e0797..bcbbf7e27 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUser.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.User;
 
 /**
  * A simple User to expose through the REST endpoints.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java
similarity index 97%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java
index 7bdb60150..483a141f1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 /**
  * All the information necessary for the password update operation on a user.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserWrapper.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java
similarity index 88%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserWrapper.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java
index f918dbf05..68931e0a6 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/APIUserWrapper.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java
@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * A wrapper to make an APIUser look like a User. Useful where an
- * org.glyptodon.guacamole.net.auth.User is required. As a simple wrapper for
+ * org.apache.guacamole.net.auth.User is required. As a simple wrapper for
  * APIUser, access to permissions is not provided. Any attempt to access or
  * manipulate permissions on an APIUserWrapper will result in an exception.
  * 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/PermissionSetPatch.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/PermissionSetPatch.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java
index cb887e64e..a39838897 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/PermissionSetPatch.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * A set of changes to be applied to a PermissionSet, describing the set of
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java
index 0aa92446e..9c79eefdb 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -39,29 +39,29 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleCredentialsException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIPatch;
-import static org.glyptodon.guacamole.net.basic.rest.APIPatch.Operation.add;
-import static org.glyptodon.guacamole.net.basic.rest.APIPatch.Operation.remove;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.PATCH;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.permission.APIPermissionSet;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIPatch;
+import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.add;
+import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.remove;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.PATCH;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.permission.APIPermissionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java
index d45b5f4f8..dfa6d917a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to the user manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
similarity index 92%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
index 479d60236..981c38331 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import com.google.inject.Provider;
 import java.util.Map;
@@ -29,11 +29,11 @@ import javax.websocket.HandshakeResponse;
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-import org.glyptodon.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
 
 /**
  * Tunnel implementation which uses WebSocket as a tunnel backend, rather than
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java
index 69a62fabe..d3118b4f1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import com.google.inject.Provider;
 import com.google.inject.servlet.ServletModule;
@@ -28,8 +28,8 @@ import java.util.Arrays;
 import javax.websocket.DeploymentException;
 import javax.websocket.server.ServerContainer;
 import javax.websocket.server.ServerEndpointConfig;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
index 6a687f8f0..7c2b84427 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import java.util.List;
 import java.util.Map;
 import javax.websocket.server.HandshakeRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * WebSocket-specific implementation of TunnelRequest.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java
similarity index 86%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java
index 418e16714..6d12b2b39 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * Tunnel servlet implementation which uses WebSocket as a tunnel backend,
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
index 8c09780ea..26f45dfe1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
@@ -20,22 +20,22 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
 import org.eclipse.jetty.websocket.WebSocket;
 import org.eclipse.jetty.websocket.WebSocket.Connection;
 import org.eclipse.jetty.websocket.WebSocketServlet;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.net.basic.HTTPTunnelRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.net.basic.HTTPTunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java
index 9e94da9b2..e4e037c9a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import com.google.inject.servlet.ServletModule;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.glyptodon.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java
index 9b63a7d49..8cd31bed8 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Jetty 8 WebSocket tunnel implementation. The classes here require Jetty 8.
  */
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
index c833cccd9..d7ba080b6 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * WebSocketCreator which selects the appropriate WebSocketListener
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java
index b44b562f3..de67830fd 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import org.eclipse.jetty.websocket.api.Session;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * WebSocket listener implementation which properly parses connection IDs
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java
index 4c495ae13..65f673d38 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
index 802ebbf6f..1ca516ebf 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
@@ -20,20 +20,20 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import java.io.IOException;
 import org.eclipse.jetty.websocket.api.CloseStatus;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketListener;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java
index de27e0213..a2958e3d6 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import com.google.inject.servlet.ServletModule;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.glyptodon.guacamole.net.basic.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.net.basic.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
index 5e71b3824..b807f9fa7 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * Jetty 9 WebSocket-specific implementation of TunnelRequest.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java
index dd41e5581..21d8b2c12 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java
@@ -24,5 +24,5 @@
  * Jetty 9 WebSocket tunnel implementation. The classes here require at least
  * Jetty 9, prior to Jetty 9.1 (when support for JSR 356 was implemented).
  */
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/package-info.java
index 1d9d35e1e..a6f995711 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
+++ b/guacamole/src/main/java/org/apache/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;
+package org.apache.guacamole.net.basic.websocket;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java
similarity index 86%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java
index a891575a8..60361a70a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java
@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.tomcat;
+package org.apache.guacamole.net.basic.websocket.tomcat;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * Tunnel servlet implementation which uses WebSocket as a tunnel backend,
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
index fb94371dc..649c3cd8b 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.tomcat;
+package org.apache.guacamole.net.basic.websocket.tomcat;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,18 +29,18 @@ import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.io.GuacamoleReader;
-import org.glyptodon.guacamole.io.GuacamoleWriter;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
 import org.apache.catalina.websocket.StreamInbound;
 import org.apache.catalina.websocket.WebSocketServlet;
 import org.apache.catalina.websocket.WsOutbound;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.net.basic.HTTPTunnelRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.net.basic.HTTPTunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java
similarity index 90%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java
index 432818601..2ff57abd9 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.tomcat;
+package org.apache.guacamole.net.basic.websocket.tomcat;
 
 import com.google.inject.servlet.ServletModule;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.glyptodon.guacamole.net.basic.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.net.basic.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java
index ee8f9c500..a9a48f078 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java
@@ -25,5 +25,5 @@
  * Tomcat 7.0, and may change significantly as there is no common WebSocket
  * API for Java yet.
  */
-package org.glyptodon.guacamole.net.basic.websocket.tomcat;
+package org.apache.guacamole.net.basic.websocket.tomcat;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java
index 0b7788ab0..54a54e057 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
-import org.glyptodon.guacamole.net.basic.auth.Authorization;
-import org.glyptodon.guacamole.net.basic.auth.UserMapping;
-import org.glyptodon.guacamole.xml.TagHandler;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.net.basic.auth.Authorization;
+import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.xml.TagHandler;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java
index 2f2884ab1..0c02f9513 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
-import org.glyptodon.guacamole.net.basic.auth.Authorization;
-import org.glyptodon.guacamole.xml.TagHandler;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.net.basic.auth.Authorization;
+import org.apache.guacamole.xml.TagHandler;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ParamTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ParamTagHandler.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java
index f821491db..4c5ef8bd0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ParamTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
-import org.glyptodon.guacamole.xml.TagHandler;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.xml.TagHandler;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java
similarity index 93%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java
index c50a26b4b..b00b711f1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
-import org.glyptodon.guacamole.xml.TagHandler;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.xml.TagHandler;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java
similarity index 94%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java
index 23c34471a..144b2c47d 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
-import org.glyptodon.guacamole.net.basic.auth.UserMapping;
-import org.glyptodon.guacamole.xml.TagHandler;
+import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.xml.TagHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/package-info.java b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java
similarity index 95%
rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/package-info.java
rename to guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java
index 08ec7bd3c..dfb580b0c 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/usermapping/package-info.java
+++ b/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java
@@ -23,5 +23,5 @@
 /**
  * Classes related to parsing the user-mapping.xml file.
  */
-package org.glyptodon.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.net.basic.xml.usermapping;
 
diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml
index 490bdb335..e1f535e53 100644
--- a/guacamole/src/main/webapp/WEB-INF/web.xml
+++ b/guacamole/src/main/webapp/WEB-INF/web.xml
@@ -42,7 +42,7 @@
     </filter-mapping>
 
     <listener>
-        <listener-class>org.glyptodon.guacamole.net.basic.BasicServletContextListener</listener-class>
+        <listener-class>org.apache.guacamole.net.basic.BasicServletContextListener</listener-class>
     </listener>
 
     <!-- Audio file mimetype mappings -->
diff --git a/pom.xml b/pom.xml
index e7bb72ac3..61ce42436 100644
--- a/pom.xml
+++ b/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>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-client</artifactId>
     <packaging>pom</packaging>
     <version>0.9.9</version>