diff --git a/src/main/java/com/widen/util/Base64.java b/src/main/java/com/widen/urlbuilder/Base64.java
similarity index 98%
rename from src/main/java/com/widen/util/Base64.java
rename to src/main/java/com/widen/urlbuilder/Base64.java
index bb7c80c..87fc994 100644
--- a/src/main/java/com/widen/util/Base64.java
+++ b/src/main/java/com/widen/urlbuilder/Base64.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
@@ -644,8 +644,8 @@ public static String encodeObject( java.io.Serializable serializableObject )
      * @param serializableObject The object to encode
      * @param options Specified options
      * @return The Base64-encoded object
-     * @see com.widen.util.Base64#GZIP
-     * @see com.widen.util.Base64#DO_BREAK_LINES
+     * @see com.widen.urlbuilder.Base64#GZIP
+     * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
      * @since 2.0
      */
@@ -750,8 +750,8 @@ public static String encodeBytes( byte[] source ) {
      * @param source The data to convert
      * @param options Specified options
      * @return The Base64-encoded data as a String
-     * @see com.widen.util.Base64#GZIP
-     * @see com.widen.util.Base64#DO_BREAK_LINES
+     * @see com.widen.urlbuilder.Base64#GZIP
+     * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
      * @throws NullPointerException if source array is null
      * @since 2.0
@@ -820,8 +820,8 @@ public static String encodeBytes( byte[] source, int off, int len ) {
      * @param len Length of data to convert
      * @param options Specified options
      * @return The Base64-encoded data as a String
-     * @see com.widen.util.Base64#GZIP
-     * @see com.widen.util.Base64#DO_BREAK_LINES
+     * @see com.widen.urlbuilder.Base64#GZIP
+     * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
      * @throws NullPointerException if source array is null
      * @throws IllegalArgumentException if source array, offset, or length are invalid
@@ -876,8 +876,8 @@ public static byte[] encodeBytesToBytes( byte[] source ) {
      * @param len Length of data to convert
      * @param options Specified options
      * @return The Base64-encoded data as a String
-     * @see com.widen.util.Base64#GZIP
-     * @see com.widen.util.Base64#DO_BREAK_LINES
+     * @see com.widen.urlbuilder.Base64#GZIP
+     * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
      * @throws NullPointerException if source array is null
      * @throws IllegalArgumentException if source array, offset, or length are invalid
@@ -1631,11 +1631,11 @@ public static void decodeFileToFile( String infile, String outfile )
     
     
     /**
-     * A {@link com.widen.util.Base64.InputStream} will read data from another
+     * A {@link com.widen.urlbuilder.Base64.InputStream} will read data from another
      * <tt>java.io.InputStream</tt>, given in the constructor,
      * and encode/decode to/from Base64 notation on the fly.
      *
-     * @see com.widen.util.Base64
+     * @see com.widen.urlbuilder.Base64
      * @since 1.3
      */
     public static class InputStream extends java.io.FilterInputStream {
@@ -1652,7 +1652,7 @@ public static class InputStream extends java.io.FilterInputStream {
         
         
         /**
-         * Constructs a {@link com.widen.util.Base64.InputStream} in DECODE mode.
+         * Constructs a {@link com.widen.urlbuilder.Base64.InputStream} in DECODE mode.
          *
          * @param in the <tt>java.io.InputStream</tt> from which to read data.
          * @since 1.3
@@ -1663,7 +1663,7 @@ public InputStream( java.io.InputStream in ) {
         
         
         /**
-         * Constructs a {@link com.widen.util.Base64.InputStream} in
+         * Constructs a {@link com.widen.urlbuilder.Base64.InputStream} in
          * either ENCODE or DECODE mode.
          * <p>
          * Valid options:<pre>
@@ -1677,9 +1677,9 @@ public InputStream( java.io.InputStream in ) {
          *
          * @param in the <tt>java.io.InputStream</tt> from which to read data.
          * @param options Specified options
-         * @see com.widen.util.Base64#ENCODE
-         * @see com.widen.util.Base64#DECODE
-         * @see com.widen.util.Base64#DO_BREAK_LINES
+         * @see com.widen.urlbuilder.Base64#ENCODE
+         * @see com.widen.urlbuilder.Base64#DECODE
+         * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
          * @since 2.0
          */
         public InputStream( java.io.InputStream in, int options ) {
@@ -1844,11 +1844,11 @@ else if( i == 0 ) {
     
     
     /**
-     * A {@link com.widen.util.Base64.OutputStream} will write data to another
+     * A {@link com.widen.urlbuilder.Base64.OutputStream} will write data to another
      * <tt>java.io.OutputStream</tt>, given in the constructor,
      * and encode/decode to/from Base64 notation on the fly.
      *
-     * @see com.widen.util.Base64
+     * @see com.widen.urlbuilder.Base64
      * @since 1.3
      */
     public static class OutputStream extends java.io.FilterOutputStream {
@@ -1865,7 +1865,7 @@ public static class OutputStream extends java.io.FilterOutputStream {
         private byte[]  decodabet;  // Local copies to avoid extra method calls
         
         /**
-         * Constructs a {@link com.widen.util.Base64.OutputStream} in ENCODE mode.
+         * Constructs a {@link com.widen.urlbuilder.Base64.OutputStream} in ENCODE mode.
          *
          * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
          * @since 1.3
@@ -1876,7 +1876,7 @@ public OutputStream( java.io.OutputStream out ) {
         
         
         /**
-         * Constructs a {@link com.widen.util.Base64.OutputStream} in
+         * Constructs a {@link com.widen.urlbuilder.Base64.OutputStream} in
          * either ENCODE or DECODE mode.
          * <p>
          * Valid options:<pre>
@@ -1889,9 +1889,9 @@ public OutputStream( java.io.OutputStream out ) {
          *
          * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
          * @param options Specified options.
-         * @see com.widen.util.Base64#ENCODE
-         * @see com.widen.util.Base64#DECODE
-         * @see com.widen.util.Base64#DO_BREAK_LINES
+         * @see com.widen.urlbuilder.Base64#ENCODE
+         * @see com.widen.urlbuilder.Base64#DECODE
+         * @see com.widen.urlbuilder.Base64#DO_BREAK_LINES
          * @since 1.3
          */
         public OutputStream( java.io.OutputStream out, int options ) {
diff --git a/src/main/java/com/widen/util/BuiltinEncoder.java b/src/main/java/com/widen/urlbuilder/BuiltinEncoder.java
similarity index 96%
rename from src/main/java/com/widen/util/BuiltinEncoder.java
rename to src/main/java/com/widen/urlbuilder/BuiltinEncoder.java
index a1d40b7..c1b549b 100644
--- a/src/main/java/com/widen/util/BuiltinEncoder.java
+++ b/src/main/java/com/widen/urlbuilder/BuiltinEncoder.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/main/java/com/widen/util/CloudfrontPrivateKeyUtils.java b/src/main/java/com/widen/urlbuilder/CloudfrontPrivateKeyUtils.java
similarity index 98%
rename from src/main/java/com/widen/util/CloudfrontPrivateKeyUtils.java
rename to src/main/java/com/widen/urlbuilder/CloudfrontPrivateKeyUtils.java
index 1b7631f..5ed7760 100644
--- a/src/main/java/com/widen/util/CloudfrontPrivateKeyUtils.java
+++ b/src/main/java/com/widen/urlbuilder/CloudfrontPrivateKeyUtils.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.io.InputStream;
 import java.io.StringReader;
diff --git a/src/main/java/com/widen/util/CloudfrontUrlBuilder.java b/src/main/java/com/widen/urlbuilder/CloudfrontUrlBuilder.java
similarity index 99%
rename from src/main/java/com/widen/util/CloudfrontUrlBuilder.java
rename to src/main/java/com/widen/urlbuilder/CloudfrontUrlBuilder.java
index 873c402..706159e 100644
--- a/src/main/java/com/widen/util/CloudfrontUrlBuilder.java
+++ b/src/main/java/com/widen/urlbuilder/CloudfrontUrlBuilder.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.security.PrivateKey;
 import java.security.Signature;
diff --git a/src/main/java/com/widen/util/Encoder.java b/src/main/java/com/widen/urlbuilder/Encoder.java
similarity index 88%
rename from src/main/java/com/widen/util/Encoder.java
rename to src/main/java/com/widen/urlbuilder/Encoder.java
index 042e342..3652d85 100644
--- a/src/main/java/com/widen/util/Encoder.java
+++ b/src/main/java/com/widen/urlbuilder/Encoder.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 /**
  * GET URLs require conversion to preserve special characters. By default the {@link BuiltinEncoder} is used.
diff --git a/src/main/java/com/widen/util/HttpUtils.java b/src/main/java/com/widen/urlbuilder/HttpUtils.java
similarity index 97%
rename from src/main/java/com/widen/util/HttpUtils.java
rename to src/main/java/com/widen/urlbuilder/HttpUtils.java
index c85fdb7..8202955 100644
--- a/src/main/java/com/widen/util/HttpUtils.java
+++ b/src/main/java/com/widen/urlbuilder/HttpUtils.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/src/main/java/com/widen/util/InternalUtils.java b/src/main/java/com/widen/urlbuilder/InternalUtils.java
similarity index 97%
rename from src/main/java/com/widen/util/InternalUtils.java
rename to src/main/java/com/widen/urlbuilder/InternalUtils.java
index 6014835..6b089a3 100644
--- a/src/main/java/com/widen/util/InternalUtils.java
+++ b/src/main/java/com/widen/urlbuilder/InternalUtils.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.io.*;
 
diff --git a/src/main/java/com/widen/util/NoEncodingEncoder.java b/src/main/java/com/widen/urlbuilder/NoEncodingEncoder.java
similarity index 90%
rename from src/main/java/com/widen/util/NoEncodingEncoder.java
rename to src/main/java/com/widen/urlbuilder/NoEncodingEncoder.java
index 151d26d..5195bfb 100644
--- a/src/main/java/com/widen/util/NoEncodingEncoder.java
+++ b/src/main/java/com/widen/urlbuilder/NoEncodingEncoder.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 /**
  *  Encoder that performs no encoding -- simply passing the text value back unmodified.
diff --git a/src/main/java/com/widen/util/S3UrlBuilder.java b/src/main/java/com/widen/urlbuilder/S3UrlBuilder.java
similarity index 99%
rename from src/main/java/com/widen/util/S3UrlBuilder.java
rename to src/main/java/com/widen/urlbuilder/S3UrlBuilder.java
index e76f578..bdccf39 100644
--- a/src/main/java/com/widen/util/S3UrlBuilder.java
+++ b/src/main/java/com/widen/urlbuilder/S3UrlBuilder.java
@@ -11,7 +11,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.security.SignatureException;
 import java.util.Date;
diff --git a/src/main/java/com/widen/util/StringUtilsInternal.java b/src/main/java/com/widen/urlbuilder/StringUtilsInternal.java
similarity index 99%
rename from src/main/java/com/widen/util/StringUtilsInternal.java
rename to src/main/java/com/widen/urlbuilder/StringUtilsInternal.java
index 9d64eec..e01a03a 100644
--- a/src/main/java/com/widen/util/StringUtilsInternal.java
+++ b/src/main/java/com/widen/urlbuilder/StringUtilsInternal.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/main/java/com/widen/util/UrlBuilder.java b/src/main/java/com/widen/urlbuilder/UrlBuilder.java
similarity index 99%
rename from src/main/java/com/widen/util/UrlBuilder.java
rename to src/main/java/com/widen/urlbuilder/UrlBuilder.java
index e35056c..e60a23c 100644
--- a/src/main/java/com/widen/util/UrlBuilder.java
+++ b/src/main/java/com/widen/urlbuilder/UrlBuilder.java
@@ -11,7 +11,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/src/test/java/com/widen/util/CloudfrontUrlBuilderTest.java b/src/test/java/com/widen/urlbuilder/CloudfrontUrlBuilderTest.java
similarity index 98%
rename from src/test/java/com/widen/util/CloudfrontUrlBuilderTest.java
rename to src/test/java/com/widen/urlbuilder/CloudfrontUrlBuilderTest.java
index b5517a5..90999de 100644
--- a/src/test/java/com/widen/util/CloudfrontUrlBuilderTest.java
+++ b/src/test/java/com/widen/urlbuilder/CloudfrontUrlBuilderTest.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.io.IOException;
 import java.security.PrivateKey;
diff --git a/src/test/java/com/widen/util/HttpUtilsTest.java b/src/test/java/com/widen/urlbuilder/HttpUtilsTest.java
similarity index 97%
rename from src/test/java/com/widen/util/HttpUtilsTest.java
rename to src/test/java/com/widen/urlbuilder/HttpUtilsTest.java
index 8e4d527..5ff039e 100644
--- a/src/test/java/com/widen/util/HttpUtilsTest.java
+++ b/src/test/java/com/widen/urlbuilder/HttpUtilsTest.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import org.junit.Test;
 
diff --git a/src/test/java/com/widen/util/S3UrlBuilderTest.java b/src/test/java/com/widen/urlbuilder/S3UrlBuilderTest.java
similarity index 99%
rename from src/test/java/com/widen/util/S3UrlBuilderTest.java
rename to src/test/java/com/widen/urlbuilder/S3UrlBuilderTest.java
index 33b2865..7d53fa4 100644
--- a/src/test/java/com/widen/util/S3UrlBuilderTest.java
+++ b/src/test/java/com/widen/urlbuilder/S3UrlBuilderTest.java
@@ -1,4 +1,4 @@
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/widen/util/UrlBuilderTest.java b/src/test/java/com/widen/urlbuilder/UrlBuilderTest.java
similarity index 99%
rename from src/test/java/com/widen/util/UrlBuilderTest.java
rename to src/test/java/com/widen/urlbuilder/UrlBuilderTest.java
index 0de0b5f..500997a 100644
--- a/src/test/java/com/widen/util/UrlBuilderTest.java
+++ b/src/test/java/com/widen/urlbuilder/UrlBuilderTest.java
@@ -11,7 +11,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.widen.util;
+package com.widen.urlbuilder;
 
 import org.junit.Test;