diff --git a/src/main/java/org/rundeck/api/util/NodeFiltersBuilder.java b/src/main/java/org/rundeck/api/NodeFiltersBuilder.java
similarity index 99%
rename from src/main/java/org/rundeck/api/util/NodeFiltersBuilder.java
rename to src/main/java/org/rundeck/api/NodeFiltersBuilder.java
index e5cb258..ce5e979 100644
--- a/src/main/java/org/rundeck/api/util/NodeFiltersBuilder.java
+++ b/src/main/java/org/rundeck/api/NodeFiltersBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rundeck.api.util;
+package org.rundeck.api;
 
 import java.util.Properties;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/org/rundeck/api/util/OptionsBuilder.java b/src/main/java/org/rundeck/api/OptionsBuilder.java
similarity index 98%
rename from src/main/java/org/rundeck/api/util/OptionsBuilder.java
rename to src/main/java/org/rundeck/api/OptionsBuilder.java
index c46f19a..029811b 100644
--- a/src/main/java/org/rundeck/api/util/OptionsBuilder.java
+++ b/src/main/java/org/rundeck/api/OptionsBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rundeck.api.util;
+package org.rundeck.api;
 
 import java.util.Properties;
 
diff --git a/src/main/java/org/rundeck/api/RundeckClient.java b/src/main/java/org/rundeck/api/RundeckClient.java
index 1bf83fe..c380b7b 100644
--- a/src/main/java/org/rundeck/api/RundeckClient.java
+++ b/src/main/java/org/rundeck/api/RundeckClient.java
@@ -33,8 +33,6 @@ import org.rundeck.api.parser.JobsParser;
 import org.rundeck.api.parser.ProjectParser;
 import org.rundeck.api.parser.ProjectsParser;
 import org.rundeck.api.util.AssertUtil;
-import org.rundeck.api.util.NodeFiltersBuilder;
-import org.rundeck.api.util.OptionsBuilder;
 import org.rundeck.api.util.ParametersUtil;
 
 /**
diff --git a/src/main/java/org/rundeck/api/util/package-info.java b/src/main/java/org/rundeck/api/util/package-info.java
index 3fcd262..8536bad 100644
--- a/src/main/java/org/rundeck/api/util/package-info.java
+++ b/src/main/java/org/rundeck/api/util/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Some utility classes, and builders that can be used by clients of the API.
+ * Some utility classes.
  */
 package org.rundeck.api.util;
\ No newline at end of file
diff --git a/src/site/confluence/jruby.confluence b/src/site/confluence/jruby.confluence
index ceb0e8b..9f4f1e1 100644
--- a/src/site/confluence/jruby.confluence
+++ b/src/site/confluence/jruby.confluence
@@ -35,8 +35,8 @@ h2. Running a job
 
 {code}
 import org.rundeck.api.RundeckClient
-import org.rundeck.api.util.OptionsBuilder
-import org.rundeck.api.util.NodeFiltersBuilder
+import org.rundeck.api.OptionsBuilder
+import org.rundeck.api.NodeFiltersBuilder
 
 rundeck = RundeckClient.new("http://localhost:4440", "admin", "admin")
 
@@ -63,7 +63,7 @@ h2. Running an ad-hoc command
 
 {code}
 import org.rundeck.api.RundeckClient
-import org.rundeck.api.util.NodeFiltersBuilder
+import org.rundeck.api.NodeFiltersBuilder
 
 rundeck = RundeckClient.new("http://localhost:4440", "admin", "admin")
 
diff --git a/src/site/confluence/jython.confluence b/src/site/confluence/jython.confluence
index 9e58ff9..c03b348 100644
--- a/src/site/confluence/jython.confluence
+++ b/src/site/confluence/jython.confluence
@@ -22,8 +22,8 @@ h2. Running a job
 
 {code}
 from org.rundeck.api import RundeckClient
-from org.rundeck.api.util import OptionsBuilder
-from org.rundeck.api.util import NodeFiltersBuilder
+from org.rundeck.api import OptionsBuilder
+from org.rundeck.api import NodeFiltersBuilder
 
 rundeck = RundeckClient("http://localhost:4440", "admin", "admin")
 
@@ -50,7 +50,7 @@ h2. Running an ad-hoc command
 
 {code}
 from org.rundeck.api import RundeckClient
-from org.rundeck.api.util import NodeFiltersBuilder
+from org.rundeck.api import NodeFiltersBuilder
 
 rundeck = RundeckClient("http://localhost:4440", "admin", "admin")