diff --git a/pom.xml b/pom.xml
index 90ebb03..8e1b1ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,200 +1,158 @@
 <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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-	<properties>
-		<gae.version>1.9.5</gae.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+  <properties>
+    <gae.version>1.9.5</gae.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-	<groupId>com.googlecode.objectify</groupId>
-	<artifactId>objectify-gwt</artifactId>
-	<version>1.2.2-SNAPSHOT</version>
+  <groupId>com.googlecode.objectify</groupId>
+  <artifactId>objectify-gwt</artifactId>
+  <version>1.2.2-SNAPSHOT</version>
 
-	<name>Objectify GWT</name>
-	<description>Use Google App Engine datastore and Objectify classes with GWT</description>
-	<packaging>jar</packaging>
-	<url>http://code.google.com/p/objectify-gwt/</url>
-	<scm>
-		<url>scm:git:https://code.google.com/p/objectify-gwt/</url>
-	</scm>
-	<licenses>
-		<license>
-			<name>MIT License</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<id>jeff</id>
-			<name>Jeff Schnitzer</name>
-			<email>jeff@infohazard.org</email>
-		</developer>
-	</developers>
+  <name>Objectify GWT</name>
+  <description>Use Google App Engine datastore and Objectify classes with GWT</description>
+  <packaging>gwt-lib</packaging>
+  <url>http://code.google.com/p/objectify-gwt/</url>
+  <scm>
+    <url>scm:git:https://code.google.com/p/objectify-gwt/</url>
+  </scm>
+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>jeff</id>
+      <name>Jeff Schnitzer</name>
+      <email>jeff@infohazard.org</email>
+    </developer>
+  </developers>
 
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>ossrh</id>
-			<name>Nexus Release Repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>ossrh</id>
+      <name>Nexus Release Repository</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
 
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
-	<profiles>
-		<profile>
-			<id>release-sign-artifacts</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>net.ltgt.gwt.maven</groupId>
+        <artifactId>gwt-maven-plugin</artifactId>
+        <version>1.0-rc-8</version>
+        <extensions>true</extensions>
+        <configuration>
+          <moduleName>com.googlecode.objectify.Objectify</moduleName>
+          <relocateSuperSource>true</relocateSuperSource>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.2</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/NotFoundException.java</include>
-					<include>**/*_CustomFieldSerializer.java</include>
-				</includes>
-				<excludes>
-					<!-- We have a special way of doing this on client, pulled in as a normal resource -->
-					<exclude>com/googlecode/objectify/impl/ref/LiveRef_CustomFieldSerializer.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
+  <dependencies>
+    <!-- Mandatory -->
+    <dependency>
+      <groupId>com.googlecode.objectify</groupId>
+      <artifactId>objectify</artifactId>
+      <version>5.1.21</version>
+    </dependency>
 
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.2</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <!-- GWT -->
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>2.8.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
 
-	<dependencies>
-		<!-- Mandatory -->
-		<dependency>
-			<groupId>com.googlecode.objectify</groupId>
-			<artifactId>objectify</artifactId>
-			<version>5.0.3</version>
-		</dependency>
-
-		<!-- GWT -->
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-user</artifactId>
-			<version>2.6.1</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
-
-		<!-- Google App Engine -->
-		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-api-1.0-sdk</artifactId>
-			<version>${gae.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-api-labs</artifactId>
-			<version>${gae.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-api-stubs</artifactId>
-			<version>${gae.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-testing</artifactId>
-			<version>${gae.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Testing -->
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.8</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>1.9.5</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <!-- Google App Engine -->
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>${gae.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-labs</artifactId>
+      <version>${gae.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-stubs</artifactId>
+      <version>${gae.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-testing</artifactId>
+      <version>${gae.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/AppIdNamespace.java b/src/main/super/com/google/appengine/api/datastore/AppIdNamespace.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/AppIdNamespace.java
rename to src/main/super/com/google/appengine/api/datastore/AppIdNamespace.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Blob.java b/src/main/super/com/google/appengine/api/datastore/Blob.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Blob.java
rename to src/main/super/com/google/appengine/api/datastore/Blob.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Category.java b/src/main/super/com/google/appengine/api/datastore/Category.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Category.java
rename to src/main/super/com/google/appengine/api/datastore/Category.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Cursor.java b/src/main/super/com/google/appengine/api/datastore/Cursor.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Cursor.java
rename to src/main/super/com/google/appengine/api/datastore/Cursor.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/DataTypeUtils.java b/src/main/super/com/google/appengine/api/datastore/DataTypeUtils.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/DataTypeUtils.java
rename to src/main/super/com/google/appengine/api/datastore/DataTypeUtils.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Email.java b/src/main/super/com/google/appengine/api/datastore/Email.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Email.java
rename to src/main/super/com/google/appengine/api/datastore/Email.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/EntityNotFoundException.java b/src/main/super/com/google/appengine/api/datastore/EntityNotFoundException.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/EntityNotFoundException.java
rename to src/main/super/com/google/appengine/api/datastore/EntityNotFoundException.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/GeoPt.java b/src/main/super/com/google/appengine/api/datastore/GeoPt.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/GeoPt.java
rename to src/main/super/com/google/appengine/api/datastore/GeoPt.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/IMHandle.java b/src/main/super/com/google/appengine/api/datastore/IMHandle.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/IMHandle.java
rename to src/main/super/com/google/appengine/api/datastore/IMHandle.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Key.java b/src/main/super/com/google/appengine/api/datastore/Key.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Key.java
rename to src/main/super/com/google/appengine/api/datastore/Key.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/KeyFactory.java b/src/main/super/com/google/appengine/api/datastore/KeyFactory.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/KeyFactory.java
rename to src/main/super/com/google/appengine/api/datastore/KeyFactory.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Key_CustomFieldSerializer.java b/src/main/super/com/google/appengine/api/datastore/Key_CustomFieldSerializer.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Key_CustomFieldSerializer.java
rename to src/main/super/com/google/appengine/api/datastore/Key_CustomFieldSerializer.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Link.java b/src/main/super/com/google/appengine/api/datastore/Link.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Link.java
rename to src/main/super/com/google/appengine/api/datastore/Link.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/PhoneNumber.java b/src/main/super/com/google/appengine/api/datastore/PhoneNumber.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/PhoneNumber.java
rename to src/main/super/com/google/appengine/api/datastore/PhoneNumber.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/PostalAddress.java b/src/main/super/com/google/appengine/api/datastore/PostalAddress.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/PostalAddress.java
rename to src/main/super/com/google/appengine/api/datastore/PostalAddress.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Rating.java b/src/main/super/com/google/appengine/api/datastore/Rating.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Rating.java
rename to src/main/super/com/google/appengine/api/datastore/Rating.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/ShortBlob.java b/src/main/super/com/google/appengine/api/datastore/ShortBlob.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/ShortBlob.java
rename to src/main/super/com/google/appengine/api/datastore/ShortBlob.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Text.java b/src/main/super/com/google/appengine/api/datastore/Text.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/datastore/Text.java
rename to src/main/super/com/google/appengine/api/datastore/Text.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/appengine/api/users/User.java b/src/main/super/com/google/appengine/api/users/User.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/appengine/api/users/User.java
rename to src/main/super/com/google/appengine/api/users/User.java
diff --git a/src/main/resources/com/google/appengine/super/com/google/apphosting/api/NamespaceResources.java b/src/main/super/com/google/apphosting/api/NamespaceResources.java
similarity index 100%
rename from src/main/resources/com/google/appengine/super/com/google/apphosting/api/NamespaceResources.java
rename to src/main/super/com/google/apphosting/api/NamespaceResources.java
diff --git a/src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/Key.java b/src/main/super/com/googlecode/objectify/Key.java
similarity index 100%
rename from src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/Key.java
rename to src/main/super/com/googlecode/objectify/Key.java
diff --git a/src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/NotFoundException.java b/src/main/super/com/googlecode/objectify/NotFoundException.java
similarity index 100%
rename from src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/NotFoundException.java
rename to src/main/super/com/googlecode/objectify/NotFoundException.java
diff --git a/src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/Ref.java b/src/main/super/com/googlecode/objectify/Ref.java
similarity index 100%
rename from src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/Ref.java
rename to src/main/super/com/googlecode/objectify/Ref.java
diff --git a/src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/impl/ref/LiveRef.java b/src/main/super/com/googlecode/objectify/impl/ref/LiveRef.java
similarity index 100%
rename from src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/impl/ref/LiveRef.java
rename to src/main/super/com/googlecode/objectify/impl/ref/LiveRef.java
diff --git a/src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/impl/ref/LiveRef_CustomFieldSerializer.java b/src/main/super/com/googlecode/objectify/impl/ref/LiveRef_CustomFieldSerializer.java
similarity index 100%
rename from src/main/resources/com/googlecode/objectify/super/com/googlecode/objectify/impl/ref/LiveRef_CustomFieldSerializer.java
rename to src/main/super/com/googlecode/objectify/impl/ref/LiveRef_CustomFieldSerializer.java