diff --git a/pom.xml b/pom.xml
index 90ebb03..bf31af0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<name>Objectify GWT</name>
 	<description>Use Google App Engine datastore and Objectify classes with GWT</description>
-	<packaging>jar</packaging>
+	<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>
@@ -75,44 +75,17 @@
 	</profiles>
 
 	<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>
-
 		<plugins>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
+				<groupId>net.ltgt.gwt.maven</groupId>
+				<artifactId>gwt-maven-plugin</artifactId>
+				<version>1.0-rc-8</version>
+				<extensions>true</extensions>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<moduleName>com.googlecode.objectify.Objectify</moduleName>
+					<relocateSuperSource>true</relocateSuperSource>
 				</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>
@@ -144,14 +117,14 @@
 		<dependency>
 			<groupId>com.googlecode.objectify</groupId>
 			<artifactId>objectify</artifactId>
-			<version>5.0.3</version>
+			<version>5.1.21</version>
 		</dependency>
 
 		<!-- GWT -->
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
-			<version>2.6.1</version>
+			<version>2.8.1</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
@@ -181,20 +154,6 @@
 			<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>
 
 </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