diff --git a/java/server/src/org/openqa/grid/build.desc b/java/server/src/org/openqa/grid/build.desc
index 3a88e3442b099..ed21038470c6f 100644
--- a/java/server/src/org/openqa/grid/build.desc
+++ b/java/server/src/org/openqa/grid/build.desc
@@ -3,12 +3,14 @@ java_library(name = "grid",
   srcs = [
     "internal/**/*.java",
     "web/**/*.java",
+    "selenium/proxy/**/*.java",
   ],
   embedded = [
     "images/",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:webdriver-api",
+    "//java/client/src/org/openqa/selenium/chrome",
     "//java/server/src/org/openqa/grid/common",
     "//java/server/src/org/openqa/selenium/remote/server",
     "//third_party/java/httpcomponents:httpclient",
diff --git a/java/server/src/org/openqa/grid/selenium/build.desc b/java/server/src/org/openqa/grid/selenium/build.desc
index 03ecbd8954bb7..3a06abaa5567a 100644
--- a/java/server/src/org/openqa/grid/selenium/build.desc
+++ b/java/server/src/org/openqa/grid/selenium/build.desc
@@ -1,10 +1,8 @@
 
 java_binary(name = "selenium",
   main_class = "org.openqa.grid.selenium.GridLauncher",
-  srcs = [ "**/*.java" ],
+  srcs = [ "GridLauncher.java" ],
   deps = [
-    "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
-    "//java/client/src/org/openqa/selenium/firefox",
     "//java/server/src/org/openqa/selenium/remote/server",
     "//java/server/src/org/openqa/selenium/server",
     "//java/server/src/org/openqa/grid",
diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
index 336b4de7e2e9d..6e5fb78244cb1 100644
--- a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
+++ b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -30,7 +30,6 @@
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.internal.listeners.TimeoutListener;
 import org.openqa.grid.internal.utils.HtmlRenderer;
-import org.openqa.grid.selenium.utils.WebProxyHtmlRenderer;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.remote.BrowserType;
diff --git a/java/server/src/org/openqa/grid/selenium/utils/WebProxyHtmlRenderer.java b/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
similarity index 98%
rename from java/server/src/org/openqa/grid/selenium/utils/WebProxyHtmlRenderer.java
rename to java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
index c3e1eb5b249ba..43632c58e6136 100644
--- a/java/server/src/org/openqa/grid/selenium/utils/WebProxyHtmlRenderer.java
+++ b/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.grid.selenium.utils;
+package org.openqa.grid.selenium.proxy;
 
 import org.openqa.grid.internal.RemoteProxy;
 import org.openqa.grid.internal.TestSession;