diff --git a/maven/api/pom.xml b/maven/api/pom.xml
index a8db6792b59fa..be5a96568a174 100644
--- a/maven/api/pom.xml
+++ b/maven/api/pom.xml
@@ -8,8 +8,8 @@
         <artifactId>selenium-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>selenium-api</artifactId>
-    <name>selenium-api</name>
+    <artifactId>selenium-webdriver-api</artifactId>
+    <name>selenium-webdriver-api</name>
 
     <dependencies>
         <dependency>
@@ -30,7 +30,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="com/thoughtworks/selenium/SeleniumException.java" />
                                         <include name="org/openqa/selenium/*.java" />
diff --git a/maven/chrome/pom.xml b/maven/chrome/pom.xml
index eb5c94b680c87..9254f90f410c5 100644
--- a/maven/chrome/pom.xml
+++ b/maven/chrome/pom.xml
@@ -14,7 +14,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-common</artifactId>
+			<artifactId>selenium-webdriver-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -31,7 +31,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="org/openqa/selenium/chrome/**/*.java" />
                                     </fileset>
diff --git a/maven/common/pom.xml b/maven/common/pom.xml
index ee72a46e8d268..7060c1058d35b 100644
--- a/maven/common/pom.xml
+++ b/maven/common/pom.xml
@@ -8,8 +8,8 @@
         <artifactId>selenium-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>selenium-common</artifactId>
-    <name>selenium-common</name>
+    <artifactId>selenium-webdriver-common</artifactId>
+    <name>selenium-webdriver-common</name>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-api</artifactId>
+            <artifactId>selenium-webdriver-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -43,7 +43,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="org/openqa/selenium/browserlaunchers/**/*.java" />
                                         <include name="org/openqa/selenium/io/**/*.java" />
diff --git a/maven/firefox/pom.xml b/maven/firefox/pom.xml
index 055c2be4e78cd..1b22f88c4d2b1 100644
--- a/maven/firefox/pom.xml
+++ b/maven/firefox/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-common</artifactId>
+            <artifactId>webdriver-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -35,7 +35,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="org/openqa/selenium/firefox/**/*.java" />
                                     </fileset>
diff --git a/maven/htmlunit/pom.xml b/maven/htmlunit/pom.xml
index c4b0b9d449950..78143287f4e67 100644
--- a/maven/htmlunit/pom.xml
+++ b/maven/htmlunit/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-api</artifactId>
+            <artifactId>selenium-webdriver-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -36,7 +36,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="org/openqa/selenium/htmlunit/**/*.java" />
                                     </fileset>
diff --git a/maven/ie/pom.xml b/maven/ie/pom.xml
index 101bff4c5bee5..9e307ec8a7d83 100644
--- a/maven/ie/pom.xml
+++ b/maven/ie/pom.xml
@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-common</artifactId>
+            <artifactId>selenium-webdriver-common</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
@@ -35,7 +35,7 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
                                         <include name="org/openqa/selenium/ie/**/*.java" />
                                     </fileset>
diff --git a/maven/pom.xml b/maven/pom.xml
index 66bd9d734dccb..c20dd2563c5cf 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -108,10 +108,8 @@
         <module>firefox</module>
         <module>htmlunit</module>
         <module>ie</module>
-<!--
         <module>selenium</module>
         <module>server</module>
--->
         <module>support</module>
     </modules>
 
@@ -147,6 +145,11 @@
                 <artifactId>httpclient</artifactId>
                 <version>4.0.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-all</artifactId>
+                <version>1.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
diff --git a/maven/selenium/pom.xml b/maven/selenium/pom.xml
index 36ada4c1604b5..2c45d4124ac45 100644
--- a/maven/selenium/pom.xml
+++ b/maven/selenium/pom.xml
@@ -18,14 +18,6 @@
             <artifactId>junit</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- We need TestNG for SeleneseTestNgHelper ... -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- Runtime dependencies ... -->
-<!--
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-chrome-driver</artifactId>
@@ -36,13 +28,11 @@
             <artifactId>selenium-htmlunit-driver</artifactId>
             <version>${project.version}</version>
         </dependency>
--->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-firefox-driver</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!--
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-ie-driver</artifactId>
@@ -50,52 +40,47 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-iphone-driver</artifactId>
+            <artifactId>selenium-support</artifactId>
             <version>${project.version}</version>
         </dependency>
--->
+        <!-- We need TestNG for SeleneseTestNgHelper ... -->
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-support</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
     <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>test/java</testSourceDirectory>
         <plugins>
             <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>create_selenium_resources</id>
-                        <phase>generate-resources</phase>
+                        <id>copy_java_files</id>
+                        <phase>generate-sources</phase>
                         <configuration>
                             <tasks>
-                                <!-- 1. Execute rake to build ../build/selenium/selenium.jar ... -->
-                                <condition property="goExecutable" value="go.bat" else="./go">
-                                    <os family="windows" />
-                                </condition>
-                                <exec dir=".." executable="${goExecutable}">
-                                    <arg value="//selenium:selenium" />
-                                </exec>
-                                <!-- Extract everything but the *.class files and MANIFEST.MF from selenium.jar to target/classes ... -->
-                                <unjar src="../../build/java/client/src/org/openqa/selenium/server/server_lite.jar" dest="target/classes">
-                                    <patternset>
-                                        <exclude name="**/*.class" />
-                                        <exclude name="META-INF/MANIFEST.MF" />
-                                    </patternset>
-                                </unjar>
-                                <!-- 2. Extract everything but the class files and MANIFEST.MF to target/classes ... -->
-                                <mkdir dir="target/classes" />
-                                <unjar src="../build/selenium/selenium.jar" dest="target/classes">
-                                    <patternset>
-                                        <exclude name="**/*.class" />
-                                        <exclude name="META-INF/MANIFEST.MF" />
-                                    </patternset>
-                                </unjar>
+                                <delete dir="src/main/java" />
+                                <copy todir="src/main/java" includeEmptyDirs="false">
+                                    <fileset dir="../../java/client/src">
+                                        <include name="**/*.java" />
+                                        <not>
+                                            <or>
+                                                <present targetdir="../api/src/main/java" />
+                                                <present targetdir="../chrome/src/main/java" />
+                                                <present targetdir="../common/src/main/java" />
+                                                <present targetdir="../firefox/src/main/java" />
+                                                <present targetdir="../htmlunit/src/main/java" />
+                                                <present targetdir="../ie/src/main/java" />
+                                                <present targetdir="../support/src/main/java" />
+                                            </or>
+                                        </not>
+                                        <exclude name="org/openqa/selenium/android/**" />
+                                        <exclude name="org/openqa/selenium/iphone/**" />
+                                    </fileset>
+                                </copy>
                             </tasks>
                         </configuration>
                         <goals>
@@ -103,23 +88,14 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>create_selenium_test_resources</id>
-                        <phase>generate-test-resources</phase>
+                        <id>copy_resources</id>
+                        <phase>generate-resources</phase>
                         <configuration>
                             <tasks>
-                                <!-- 1. Execute rake to build ../build/selenium/test.jar ... -->
-                                <condition property="goExecutable" value="go.bat" else="./go">
-                                    <os family="windows" />
-                                </condition>
-                                <exec dir=".." executable="${goExecutable}">
-                                    <arg value="//selenium:test" />
-                                </exec>
-                                <!-- 2. Extract everything but the class files and MANIFEST.MF to target/test-classes ... -->
-                                <mkdir dir="target/test-classes" />
-                                <unjar src="../build/selenium/test.jar" dest="target/test-classes">
+                                <!-- Extract scripts from client-combined-nodeps.jar to target/classes ... -->
+                                <unjar src="../../build/java/client/src/org/openqa/selenium/client-combined-nodeps.jar" dest="target/classes">
                                     <patternset>
-                                        <exclude name="**/*.class" />
-                                        <exclude name="META-INF/MANIFEST.MF" />
+                                        <include name="scripts/selenium/*.js" />
                                     </patternset>
                                 </unjar>
                             </tasks>
@@ -130,17 +106,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- See http://maven.apache.org/plugins/maven-surefire-plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*TestSuite.java</include>
-                        <exclude>**/SingleTestSuite.java</exclude>
-                    </includes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/maven/server/pom.xml b/maven/server/pom.xml
index ab82e0e9e6d4e..c32363b34157d 100644
--- a/maven/server/pom.xml
+++ b/maven/server/pom.xml
@@ -12,13 +12,6 @@
     <name>selenium-server</name>
 
     <dependencies>
-<!--
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId> 
-            <version>1.6.5</version>
-        </dependency>
--->
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
@@ -54,13 +47,6 @@
             <artifactId>selenium-ie-driver</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-iphone-driver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
--->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-support</artifactId>
@@ -80,8 +66,10 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
-                                    <fileset dir="../../java/server/src" />
+                                <copy todir="src/main/java" includeEmptyDirs="false">
+                                    <fileset dir="../../java/server/src">
+                                        <include name="**/*.java" />
+                                    </fileset>
                                 </copy>
                             </tasks>
                         </configuration>
@@ -101,10 +89,11 @@
                                         <exclude name="META-INF/MANIFEST.MF" />
                                     </patternset>
                                 </unjar>
-                                <!-- Copy everything but the *.java files from the java/server/src  directory to target/classes ... -->
-                                <copy todir="target/classes">
+                                <!-- Copy everything but the *.java and build.desc files from the java/server/src directory to target/classes ... -->
+                                <copy todir="target/classes" includeEmptyDirs="false">
                                     <fileset dir="../../java/server/src">
                                         <exclude name="**/*.java" />
+                                        <exclude name="**/build.desc" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/maven/support/pom.xml b/maven/support/pom.xml
index 11ce1daaa3218..b73c51c835166 100644
--- a/maven/support/pom.xml
+++ b/maven/support/pom.xml
@@ -14,9 +14,15 @@
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-api</artifactId>
+            <artifactId>selenium-webdriver-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- Hamcrest is needed for the classes in the org.openqa.selenium.lift package ... -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -36,8 +42,9 @@
                         <configuration>
                             <tasks>
                                 <delete dir="src/main/java" />
-                                <copy todir="src/main/java">
+                                <copy todir="src/main/java" includeEmptyDirs="false">
                                     <fileset dir="../../java/client/src">
+                                        <include name="org/openqa/selenium/lift/**/*.java" />
                                         <include name="org/openqa/selenium/support/**/*.java" />
                                     </fileset>
                                 </copy>