diff --git a/Makefile b/Makefile
index 50df85a02..3b201d2b9 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ publish-to-bintray:
 	./gradlew :services:bintrayUpload ; \
 	./gradlew :services-turf:bintrayUpload ; \
 	./gradlew :services-directions-models:bintrayUpload ; \
+	./gradlew :services-directions-refresh-models:bintrayUpload ; \
 
 publish-snapshot:
 	./gradlew :services-core:artifactoryPublish ; \
@@ -40,13 +41,15 @@ publish-snapshot:
 	./gradlew :services:artifactoryPublish ; \
 	./gradlew :services-turf:artifactoryPublish ; \
 	./gradlew :services-directions-models:artifactoryPublish ; \
+	./gradlew :services-directions-refresh-models:artifactoryPublish ; \
 
 graphs:
 	./gradlew :services-core:generateDependencyGraphMapboxLibraries
 	./gradlew :services-geojson:generateDependencyGraphMapboxLibraries
 	./gradlew :services:generateDependencyGraphMapboxLibraries
 	./gradlew :services-turf:generateDependencyGraphMapboxLibraries
-	./gradlew :services-directions:generateDependencyGraphMapboxLibraries
+	./gradlew :services-directions-models:generateDependencyGraphMapboxLibraries
+	./gradlew :services-directions-refresh-models:generateDependencyGraphMapboxLibraries
 
 directions-matrix-fixtures:
 	# request a symmetric 1x3 matrix for pedestrians
diff --git a/build.gradle b/build.gradle
index 77697031f..def776027 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,13 +84,15 @@ def TESTABLE_MODULES = ["services",
                         "services-tilequery",
                         "services-turf",
                         "services-directions-refresh",
+                        "services-directions-refresh-models",
                         "services-isochrone"]
 
 def RELEASE_MODULES = ["services",
                        "services-core",
                        "services-geojson",
                        "services-turf",
-                       "services-directions-models"]
+                       "services-directions-models",
+                       "services-directions-refresh-models"]
 
 subprojects { subproject ->
 
diff --git a/services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java b/services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java
deleted file mode 100644
index a12d94cf8..000000000
--- a/services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mapbox.core;
-
-import org.junit.Test;
-
-public class MapboxServiceTest extends TestUtils {
-
-  @Test
-  public void enableDebug_doesEnableHttpDebugging() throws Exception {
-
-  }
-}
diff --git a/services-directions-refresh-models/.gitignore b/services-directions-refresh-models/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/services-directions-refresh-models/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/services-directions-refresh-models/build.gradle b/services-directions-refresh-models/build.gradle
new file mode 100644
index 000000000..63770047a
--- /dev/null
+++ b/services-directions-refresh-models/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java-library'
+
+dependencies {
+    api project(":services-directions-models")
+
+    // Annotations
+    implementation dependenciesList.supportAnnotation
+
+    // AutoValue
+    compileOnly dependenciesList.autoValue
+    compileOnly dependenciesList.autoValueGson
+}
diff --git a/services-directions-refresh-models/gradle.properties b/services-directions-refresh-models/gradle.properties
new file mode 100644
index 000000000..e92120f84
--- /dev/null
+++ b/services-directions-refresh-models/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=mapbox-sdk-directions-refresh-models
+POM_DESCRIPTION=Mapbox Directions Refresh Services Models
+POM_PACKAGING=jar
\ No newline at end of file
diff --git a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java
similarity index 100%
rename from services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java
rename to services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java
diff --git a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java
similarity index 100%
rename from services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java
rename to services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java
diff --git a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java
similarity index 100%
rename from services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java
rename to services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java
diff --git a/services-directions-refresh/build.gradle b/services-directions-refresh/build.gradle
index cbeb4e439..c7a006fab 100644
--- a/services-directions-refresh/build.gradle
+++ b/services-directions-refresh/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'java-library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(":services-core")
+    api project(":services-directions-refresh-models")
 
     // Annotations
     compileOnly dependenciesList.supportAnnotation
diff --git a/services/build.gradle b/services/build.gradle
index 1e14833fb..e5218fa33 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -12,7 +12,8 @@ sourceSets {
 dependencies {
     api project(":services-core")
     api project(":services-geojson")
-    api "com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.1.0-SNAPSHOT"
+    api project(":services-directions-models")
+    api project(":services-directions-refresh-models")
 
     // Annotations
     compileOnly dependenciesList.supportAnnotation
diff --git a/settings.gradle b/settings.gradle
index 06e7b984e..1542fc127 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,7 @@
 rootProject.name = "mapbox-java"
 
-include ':services', ':services-directions-models'
+include ':services'
+include ':services-directions-models'
 include ':services-speech'
 include ':services-core'
 include ':services-geojson'
@@ -14,5 +15,6 @@ include ':services-staticmap'
 include ':services-tilequery'
 include ':services-route-tiles'
 include ':services-directions-refresh'
+include ':services-directions-refresh-models'
 include ':services-isochrone'
 include 'samples'