diff --git a/pom.xml b/pom.xml
index 1d7d5268c..0cabc43d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,11 +120,6 @@
             <artifactId>jsr305</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.hp.csbu.cc</groupId>
-            <artifactId>CsMiddleware</artifactId>
-            <version>3.34.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
diff --git a/src/main/java/com/hp/csbu/cc/middleware/AuthClient.java b/src/main/java/com/hpcloud/middleware/AuthClient.java
similarity index 94%
rename from src/main/java/com/hp/csbu/cc/middleware/AuthClient.java
rename to src/main/java/com/hpcloud/middleware/AuthClient.java
index 4ea8223ff..f75e88a49 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/AuthClient.java
+++ b/src/main/java/com/hpcloud/middleware/AuthClient.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 
 import java.util.Map;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/AuthClientFactory.java b/src/main/java/com/hpcloud/middleware/AuthClientFactory.java
similarity index 97%
rename from src/main/java/com/hp/csbu/cc/middleware/AuthClientFactory.java
rename to src/main/java/com/hpcloud/middleware/AuthClientFactory.java
index 221ececbd..f0be1babb 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/AuthClientFactory.java
+++ b/src/main/java/com/hpcloud/middleware/AuthClientFactory.java
@@ -1,9 +1,7 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 
-//import com.hp.csbu.cc.security.cs.thrift.service.CsThriftService.Client;
-
 /**
  * A factory for building {@link AuthClient}s.
  * 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/AuthConnectionException.java b/src/main/java/com/hpcloud/middleware/AuthConnectionException.java
similarity index 91%
rename from src/main/java/com/hp/csbu/cc/middleware/AuthConnectionException.java
rename to src/main/java/com/hpcloud/middleware/AuthConnectionException.java
index 0cd1e67b6..778b148fd 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/AuthConnectionException.java
+++ b/src/main/java/com/hpcloud/middleware/AuthConnectionException.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 /**
  * An exception to indicate any connection issue.
diff --git a/src/main/java/com/hp/csbu/cc/middleware/AuthConstants.java b/src/main/java/com/hpcloud/middleware/AuthConstants.java
similarity index 97%
rename from src/main/java/com/hp/csbu/cc/middleware/AuthConstants.java
rename to src/main/java/com/hpcloud/middleware/AuthConstants.java
index e28a7c6da..955b21fdc 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/AuthConstants.java
+++ b/src/main/java/com/hpcloud/middleware/AuthConstants.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 public interface AuthConstants {
 	/** 'Confirmed' or 'Invalid' */
diff --git a/src/main/java/com/hp/csbu/cc/middleware/AuthException.java b/src/main/java/com/hpcloud/middleware/AuthException.java
similarity index 88%
rename from src/main/java/com/hp/csbu/cc/middleware/AuthException.java
rename to src/main/java/com/hpcloud/middleware/AuthException.java
index 20d239a48..cd5241193 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/AuthException.java
+++ b/src/main/java/com/hpcloud/middleware/AuthException.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 /**
  * An exception to indicate any authentication error.
diff --git a/src/main/java/com/hp/csbu/cc/middleware/CatalogV3.java b/src/main/java/com/hpcloud/middleware/CatalogV3.java
similarity index 92%
rename from src/main/java/com/hp/csbu/cc/middleware/CatalogV3.java
rename to src/main/java/com/hpcloud/middleware/CatalogV3.java
index 992bbfeb0..f631f6d9e 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/CatalogV3.java
+++ b/src/main/java/com/hpcloud/middleware/CatalogV3.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.util.List;
 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/Config.java b/src/main/java/com/hpcloud/middleware/Config.java
similarity index 99%
rename from src/main/java/com/hp/csbu/cc/middleware/Config.java
rename to src/main/java/com/hpcloud/middleware/Config.java
index 23033a1b3..8605e48c3 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/Config.java
+++ b/src/main/java/com/hpcloud/middleware/Config.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/ExceptionHandlerUtil.java b/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java
similarity index 96%
rename from src/main/java/com/hp/csbu/cc/middleware/ExceptionHandlerUtil.java
rename to src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java
index 41d6e27ac..00b883207 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/ExceptionHandlerUtil.java
+++ b/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 public class ExceptionHandlerUtil {
 	
diff --git a/src/main/java/com/hp/csbu/cc/middleware/FilterUtils.java b/src/main/java/com/hpcloud/middleware/FilterUtils.java
similarity index 86%
rename from src/main/java/com/hp/csbu/cc/middleware/FilterUtils.java
rename to src/main/java/com/hpcloud/middleware/FilterUtils.java
index 4b87b41b9..be516fbe0 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/FilterUtils.java
+++ b/src/main/java/com/hpcloud/middleware/FilterUtils.java
@@ -1,22 +1,25 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_DOMAIN_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_DOMAIN_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_PROJECT_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_PROJECT_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_ROLES;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_TENANT_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_USER_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_TENANT_ID;
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_USER_NAME;
-import static com.hp.csbu.cc.middleware.AuthConstants.IdentityStatus;
+
+import static com.hpcloud.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
+
+import static com.hpcloud.middleware.AuthConstants.AUTH_ROLES;
+import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_NAME;
+
+import static com.hpcloud.middleware.AuthConstants.AUTH_USER_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_NAME;
+import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_NAME;
+import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_USER_NAME;
+import static com.hpcloud.middleware.AuthConstants.IdentityStatus;
+import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
+import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
+import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
+import static com.hpcloud.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
+import static com.hpcloud.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
 
 import java.io.IOException;
 import java.lang.reflect.Modifier;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/HttpAuthClient.java b/src/main/java/com/hpcloud/middleware/HttpAuthClient.java
similarity index 98%
rename from src/main/java/com/hp/csbu/cc/middleware/HttpAuthClient.java
rename to src/main/java/com/hpcloud/middleware/HttpAuthClient.java
index a7488ea92..f139ad034 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/HttpAuthClient.java
+++ b/src/main/java/com/hpcloud/middleware/HttpAuthClient.java
@@ -1,7 +1,7 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
-import static com.hp.csbu.cc.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
-import static com.hp.csbu.cc.middleware.AuthConstants.TOKEN;
+import static com.hpcloud.middleware.AuthConstants.TOKEN;
+import static com.hpcloud.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/HttpClientFactory.java b/src/main/java/com/hpcloud/middleware/HttpClientFactory.java
similarity index 95%
rename from src/main/java/com/hp/csbu/cc/middleware/HttpClientFactory.java
rename to src/main/java/com/hpcloud/middleware/HttpClientFactory.java
index 50e3aec22..b07970db2 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/HttpClientFactory.java
+++ b/src/main/java/com/hpcloud/middleware/HttpClientFactory.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/HttpClientPoolFactory.java b/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java
similarity index 99%
rename from src/main/java/com/hp/csbu/cc/middleware/HttpClientPoolFactory.java
rename to src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java
index c7e1bf212..541345e0f 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/HttpClientPoolFactory.java
+++ b/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/HttpPoolCleaner.java b/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java
similarity index 97%
rename from src/main/java/com/hp/csbu/cc/middleware/HttpPoolCleaner.java
rename to src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java
index 70017851f..1d01bb577 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/HttpPoolCleaner.java
+++ b/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/SignatureBuilderException.java b/src/main/java/com/hpcloud/middleware/SignatureBuilderException.java
similarity index 89%
rename from src/main/java/com/hp/csbu/cc/middleware/SignatureBuilderException.java
rename to src/main/java/com/hpcloud/middleware/SignatureBuilderException.java
index 0af7e562e..b8c3b731c 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/SignatureBuilderException.java
+++ b/src/main/java/com/hpcloud/middleware/SignatureBuilderException.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 public class SignatureBuilderException extends RuntimeException {
 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/SignatureExceptionHandler.java b/src/main/java/com/hpcloud/middleware/SignatureExceptionHandler.java
similarity index 98%
rename from src/main/java/com/hp/csbu/cc/middleware/SignatureExceptionHandler.java
rename to src/main/java/com/hpcloud/middleware/SignatureExceptionHandler.java
index 84aaf5966..225facb27 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/SignatureExceptionHandler.java
+++ b/src/main/java/com/hpcloud/middleware/SignatureExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/hp/csbu/cc/middleware/TokenAuth.java b/src/main/java/com/hpcloud/middleware/TokenAuth.java
similarity index 99%
rename from src/main/java/com/hp/csbu/cc/middleware/TokenAuth.java
rename to src/main/java/com/hpcloud/middleware/TokenAuth.java
index bc8c168c1..7dce0a620 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/TokenAuth.java
+++ b/src/main/java/com/hpcloud/middleware/TokenAuth.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.io.IOException;
 import org.apache.http.client.ClientProtocolException;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/TokenCache.java b/src/main/java/com/hpcloud/middleware/TokenCache.java
similarity index 76%
rename from src/main/java/com/hp/csbu/cc/middleware/TokenCache.java
rename to src/main/java/com/hpcloud/middleware/TokenCache.java
index 98115f796..5b40b89a3 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/TokenCache.java
+++ b/src/main/java/com/hpcloud/middleware/TokenCache.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
   import com.google.common.cache.*;
     import org.apache.http.client.ClientProtocolException;
@@ -8,7 +8,8 @@ package com.hp.csbu.cc.middleware;
 
   import java.io.IOException;
   import java.util.Map;
-    import java.util.concurrent.TimeUnit;
+  import java.util.concurrent.ExecutionException;
+  import java.util.concurrent.TimeUnit;
 
 
 public class TokenCache<K,V> {
@@ -25,10 +26,10 @@ public class TokenCache<K,V> {
     factory = appConfig.getFactory();
 
 
-    cache = CacheBuilder.newBuilder().maximumSize(10000)
+    cache = CacheBuilder.newBuilder().maximumSize(maxSize)
       .expireAfterWrite(timeToExpire, TimeUnit.SECONDS)
       .build(new CacheLoader<K, V>() {
-        public V load(K key) throws TException,ClientProtocolException, UnavailableException {
+        public V load(K key) throws TException,ClientProtocolException {
 
           V value = null;
           AuthClient client = null;
@@ -45,14 +46,21 @@ public class TokenCache<K,V> {
             if(client!=null)
               factory.recycle(client);
           }
-
           return value;
         }
       });
   }
 
-  public V getToken(K key) throws IOException  {
-    return cache.getUnchecked(key);
+  public V getToken(K key) throws ClientProtocolException {
+    V value = null;
+    try {
+      value = cache.get(key);
+      throw new ClientProtocolException("Testing");
+
+    } catch (ExecutionException e) {
+      logger.debug("had problem caching token");
+    }
+    return value;
   }
 
   public void put(K key, V value) {
diff --git a/src/main/java/com/hp/csbu/cc/middleware/TokenExceptionHandler.java b/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java
similarity index 99%
rename from src/main/java/com/hp/csbu/cc/middleware/TokenExceptionHandler.java
rename to src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java
index 9ec7fba73..1fe514588 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/TokenExceptionHandler.java
+++ b/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 import java.io.IOException;
 import org.apache.http.client.ClientProtocolException;
diff --git a/src/main/java/com/hp/csbu/cc/middleware/UnavailableException.java b/src/main/java/com/hpcloud/middleware/UnavailableException.java
similarity index 87%
rename from src/main/java/com/hp/csbu/cc/middleware/UnavailableException.java
rename to src/main/java/com/hpcloud/middleware/UnavailableException.java
index efa24da3e..1c9cbc5b2 100644
--- a/src/main/java/com/hp/csbu/cc/middleware/UnavailableException.java
+++ b/src/main/java/com/hpcloud/middleware/UnavailableException.java
@@ -1,4 +1,4 @@
-package com.hp.csbu.cc.middleware;
+package com.hpcloud.middleware;
 
 /**
  * Created by johnderr on 6/25/14.