diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpsURLConnectionFactory.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java
similarity index 94%
rename from cas-client-core/src/main/java/org/jasig/cas/client/util/HttpsURLConnectionFactory.java
rename to cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java
index b9e6f60..2fc3ed2 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpsURLConnectionFactory.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java
@@ -1,4 +1,4 @@
-package org.jasig.cas.client.util;
+package org.jasig.cas.client.ssl;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -12,6 +12,7 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.jasig.cas.client.util.CommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,6 +52,13 @@ public final class HttpsURLConnectionFactory implements URLConnectionFactory {
         this.sslConfiguration = config;
     }
     
+    /**
+     * Set the host name verifier for the https connection received.
+     * 
+     * @see AnyHostnameVerifier
+     * @see RegexHostnameVerifier
+     * @see WhitelistHostnameVerifier
+     */
     public final void setHostnameVerifier(final HostnameVerifier verifier) {
         this.hostnameVerifier = verifier;
     }
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/URLConnectionFactory.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/URLConnectionFactory.java
similarity index 97%
rename from cas-client-core/src/main/java/org/jasig/cas/client/util/URLConnectionFactory.java
rename to cas-client-core/src/main/java/org/jasig/cas/client/ssl/URLConnectionFactory.java
index 9a08fe0..45b7dd0 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/util/URLConnectionFactory.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/URLConnectionFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.cas.client.util;
+package org.jasig.cas.client.ssl;
 
 import java.net.URL;
 import java.net.URLConnection;
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
index 9f30256..fe264ac 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
@@ -19,6 +19,8 @@
 package org.jasig.cas.client.util;
 
 import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
+import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
+import org.jasig.cas.client.ssl.URLConnectionFactory;
 import org.jasig.cas.client.validation.ProxyList;
 import org.jasig.cas.client.validation.ProxyListEditor;
 import org.slf4j.Logger;
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java
index b1df5ad..6d7a71f 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java
@@ -18,9 +18,9 @@
  */
 package org.jasig.cas.client.validation;
 
+import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
+import org.jasig.cas.client.ssl.URLConnectionFactory;
 import org.jasig.cas.client.util.CommonUtils;
-import org.jasig.cas.client.util.HttpsURLConnectionFactory;
-import org.jasig.cas.client.util.URLConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java
index dc910c3..47e6eb3 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java
@@ -20,8 +20,8 @@ package org.jasig.cas.client.validation;
 
 import javax.servlet.FilterConfig;
 
-import org.jasig.cas.client.util.HttpsURLConnectionFactory;
-import org.jasig.cas.client.util.URLConnectionFactory;
+import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
+import org.jasig.cas.client.ssl.URLConnectionFactory;
 
 /**
  * Implementation of AbstractTicketValidatorFilter that instanciates a Cas10TicketValidator.
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java
index 8767e40..45f5473 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java
@@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.jasig.cas.client.proxy.*;
+import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
+import org.jasig.cas.client.ssl.URLConnectionFactory;
 import org.jasig.cas.client.util.CommonUtils;
-import org.jasig.cas.client.util.HttpsURLConnectionFactory;
 import org.jasig.cas.client.util.ReflectUtils;
-import org.jasig.cas.client.util.URLConnectionFactory;
 
 /**
  * Creates either a CAS20ProxyTicketValidator or a CAS20ServiceTicketValidator depending on whether any of the
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
index 25f74f0..30f5ae3 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
@@ -21,8 +21,8 @@ package org.jasig.cas.client.validation;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
-import org.jasig.cas.client.util.HttpsURLConnectionFactory;
-import org.jasig.cas.client.util.URLConnectionFactory;
+import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
+import org.jasig.cas.client.ssl.URLConnectionFactory;
 
 /**
  * Implementation of TicketValidationFilter that can instanciate a SAML 1.1 Ticket Validator.