diff --git a/gradle.properties b/gradle.properties
index fa384ff..f428583 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=5.0.0-rc.1
+version=5.0.0-rc.2
 groupId=com.nike
 artifactId=cerberus-client
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 4a43ac3..cd0210b 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -40,6 +40,8 @@ dependencies {
     shadow "joda-time:joda-time:2.8.1"
     shadow "org.apache.commons:commons-lang3:3.4"
     shadow "org.slf4j:slf4j-api:1.7.25"
+    shadow "com.google.code.gson:gson:2.5"
+    shadow "com.google.code.findbugs:jsr305:3.0.1"
 
     compile "com.squareup.okhttp3:okhttp:3.9.0"
     compile "org.apache.commons:commons-lang3:3.4"
diff --git a/src/integration/java/com/nike/cerberus/client/auth/aws/CerberusClientTest.java b/src/integration/java/com/nike/cerberus/client/auth/aws/CerberusClientTest.java
index 36c9b1c..1d2ad03 100644
--- a/src/integration/java/com/nike/cerberus/client/auth/aws/CerberusClientTest.java
+++ b/src/integration/java/com/nike/cerberus/client/auth/aws/CerberusClientTest.java
@@ -18,10 +18,10 @@
 
 import com.fieldju.commons.EnvUtils;
 import com.nike.cerberus.client.CerberusClient;
-import com.nike.cerberus.client.CerberusListResponse;
-import com.nike.cerberus.client.CerberusResponse;
 import com.nike.cerberus.client.CerberusServerException;
 import com.nike.cerberus.client.DefaultCerberusUrlResolver;
+import com.nike.cerberus.client.model.CerberusListResponse;
+import com.nike.cerberus.client.model.CerberusResponse;
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.BeforeClass;
diff --git a/src/main/java/com/nike/cerberus/client/CerberusClient.java b/src/main/java/com/nike/cerberus/client/CerberusClient.java
index b7d17ae..b616d30 100644
--- a/src/main/java/com/nike/cerberus/client/CerberusClient.java
+++ b/src/main/java/com/nike/cerberus/client/CerberusClient.java
@@ -1,6 +1,5 @@
 package com.nike.cerberus.client;
 
-import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -10,6 +9,8 @@
 import com.nike.cerberus.client.http.HttpHeader;
 import com.nike.cerberus.client.http.HttpMethod;
 import com.nike.cerberus.client.http.HttpStatus;
+import com.nike.cerberus.client.model.CerberusListResponse;
+import com.nike.cerberus.client.model.CerberusResponse;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
diff --git a/src/main/java/com/nike/cerberus/client/CerberusListResponse.java b/src/main/java/com/nike/cerberus/client/CerberusListResponse.java
deleted file mode 100644
index ed4bc3f..0000000
--- a/src/main/java/com/nike/cerberus/client/CerberusListResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.nike.cerberus.client;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class CerberusListResponse {
-    private List<String> keys = new LinkedList<String>();
-
-    public List<String> getKeys() {
-        return keys;
-    }
-
-    public CerberusListResponse setKeys(List<String> keys) {
-        this.keys = keys;
-        return this;
-    }
-}
diff --git a/src/main/java/com/nike/cerberus/client/CerberusResponse.java b/src/main/java/com/nike/cerberus/client/CerberusResponse.java
deleted file mode 100644
index 547769b..0000000
--- a/src/main/java/com/nike/cerberus/client/CerberusResponse.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.nike.cerberus.client;
-
-import java.util.Map;
-
-public class CerberusResponse {
-    private Map<String, String> data;
-
-    /**
-     * Returns the key/value pairs stored at a path
-     *
-     * @return Map of data
-     */
-    public Map<String, String> getData() {
-        return data;
-    }
-
-    public CerberusResponse setData(Map<String, String> data) {
-        this.data = data;
-        return this;
-    }
-}