From f9934bd8e5aabe3d30ba79b244359c144165b8af Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 11 Nov 2014 21:39:34 -0800
Subject: [PATCH] Modernize libtextsecure layout

---
 libtextsecure/build.gradle                    | 21 -----
 libtextsecure/build.xml                       | 92 -------------------
 libtextsecure/proguard-project.txt            | 20 ----
 libtextsecure/res/values/strings.xml          |  3 -
 .../push/PushTransportDetailsTest.java        |  0
 .../{ => src/main}/AndroidManifest.xml        |  0
 .../api/TextSecureAccountManager.java         |  0
 .../api/TextSecureMessageReceiver.java        |  0
 .../api/TextSecureMessageSender.java          |  0
 .../crypto/AttachmentCipherInputStream.java   |  0
 .../crypto/AttachmentCipherOutputStream.java  |  0
 .../api/crypto/TextSecureCipher.java          |  0
 .../crypto/UntrustedIdentityException.java    |  0
 .../api/messages/TextSecureAttachment.java    |  0
 .../messages/TextSecureAttachmentPointer.java |  0
 .../messages/TextSecureAttachmentStream.java  |  0
 .../api/messages/TextSecureEnvelope.java      |  0
 .../api/messages/TextSecureGroup.java         |  0
 .../api/messages/TextSecureMessage.java       |  0
 .../textsecure/push/AccountAttributes.java    |  0
 .../textsecure/push/ContactTokenDetails.java  |  0
 .../push/ContactTokenDetailsList.java         |  0
 .../textsecure/push/ContactTokenList.java     |  0
 .../textsecure/push/MismatchedDevices.java    |  0
 .../textsecure/push/OutgoingPushMessage.java  |  0
 .../push/OutgoingPushMessageList.java         |  0
 .../textsecure/push/PreKeyEntity.java         |  0
 .../textsecure/push/PreKeyResponse.java       |  0
 .../textsecure/push/PreKeyResponseItem.java   |  0
 .../textsecure/push/PreKeyState.java          |  0
 .../textsecure/push/PreKeyStatus.java         |  0
 .../textsecure/push/PushAddress.java          |  0
 .../textsecure/push/PushAttachmentData.java   |  0
 .../push/PushAttachmentPointer.java           |  0
 .../textsecure/push/PushBody.java             |  0
 .../textsecure/push/PushMessageProtos.java    |  0
 .../textsecure/push/PushMessageResponse.java  |  0
 .../textsecure/push/PushServiceSocket.java    |  0
 .../textsecure/push/PushTransportDetails.java |  0
 .../textsecure/push/SignedPreKeyEntity.java   |  0
 .../textsecure/push/StaleDevices.java         |  0
 .../push/UnregisteredUserException.java       |  0
 .../AuthorizationFailedException.java         |  0
 .../exceptions/EncapsulatedExceptions.java    |  0
 .../ExpectationFailedException.java           |  0
 .../MismatchedDevicesException.java           |  0
 .../NonSuccessfulResponseCodeException.java   |  0
 .../push/exceptions/NotFoundException.java    |  0
 .../push/exceptions/PushNetworkException.java |  0
 .../push/exceptions/RateLimitException.java   |  0
 .../exceptions/StaleDevicesException.java     |  0
 .../storage/CanonicalRecipient.java           |  0
 .../textsecure/storage/RecipientDevice.java   |  0
 .../textsecure/util/Base64.java               |  0
 .../util/BlacklistingTrustManager.java        |  0
 .../textsecure/util/Conversions.java          |  0
 .../textsecure/util/DirectoryUtil.java        |  0
 .../textsecure/util/FutureTaskListener.java   |  0
 .../whispersystems/textsecure/util/Hex.java   |  0
 .../util/InvalidNumberException.java          |  0
 .../textsecure/util/ListenableFutureTask.java |  0
 .../textsecure/util/PhoneNumberFormatter.java |  0
 .../whispersystems/textsecure/util/Util.java  |  0
 .../zxing/integration/IntentIntegrator.java   |  0
 .../zxing/integration/IntentResult.java       |  0
 65 files changed, 136 deletions(-)
 delete mode 100644 libtextsecure/build.xml
 delete mode 100644 libtextsecure/proguard-project.txt
 delete mode 100644 libtextsecure/res/values/strings.xml
 rename libtextsecure/{ => src}/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java (100%)
 rename libtextsecure/{ => src/main}/AndroidManifest.xml (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/TextSecureAccountManager.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/TextSecureMessageSender.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureGroup.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/api/messages/TextSecureMessage.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/AccountAttributes.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/ContactTokenDetails.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/ContactTokenDetailsList.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/ContactTokenList.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/MismatchedDevices.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/OutgoingPushMessage.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/OutgoingPushMessageList.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PreKeyEntity.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PreKeyResponse.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PreKeyResponseItem.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PreKeyState.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PreKeyStatus.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushAddress.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushAttachmentData.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushAttachmentPointer.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushBody.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushMessageProtos.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushMessageResponse.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushServiceSocket.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/PushTransportDetails.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/SignedPreKeyEntity.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/StaleDevices.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/UnregisteredUserException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/NotFoundException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/RateLimitException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/storage/CanonicalRecipient.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/storage/RecipientDevice.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/Base64.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/BlacklistingTrustManager.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/Conversions.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/DirectoryUtil.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/FutureTaskListener.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/Hex.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/InvalidNumberException.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/ListenableFutureTask.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/PhoneNumberFormatter.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/util/Util.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java (100%)
 rename libtextsecure/src/{ => main/java}/org/whispersystems/textsecure/zxing/integration/IntentResult.java (100%)

diff --git a/libtextsecure/build.gradle b/libtextsecure/build.gradle
index 5904f00b8a..7bce364196 100644
--- a/libtextsecure/build.gradle
+++ b/libtextsecure/build.gradle
@@ -35,27 +35,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
-    android {
-        sourceSets {
-            main {
-                manifest.srcFile 'AndroidManifest.xml'
-                java.srcDirs = ['src']
-                resources.srcDirs = ['src']
-                aidl.srcDirs = ['src']
-                renderscript.srcDirs = ['src']
-                res.srcDirs = ['res']
-                assets.srcDirs = ['assets']
-                jniLibs.srcDirs = ['libs']
-            }
-            androidTest {
-                java.srcDirs = ['androidTest/java']
-                resources.srcDirs = ['androidTest/java']
-                aidl.srcDirs = ['androidTest/java']
-                renderscript.srcDirs = ['androidTest/java']
-            }
-        }
-    }
 }
 
 tasks.whenTaskAdded { task ->
diff --git a/libtextsecure/build.xml b/libtextsecure/build.xml
deleted file mode 100644
index 29b2da612e..0000000000
--- a/libtextsecure/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="library" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties"/>
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env"/>
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME"/>
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties"/>
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-            />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true"/>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml"/>
-
-</project>
diff --git a/libtextsecure/proguard-project.txt b/libtextsecure/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/libtextsecure/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/libtextsecure/res/values/strings.xml b/libtextsecure/res/values/strings.xml
deleted file mode 100644
index 045e125f3d..0000000000
--- a/libtextsecure/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/libtextsecure/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java b/libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
similarity index 100%
rename from libtextsecure/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
rename to libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
diff --git a/libtextsecure/AndroidManifest.xml b/libtextsecure/src/main/AndroidManifest.xml
similarity index 100%
rename from libtextsecure/AndroidManifest.xml
rename to libtextsecure/src/main/AndroidManifest.xml
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/TextSecureAccountManager.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/TextSecureAccountManager.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/TextSecureMessageSender.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/TextSecureMessageSender.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureGroup.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureGroup.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureMessage.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/api/messages/TextSecureMessage.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/AccountAttributes.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/AccountAttributes.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenDetails.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenDetails.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenDetailsList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenDetailsList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/ContactTokenList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/MismatchedDevices.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/MismatchedDevices.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/OutgoingPushMessageList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/OutgoingPushMessageList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PreKeyEntity.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PreKeyEntity.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PreKeyResponse.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PreKeyResponse.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PreKeyResponseItem.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PreKeyResponseItem.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PreKeyState.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PreKeyState.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PreKeyStatus.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PreKeyStatus.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushAddress.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushAddress.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushAttachmentData.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushAttachmentData.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushBody.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushBody.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushMessageProtos.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushMessageProtos.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushMessageResponse.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushMessageResponse.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushServiceSocket.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushServiceSocket.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/PushTransportDetails.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/PushTransportDetails.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/SignedPreKeyEntity.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/SignedPreKeyEntity.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/StaleDevices.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/StaleDevices.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/UnregisteredUserException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/UnregisteredUserException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/NotFoundException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/NotFoundException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/RateLimitException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/RateLimitException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/storage/CanonicalRecipient.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/storage/CanonicalRecipient.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/storage/CanonicalRecipient.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/storage/CanonicalRecipient.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/storage/RecipientDevice.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/storage/RecipientDevice.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/storage/RecipientDevice.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/storage/RecipientDevice.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/Base64.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Base64.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/Base64.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/Base64.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/BlacklistingTrustManager.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/BlacklistingTrustManager.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/BlacklistingTrustManager.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/BlacklistingTrustManager.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/Conversions.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Conversions.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/Conversions.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/Conversions.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/DirectoryUtil.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/DirectoryUtil.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/DirectoryUtil.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/DirectoryUtil.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/FutureTaskListener.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/FutureTaskListener.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/FutureTaskListener.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/FutureTaskListener.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/Hex.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Hex.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/Hex.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/Hex.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/InvalidNumberException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/InvalidNumberException.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/InvalidNumberException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/InvalidNumberException.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/ListenableFutureTask.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/ListenableFutureTask.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/ListenableFutureTask.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/ListenableFutureTask.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/PhoneNumberFormatter.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/PhoneNumberFormatter.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/PhoneNumberFormatter.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/PhoneNumberFormatter.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/util/Util.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Util.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/util/Util.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/util/Util.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
diff --git a/libtextsecure/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/zxing/integration/IntentResult.java
similarity index 100%
rename from libtextsecure/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/zxing/integration/IntentResult.java