diff --git a/guacamole/web-client/ant/build.properties b/guacamole/web-client/ant/build.properties
deleted file mode 100644
index 10b783cf0..000000000
--- a/guacamole/web-client/ant/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-servlet.api.jar=/usr/share/tomcat6/lib/servlet-api.jar
-
-src.dir=src
-web.dir=web
-
-build.dir=build
-dist.dir=dist
-doc.dir=doc
-
-guac.version=0.3.1rc1
-tar.dir=guacamole-${guac.version}
-tar.src.dir=guacamole-src
-
diff --git a/guacamole/web-client/build.xml b/guacamole/web-client/build.xml
deleted file mode 100644
index 326b7ca72..000000000
--- a/guacamole/web-client/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="guacamole" default="compile" basedir=".">
-
-	<property file="ant/build.properties"/>
-
-	<target name="clean" description="Removes build and dist dirs.">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}"/>
-		<delete dir="${tar.dir}"/>
-		<delete dir="${tar.src.dir}"/>
-        <delete file="${tar.dir}.tar.gz"/>
-	</target>
-
-	<target name="init" description="Creates build and dist dirs.">
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${build.dir}/WEB-INF/classes"/>
-		<mkdir dir="${dist.dir}"/>
-	</target>
-
-	<target name="compile" description="Compiles Guacamole."
-		depends="init">
-		<copy todir="${build.dir}">
-			<fileset dir="${web.dir}"/>
-        </copy>
-
-        <!-- Replace __GUAC_VERSION with declared version -->
-        <replace dir="${build.dir}" value="${guac.version}">
-            <include name="**/*.html"/>
-            <replacetoken><![CDATA[__GUAC_VERSION]]></replacetoken>
-        </replace>
-
-		<javac srcdir="${src.dir}" destdir="${build.dir}/WEB-INF/classes"
-            classpath="${servlet.api.jar}">
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-	</target>
-
-	<target name="war" description="Builds Guacamole .war file."
-		depends="compile">
-		<war destfile="${dist.dir}/guacamole.war"
-			webxml="${build.dir}/WEB-INF/web.xml">
-            <fileset dir="${build.dir}"/>
-		</war>
-	</target>
-
-    <target name="tar" description="Build distributable .tar.gz file"
-        depends="war">
-        <mkdir dir="${tar.dir}"/>
-
-        <mkdir dir="${tar.src.dir}"/>
-        <copy todir="${tar.src.dir}">
-            <fileset dir=".">
-                <exclude name=".git/**"/>
-                <exclude name="**/.svn"/>
-                <exclude name="${tar.dir}/**"/>
-                <exclude name="${tar.src.dir}/**"/>
-                <exclude name="${dist.dir}/**"/>
-                <exclude name="${build.dir}/**"/>
-            </fileset>
-        </copy>
-        <tar basedir="." includes="${tar.src.dir}/**" destfile="${tar.dir}/${tar.src.dir}.tar" longfile="gnu"/>
-        <delete dir="${tar.src.dir}"/>
-
-        <copy todir="${tar.dir}">
-            <fileset file="${doc.dir}/example/guacamole.properties"/>
-            <fileset file="${doc.dir}/example/user-mapping.xml"/>
-            <fileset file="${dist.dir}/guacamole.war"/>
-            <fileset file="LICENSE.txt"/>
-        </copy>
-
-        <tar basedir="." includes="${tar.dir}/**" destfile="${tar.dir}.tar.gz" compression="gzip" longfile="gnu"/>
-    </target>
-
-</project>
diff --git a/guacamole/web-client/guacamole-common/pom.xml b/guacamole/web-client/guacamole-common/pom.xml
new file mode 100644
index 000000000..ca171435b
--- /dev/null
+++ b/guacamole/web-client/guacamole-common/pom.xml
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sourceforge.guacamole</groupId>
+  <artifactId>guacamole-common</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>guacamole-common</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/Client.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/Client.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleClient.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleClient.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleException.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleException.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/Configuration.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/Configuration.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleProperties.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleProperties.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Connect.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Connect.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Inbound.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Inbound.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Outbound.java b/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java
similarity index 100%
rename from guacamole/web-client/src/net/sourceforge/guacamole/net/tunnel/Outbound.java
rename to guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java