diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 3936dd5ed..608b5714d 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -27,9 +27,9 @@ import android.support.annotation.NonNull;
 import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
-import com.b44t.messenger.DcContext;
 import com.google.android.gms.security.ProviderInstaller;
 
+import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
diff --git a/src/org/thoughtcrime/securesms/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
similarity index 98%
rename from src/org/thoughtcrime/securesms/ApplicationDcContext.java
rename to src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index cb9bb269f..9ba0dbfc0 100644
--- a/src/org/thoughtcrime/securesms/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.thoughtcrime.securesms;
+package org.thoughtcrime.securesms.connect;
 
 import android.content.Context;
 import android.os.PowerManager;
@@ -23,6 +23,7 @@ import android.widget.Toast;
 
 import com.b44t.messenger.DcContext;
 
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.BufferedInputStream;
diff --git a/src/org/thoughtcrime/securesms/ForegroundDetector.java b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java
similarity index 96%
rename from src/org/thoughtcrime/securesms/ForegroundDetector.java
rename to src/org/thoughtcrime/securesms/connect/ForegroundDetector.java
index cb8546d8b..d0adb52d7 100644
--- a/src/org/thoughtcrime/securesms/ForegroundDetector.java
+++ b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java
@@ -14,13 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.thoughtcrime.securesms;
+package org.thoughtcrime.securesms.connect;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 
+import org.thoughtcrime.securesms.ApplicationContext;
+
 
 @SuppressLint("NewApi")
 public class ForegroundDetector implements Application.ActivityLifecycleCallbacks {