diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
index 5c8734d..e2bd844 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
@@ -20,7 +20,7 @@
  * @author Luc Boudreau
  * @version $Id: InvalidStateException.java 92 2008-07-17 07:41:10Z lucboudreau $
  */
-public class XmlaOlap4jInvalidStateException extends RuntimeException {
+class XmlaOlap4jInvalidStateException extends RuntimeException {
     private static final long serialVersionUID = 7265273715459263740L;
 }
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jSHAEncoder.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jSHAEncoder.java
index e611857..647c1bf 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jSHAEncoder.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jSHAEncoder.java
@@ -19,7 +19,7 @@
  * @version $Id: XmlaOlap4jSHAEncoder.java 92 2008-07-17 07:41:10Z lucboudreau $
  *
  */
-public class XmlaOlap4jSHAEncoder {
+class XmlaOlap4jSHAEncoder {
 
     private static String convertToHex(byte[] data) {
         StringBuilder buf = new StringBuilder();
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
index 0f8b778..a8a07ba 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
@@ -33,7 +33,7 @@
  * @author Luc Boudreau
  * @version $Id: AbstractHttpProxy.java 92 2008-07-17 07:41:10Z lucboudreau $
  */
-public abstract class XmlaOlap4jAbstractHttpProxy
+abstract class XmlaOlap4jAbstractHttpProxy
     implements XmlaOlap4jCachedProxy
 {
     /**
@@ -78,37 +78,29 @@ abstract public Future<byte[]> getResponseViaSubmit(
         String request);
 
     /**
-     * Helper method to save cookies for later use.
-     * @param urlConn The url connection for which we want the cookies
-     * saved for later use.
-     * @throws IOException An io exception gets thrown if the given url
-     * connection has not been opened yet.
+     * Helper method to add cookies to a given connection.
+     * @param urlConn The url connection to which we want the cookies
+     * applied to.
      */
     protected void useCookies(URLConnection urlConn){
         // Initializes the cookie manager
         this.initCookieManager();
-
         // Saves the current cookies
         this.cookieManager.setCookies(urlConn);
     }
 
-
     /**
-     * Helper method to add cookies to a given connection.
-     * @param urlConn The url connection to which we want the cookies
-     * applied to.
-     * @throws IOException An io exception gets thrown if the given url
-     * connection has already been opened.
+     * Helper method to save cookies for later use.
+     * @param urlConn The url connection for which we want the cookies
+     * saved for later use.
      */
     protected void saveCookies(URLConnection urlConn){
         // Initializes the cookie manager
         this.initCookieManager();
-
         // Saves the current cookies
         this.cookieManager.storeCookies(urlConn);
     }
 
-
     /* (non-Javadoc)
      * @see org.olap4j.driver.xmla.XmlaOlap4jDriver.Proxy#setCache(
      *      java.lang.String, java.util.Properties)
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
index 14f5498..d12b761 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
@@ -47,7 +47,7 @@
  **/
 
 @SuppressWarnings("unchecked")
-public class XmlaOlap4jCookieManager {
+class XmlaOlap4jCookieManager {
 
     private Map store;
 
diff --git a/testsrc/org/olap4j/XmlaSHAEncoderTest.java b/testsrc/org/olap4j/driver/xmla/cache/XmlaSHAEncoderTest.java
similarity index 97%
rename from testsrc/org/olap4j/XmlaSHAEncoderTest.java
rename to testsrc/org/olap4j/driver/xmla/cache/XmlaSHAEncoderTest.java
index 874e5c2..eb23884 100644
--- a/testsrc/org/olap4j/XmlaSHAEncoderTest.java
+++ b/testsrc/org/olap4j/driver/xmla/cache/XmlaSHAEncoderTest.java
@@ -1,4 +1,4 @@
-package org.olap4j;
+package org.olap4j.driver.xmla.cache;
 
 import junit.framework.TestCase;
 
diff --git a/testsrc/org/olap4j/XmlaCachedProxyTest.java b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
similarity index 99%
rename from testsrc/org/olap4j/XmlaCachedProxyTest.java
rename to testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
index 2904953..6e1c819 100644
--- a/testsrc/org/olap4j/XmlaCachedProxyTest.java
+++ b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
@@ -1,10 +1,11 @@
-package org.olap4j;
+package org.olap4j.driver.xmla.proxy;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
+import org.olap4j.OlapException;
 import org.olap4j.driver.xmla.XmlaOlap4jDriver;
 import org.olap4j.driver.xmla.cache.XmlaOlap4jNamedMemoryCache;
 import org.olap4j.driver.xmla.proxy.XmlaOlap4jCachedProxy;
diff --git a/testsrc/org/olap4j/XmlaCookieManagerTest.java b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
similarity index 98%
rename from testsrc/org/olap4j/XmlaCookieManagerTest.java
rename to testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
index 2f6bb6e..42b5965 100644
--- a/testsrc/org/olap4j/XmlaCookieManagerTest.java
+++ b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
@@ -1,4 +1,4 @@
-package org.olap4j;
+package org.olap4j.driver.xmla.proxy;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;