diff --git a/pom.xml b/pom.xml
index 49b5a0d..1d85e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,23 +58,29 @@
           <exclude>pythagoras/util/Platform.java</exclude>
         </excludes>
       </resource>
+      <resource>
+        <directory>${basedir}/src/gwt/java</directory>
+        <includes>
+          <include>**/*.java</include>
+        </includes>
+      </resource>
     </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
           <fork>true</fork>
           <showDeprecation>true</showDeprecation>
           <showWarnings>true</showWarnings>
-          <!-- yes, this is apparently the Right Way to do this -->
-          <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
-          <excludes>
-            <exclude>pythagoras/gwt/**</exclude>
-          </excludes>
+          <compilerArgs>
+            <arg>-Xlint</arg>
+            <arg>-Xlint:-serial</arg>
+            <arg>-Xlint:-path</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/pythagoras/gwt/pythagoras/util/Platform.java b/src/gwt/java/pythagoras/util/Platform.java
similarity index 100%
rename from src/main/java/pythagoras/gwt/pythagoras/util/Platform.java
rename to src/gwt/java/pythagoras/util/Platform.java