diff --git a/app/build.gradle b/app/build.gradle index c3cc6f2517..3c2289324d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ wire { } protoPath { - srcDir "${project.rootDir}/libsignal/service/src/main/protowire" + srcDir "${project.rootDir}/libsignal-service/src/main/protowire" } } diff --git a/libsignal/service/.gitignore b/libsignal-service/.gitignore similarity index 100% rename from libsignal/service/.gitignore rename to libsignal-service/.gitignore diff --git a/libsignal/service/build.gradle b/libsignal-service/build.gradle similarity index 100% rename from libsignal/service/build.gradle rename to libsignal-service/build.gradle diff --git a/libsignal/service/lint.xml b/libsignal-service/lint.xml similarity index 100% rename from libsignal/service/lint.xml rename to libsignal-service/lint.xml diff --git a/libsignal/service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt b/libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt similarity index 100% rename from libsignal/service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt rename to libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/CancelationException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/CancelationException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/CancelationException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/CancelationException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupServicePinException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/KeyBackupServicePinException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupServicePinException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/KeyBackupServicePinException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/RemoteConfigResult.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/RemoteConfigResult.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/RemoteConfigResult.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/RemoteConfigResult.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SvrPinData.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrPinData.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/SvrPinData.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrPinData.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/TokenException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/TokenException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/TokenException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/TokenException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/CryptoUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/CryptoUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/CryptoUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/CryptoUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/MasterKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/MasterKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/MasterKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/MasterKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroup.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroup.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroup.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroup.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePniSignatureMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePniSignatureMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePniSignatureMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePniSignatureMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroup.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroup.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroup.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroup.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifyDeviceResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifyDeviceResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifyDeviceResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifyDeviceResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CaptchaRequiredException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CaptchaRequiredException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CaptchaRequiredException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CaptchaRequiredException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/EncapsulatedExceptions.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NetworkFailureException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushChallengeRequiredException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushChallengeRequiredException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushChallengeRequiredException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushChallengeRequiredException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RegistrationRetryException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RegistrationRetryException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RegistrationRetryException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RegistrationRetryException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CallLinksService.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CallLinksService.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CallLinksService.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CallLinksService.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageCipherKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageCipherKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageCipherKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageCipherKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageItemKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageItemKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageItemKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageItemKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageManifestKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageManifestKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageManifestKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageManifestKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV1.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV1.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV1.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV1.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2PinHasher.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2PinHasher.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2PinHasher.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2PinHasher.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidExtensions.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidExtensions.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidExtensions.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidExtensions.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalKeyBackupServiceUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalKeyBackupServiceUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalKeyBackupServiceUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalKeyBackupServiceUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/KeyBackupCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/KeyBackupCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/KeyBackupCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/KeyBackupCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/Quote.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/Quote.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/Quote.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/Quote.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestation.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestation.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestation.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestation.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SigningCertificate.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SigningCertificate.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SigningCertificate.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SigningCertificate.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedQuoteException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedQuoteException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedQuoteException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedQuoteException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedResponseException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedResponseException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedResponseException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/UnauthenticatedResponseException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenList.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenList.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenList.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenList.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceCode.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceCode.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceCode.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceCode.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OneTimePreKeyCounts.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OneTimePreKeyCounts.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OneTimePreKeyCounts.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OneTimePreKeyCounts.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalConfirmOneTimePaymentIntentPayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalConfirmOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalConfirmOneTimePaymentIntentPayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalConfirmOneTimePaymentIntentPayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreateOneTimePaymentIntentPayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreateOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreateOneTimePaymentIntentPayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreateOneTimePaymentIntentPayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreatePaymentMethodPayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreatePaymentMethodPayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreatePaymentMethodPayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PayPalCreatePaymentMethodPayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningMessage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningMessage.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningMessage.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningMessage.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteConfigResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteConfigResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteConfigResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteConfigResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntityList.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntityList.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntityList.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntityList.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceMessagesResult.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceMessagesResult.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceMessagesResult.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceMessagesResult.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/StripeOneTimePaymentIntentPayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StripeOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/StripeOneTimePaymentIntentPayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StripeOneTimePaymentIntentPayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitPushChallengePayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitPushChallengePayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitPushChallengePayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitPushChallengePayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitRecaptchaChallengePayload.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitRecaptchaChallengePayload.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitRecaptchaChallengePayload.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitRecaptchaChallengePayload.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageProtocolVersionException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageProtocolVersionException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageProtocolVersionException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UnsupportedDataMessageProtocolVersionException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/ContentLengthInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/ContentLengthInputStream.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/ContentLengthInputStream.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/ContentLengthInputStream.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureMapTransformer.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureMapTransformer.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureMapTransformer.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureMapTransformer.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureTransformers.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureTransformers.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureTransformers.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/FutureTransformers.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/ListenableFuture.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/ListenableFuture.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/ListenableFuture.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/ListenableFuture.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/SettableFuture.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/SettableFuture.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/SettableFuture.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/SettableFuture.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java diff --git a/libsignal/service/src/main/java/org/whispersystems/util/Base64.java b/libsignal-service/src/main/java/org/whispersystems/util/Base64.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/util/Base64.java rename to libsignal-service/src/main/java/org/whispersystems/util/Base64.java diff --git a/libsignal/service/src/main/java/org/whispersystems/util/Base64UrlSafe.java b/libsignal-service/src/main/java/org/whispersystems/util/Base64UrlSafe.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/util/Base64UrlSafe.java rename to libsignal-service/src/main/java/org/whispersystems/util/Base64UrlSafe.java diff --git a/libsignal/service/src/main/java/org/whispersystems/util/ByteArrayUtil.java b/libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/util/ByteArrayUtil.java rename to libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/util/FlagUtil.java b/libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/util/FlagUtil.java rename to libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java diff --git a/libsignal/service/src/main/java/org/whispersystems/util/StringUtil.java b/libsignal-service/src/main/java/org/whispersystems/util/StringUtil.java similarity index 100% rename from libsignal/service/src/main/java/org/whispersystems/util/StringUtil.java rename to libsignal-service/src/main/java/org/whispersystems/util/StringUtil.java diff --git a/libsignal/service/src/main/protowire/CDSI.proto b/libsignal-service/src/main/protowire/CDSI.proto similarity index 100% rename from libsignal/service/src/main/protowire/CDSI.proto rename to libsignal-service/src/main/protowire/CDSI.proto diff --git a/libsignal/service/src/main/protowire/DecryptedGroups.proto b/libsignal-service/src/main/protowire/DecryptedGroups.proto similarity index 100% rename from libsignal/service/src/main/protowire/DecryptedGroups.proto rename to libsignal-service/src/main/protowire/DecryptedGroups.proto diff --git a/libsignal/service/src/main/protowire/Groups.proto b/libsignal-service/src/main/protowire/Groups.proto similarity index 100% rename from libsignal/service/src/main/protowire/Groups.proto rename to libsignal-service/src/main/protowire/Groups.proto diff --git a/libsignal/service/src/main/protowire/InternalSerialization.proto b/libsignal-service/src/main/protowire/InternalSerialization.proto similarity index 100% rename from libsignal/service/src/main/protowire/InternalSerialization.proto rename to libsignal-service/src/main/protowire/InternalSerialization.proto diff --git a/libsignal/service/src/main/protowire/KeyBackupService.proto b/libsignal-service/src/main/protowire/KeyBackupService.proto similarity index 100% rename from libsignal/service/src/main/protowire/KeyBackupService.proto rename to libsignal-service/src/main/protowire/KeyBackupService.proto diff --git a/libsignal/service/src/main/protowire/MessageProcessing.proto b/libsignal-service/src/main/protowire/MessageProcessing.proto similarity index 100% rename from libsignal/service/src/main/protowire/MessageProcessing.proto rename to libsignal-service/src/main/protowire/MessageProcessing.proto diff --git a/libsignal/service/src/main/protowire/Provisioning.proto b/libsignal-service/src/main/protowire/Provisioning.proto similarity index 100% rename from libsignal/service/src/main/protowire/Provisioning.proto rename to libsignal-service/src/main/protowire/Provisioning.proto diff --git a/libsignal/service/src/main/protowire/ResumableUploads.proto b/libsignal-service/src/main/protowire/ResumableUploads.proto similarity index 100% rename from libsignal/service/src/main/protowire/ResumableUploads.proto rename to libsignal-service/src/main/protowire/ResumableUploads.proto diff --git a/libsignal/service/src/main/protowire/SVR2.proto b/libsignal-service/src/main/protowire/SVR2.proto similarity index 100% rename from libsignal/service/src/main/protowire/SVR2.proto rename to libsignal-service/src/main/protowire/SVR2.proto diff --git a/libsignal/service/src/main/protowire/SignalService.proto b/libsignal-service/src/main/protowire/SignalService.proto similarity index 100% rename from libsignal/service/src/main/protowire/SignalService.proto rename to libsignal-service/src/main/protowire/SignalService.proto diff --git a/libsignal/service/src/main/protowire/StickerResources.proto b/libsignal-service/src/main/protowire/StickerResources.proto similarity index 100% rename from libsignal/service/src/main/protowire/StickerResources.proto rename to libsignal-service/src/main/protowire/StickerResources.proto diff --git a/libsignal/service/src/main/protowire/StorageService.proto b/libsignal-service/src/main/protowire/StorageService.proto similarity index 100% rename from libsignal/service/src/main/protowire/StorageService.proto rename to libsignal-service/src/main/protowire/StorageService.proto diff --git a/libsignal/service/src/main/protowire/WebSocketResources.proto b/libsignal-service/src/main/protowire/WebSocketResources.proto similarity index 100% rename from libsignal/service/src/main/protowire/WebSocketResources.proto rename to libsignal-service/src/main/protowire/WebSocketResources.proto diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/SigningCertificateTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SigningCertificateTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/SigningCertificateTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SigningCertificateTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatterTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatterTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatterTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatterTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java rename to libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java diff --git a/libsignal/service/src/test/java/org/whispersystems/util/Base64UrlSafeTest.java b/libsignal-service/src/test/java/org/whispersystems/util/Base64UrlSafeTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/util/Base64UrlSafeTest.java rename to libsignal-service/src/test/java/org/whispersystems/util/Base64UrlSafeTest.java diff --git a/libsignal/service/src/test/java/org/whispersystems/util/FlagUtilTest.java b/libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.java similarity index 100% rename from libsignal/service/src/test/java/org/whispersystems/util/FlagUtilTest.java rename to libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.java diff --git a/libsignal/service/src/test/resources/ias.cert b/libsignal-service/src/test/resources/ias.cert similarity index 100% rename from libsignal/service/src/test/resources/ias.cert rename to libsignal-service/src/test/resources/ias.cert diff --git a/libsignal/service/src/test/resources/ias.jks b/libsignal-service/src/test/resources/ias.jks similarity index 100% rename from libsignal/service/src/test/resources/ias.jks rename to libsignal-service/src/test/resources/ias.jks diff --git a/libsignal/service/src/test/resources/ias.store b/libsignal-service/src/test/resources/ias.store similarity index 100% rename from libsignal/service/src/test/resources/ias.store rename to libsignal-service/src/test/resources/ias.store diff --git a/libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java b/libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java similarity index 100% rename from libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java rename to libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java diff --git a/settings.gradle b/settings.gradle index 5d7b3896fe..edaef4fdaf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -68,8 +68,6 @@ project(':paging-app').projectDir = file('paging/app') project(':device-transfer').projectDir = file('device-transfer/lib') project(':device-transfer-app').projectDir = file('device-transfer/app') -project(':libsignal-service').projectDir = file('libsignal/service') - project(':image-editor').projectDir = file('image-editor/lib') project(':image-editor-app').projectDir = file('image-editor/app')