diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt
index 0149b1bf7e..db613d4698 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt
@@ -1,6 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service
 
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
+import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
 
 /**
  * Provides an API for interacting with the /devices endpoints.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt
index 83e2fee754..f55b31d8fe 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt
@@ -1,11 +1,11 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service
 
+import com.bitwarden.network.api.AuthenticatedDevicesApi
+import com.bitwarden.network.model.TrustedDeviceKeysRequestJson
+import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
 import com.bitwarden.network.util.base64UrlEncode
 import com.bitwarden.network.util.toResult
-import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedDevicesApi
 import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedDevicesApi
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
 
 class DevicesServiceImpl(
     private val authenticatedDevicesApi: AuthenticatedDevicesApi,
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt
index d77017332d..954574c5d7 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt
@@ -1,10 +1,10 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service
 
 import com.bitwarden.core.data.util.asSuccess
+import com.bitwarden.network.api.AuthenticatedDevicesApi
 import com.bitwarden.network.base.BaseServiceTest
-import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedDevicesApi
+import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedDevicesApi
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
 import kotlinx.coroutines.test.runTest
 import okhttp3.mockwebserver.MockResponse
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt
index 68ccd90832..f8290ed4e6 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt
@@ -3,12 +3,12 @@ package com.x8bit.bitwarden.data.auth.manager
 import com.bitwarden.core.data.util.asFailure
 import com.bitwarden.core.data.util.asSuccess
 import com.bitwarden.crypto.TrustDeviceResponse
+import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
 import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson
 import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedDevicesApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/AuthenticatedDevicesApi.kt
similarity index 67%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedDevicesApi.kt
rename to network/src/main/kotlin/com/bitwarden/network/api/AuthenticatedDevicesApi.kt
index b4e8e82bfe..4e62d10ee0 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedDevicesApi.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/api/AuthenticatedDevicesApi.kt
@@ -1,9 +1,9 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.api
+package com.bitwarden.network.api
 
 import androidx.annotation.Keep
 import com.bitwarden.network.model.NetworkResult
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
+import com.bitwarden.network.model.TrustedDeviceKeysRequestJson
+import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
 import retrofit2.http.Body
 import retrofit2.http.PUT
 import retrofit2.http.Path
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysRequestJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysRequestJson.kt
similarity index 86%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysRequestJson.kt
rename to network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysRequestJson.kt
index 5044e2ffa6..2c690398a6 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysRequestJson.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysRequestJson.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
+package com.bitwarden.network.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysResponseJson.kt
similarity index 89%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysResponseJson.kt
rename to network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysResponseJson.kt
index 05ea4acc83..6c64f1dd1c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceKeysResponseJson.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/model/TrustedDeviceKeysResponseJson.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
+package com.bitwarden.network.model
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName