diff --git a/src/org/thoughtcrime/securesms/util/FutureTaskListener.java b/library/src/org/whispersystems/textsecure/util/FutureTaskListener.java
similarity index 73%
rename from src/org/thoughtcrime/securesms/util/FutureTaskListener.java
rename to library/src/org/whispersystems/textsecure/util/FutureTaskListener.java
index 7477fdbc41..01de1e7f53 100644
--- a/src/org/thoughtcrime/securesms/util/FutureTaskListener.java
+++ b/library/src/org/whispersystems/textsecure/util/FutureTaskListener.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.util;
+package org.whispersystems.textsecure.util;
 
 public interface FutureTaskListener<V> {
   public void onSuccess(V result);
diff --git a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/library/src/org/whispersystems/textsecure/util/ListenableFutureTask.java
similarity index 94%
rename from src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
rename to library/src/org/whispersystems/textsecure/util/ListenableFutureTask.java
index 89d2512f2b..0bb9d681e6 100644
--- a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
+++ b/library/src/org/whispersystems/textsecure/util/ListenableFutureTask.java
@@ -1,6 +1,5 @@
-package org.thoughtcrime.securesms.util;
+package org.whispersystems.textsecure.util;
 
-import java.lang.ref.WeakReference;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
diff --git a/src/com/google/zxing/integration/android/IntentIntegrator.java b/library/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
similarity index 99%
rename from src/com/google/zxing/integration/android/IntentIntegrator.java
rename to library/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
index c6c8214bb8..b4a6116e4d 100644
--- a/src/com/google/zxing/integration/android/IntentIntegrator.java
+++ b/library/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.integration.android;
+package org.whispersystems.textsecure.zxing.integration;
 
 import android.app.AlertDialog;
 import android.app.Activity;
diff --git a/src/com/google/zxing/integration/android/IntentResult.java b/library/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java
similarity index 95%
rename from src/com/google/zxing/integration/android/IntentResult.java
rename to library/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java
index d4c69c025f..aed21cad1d 100644
--- a/src/com/google/zxing/integration/android/IntentResult.java
+++ b/library/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.integration.android;
+package org.whispersystems.textsecure.zxing.integration;
 
 /**
  * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index ec9f405dd6..1c613eac1f 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -19,12 +19,12 @@
               android:dividerHeight="1dp"
               android:background="?navigation_drawer_background"/>
 
-    <TextView android:id="@android:id/empty"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:gravity="center"
-              android:textAppearance="?android:attr/textAppearanceLarge"
-              android:textColor="?conversation_text_secondary_color"
-              android:text="Empty message list" />
+    <!--<TextView android:id="@android:id/empty"-->
+              <!--android:layout_width="fill_parent"-->
+              <!--android:layout_height="fill_parent"-->
+              <!--android:gravity="center"-->
+              <!--android:textAppearance="?android:attr/textAppearanceLarge"-->
+              <!--android:textColor="?conversation_text_secondary_color"-->
+              <!--android:text="Empty message list" />-->
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 9d3ae7f500..9fbd95d39a 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -53,8 +53,8 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.SendReceiveService;
 import org.thoughtcrime.securesms.util.Emoji;
-import org.thoughtcrime.securesms.util.FutureTaskListener;
-import org.thoughtcrime.securesms.util.ListenableFutureTask;
+import org.whispersystems.textsecure.util.FutureTaskListener;
+import org.whispersystems.textsecure.util.ListenableFutureTask;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/org/thoughtcrime/securesms/KeyScanningActivity.java b/src/org/thoughtcrime/securesms/KeyScanningActivity.java
index 2c1bf04d90..415ea39716 100644
--- a/src/org/thoughtcrime/securesms/KeyScanningActivity.java
+++ b/src/org/thoughtcrime/securesms/KeyScanningActivity.java
@@ -28,8 +28,8 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
+import org.whispersystems.textsecure.zxing.integration.IntentIntegrator;
+import org.whispersystems.textsecure.zxing.integration.IntentResult;
 
 /**
  * Activity for initiating/receiving key QR code scans.
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 0df05ae1f0..4e7cc18ae1 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -43,7 +43,7 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.LRUCache;
-import org.thoughtcrime.securesms.util.ListenableFutureTask;
+import org.whispersystems.textsecure.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.Trimmer;
 import org.whispersystems.textsecure.util.Util;
 
diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
index cf7127ade4..8d0c5a3c95 100644
--- a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
@@ -21,11 +21,10 @@ import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.ListenableFutureTask;
+import org.whispersystems.textsecure.util.ListenableFutureTask;
 
 /**
  * Represents the message record model for MMS messages that contain
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index d120fa8127..9715f429f0 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -25,8 +25,8 @@ import android.util.Log;
 
 import org.thoughtcrime.securesms.database.CanonicalAddressDatabase;
 import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails;
-import org.thoughtcrime.securesms.util.FutureTaskListener;
-import org.thoughtcrime.securesms.util.ListenableFutureTask;
+import org.whispersystems.textsecure.util.FutureTaskListener;
+import org.whispersystems.textsecure.util.ListenableFutureTask;
 import org.whispersystems.textsecure.storage.CanonicalRecipientAddress;
 
 import java.util.HashSet;
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
index 87c0a16b49..076b68467b 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
@@ -28,7 +28,7 @@ import android.util.Log;
 
 import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
 import org.thoughtcrime.securesms.util.LRUCache;
-import org.thoughtcrime.securesms.util.ListenableFutureTask;
+import org.whispersystems.textsecure.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.InputStream;