diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
index e0f08e20df470..0e765cbafa058 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
@@ -46,6 +46,8 @@ java_library(name = 'emulation-api',
     'JavascriptLibrary.java',
     'ScriptMutator.java',
     'SeleneseCommand.java',
+    'Timer.java',
+    'Windows.java',
   ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/Timer.java b/java/client/src/com/thoughtworks/selenium/webdriven/Timer.java
similarity index 92%
rename from java/client/src/com/thoughtworks/selenium/webdriven/commands/Timer.java
rename to java/client/src/com/thoughtworks/selenium/webdriven/Timer.java
index 27aec86dff45b..1a467342e7ebc 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/Timer.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/Timer.java
@@ -14,10 +14,9 @@
 limitations under the License.
  */
 
-package com.thoughtworks.selenium.webdriven.commands;
+package com.thoughtworks.selenium.webdriven;
 
 import com.thoughtworks.selenium.SeleniumException;
-import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/Windows.java b/java/client/src/com/thoughtworks/selenium/webdriven/Windows.java
similarity index 99%
rename from java/client/src/com/thoughtworks/selenium/webdriven/commands/Windows.java
rename to java/client/src/com/thoughtworks/selenium/webdriven/Windows.java
index 274689f705321..11489dabca34a 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/Windows.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/Windows.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package com.thoughtworks.selenium.webdriven.commands;
+package com.thoughtworks.selenium.webdriven;
 
 import com.google.common.collect.Maps;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/build.desc b/java/client/src/com/thoughtworks/selenium/webdriven/build.desc
index 71c19bcb02f02..f97a7c8e90b84 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/build.desc
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/build.desc
@@ -38,7 +38,9 @@ java_library(name = "emulation-api",
     "ScriptMutator.java",
     "SeleneseCommand.java",
     "SeleniumMutator.java",
+    "Timer.java",
     "VariableDeclaration.java",
+    "Windows.java",
   ],
   deps = [
     "//java/client/src/com/thoughtworks/selenium:api",
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
index 7884d6f41c62e..27e4fd85b173c 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
@@ -1,19 +1,6 @@
 
-java_library(name = 'timer',
-  srcs = [ 'Timer.java' ],
-  deps = [
-    '//java/client/src/com/thoughtworks/selenium:api',
-    '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-  ],
-)
-
-
 java_library(name = 'commands',
-  srcs = glob(['*.java'], excludes = ['Timer.java']),
-  exported_deps = [
-    ':timer',
-  ],
+  srcs = glob(['*.java']),
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java
index fda2e6d4a11d1..ed146aab2a63f 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java
index 3d6acfbe85aea..83f342522587e 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java
index cea04b4202a31..a2bbf00bbe94f 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java
index 31ebffaf678f3..ef1693287f045 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java
index d4cbe4f187ab1..140e3bd6836da 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Timer;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java
index 9b9a7f90b1494..bae9c2b7e0957 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java
@@ -19,6 +19,7 @@
 import com.thoughtworks.selenium.SeleniumException;
 import com.thoughtworks.selenium.Wait;
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc b/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc
index 9ae431da078ce..b26d7229b1566 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc
@@ -1,20 +1,11 @@
 
-java_library(name = "api",
-  srcs = [
-    "Timer.java",
-  ],
-  deps = [
-    "//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api",
-  ])
-
-
 java_library(name = "commands",
   srcs = [
     "*.java",
   ],
   deps = [
-    ":api",
     "//java/client/src/com/thoughtworks/selenium:wait",
+    "//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api",
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/org/openqa/selenium/interactions",
     "//java/client/src/org/openqa/selenium/io",