diff --git a/app/src/dummy/java/eu/faircode/email/DebugHelper.java b/app/src/dummy/java/eu/faircode/email/DebugHelper.java
deleted file mode 100644
index 03a4cdbbb3..0000000000
--- a/app/src/dummy/java/eu/faircode/email/DebugHelper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package eu.faircode.email;
-
-/*
-    This file is part of FairEmail.
-
-    FairEmail is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    FairEmail is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
-
-    Copyright 2018-2023 by Marcel Bokhorst (M66B)
-*/
-
-import android.content.Context;
-import android.os.Bundle;
-
-import org.json.JSONException;
-
-import java.io.IOException;
-
-public class DebugHelper {
-    static final String CRASH_LOG_NAME = "crash.log";
-
-    static EntityMessage getDebugInfo(Context context, String source, int title, Throwable ex, String log, Bundle args) throws IOException, JSONException {
-        return null;
-    }
-
-    static void writeCrashLog(Context context, Throwable ex) {
-    }
-}
diff --git a/app/src/dummy/java/eu/faircode/email/SSLHelper.java b/app/src/dummy/java/eu/faircode/email/SSLHelper.java
deleted file mode 100644
index e9cbd713b3..0000000000
--- a/app/src/dummy/java/eu/faircode/email/SSLHelper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.faircode.email;
-
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-
-public class SSLHelper {
-    // https://support.google.com/faqs/answer/6346016
-
-    static TrustManager[] getTrustManagers(String server, boolean secure, boolean cert_strict, String trustedFingerprint, ITrust intf) {
-        TrustManagerFactory tmf;
-        try {
-            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null);
-            return tmf.getTrustManagers();
-        } catch (Throwable ex) {
-            Log.e(ex);
-            return null;
-        }
-    }
-
-    static boolean customTrustManager() {
-        return false;
-    }
-
-    interface ITrust {
-        void checkServerTrusted(X509Certificate[] chain);
-    }
-}
diff --git a/app/src/extra/java/eu/faircode/email/DebugHelper.java b/app/src/main/java/eu/faircode/email/DebugHelper.java
similarity index 100%
rename from app/src/extra/java/eu/faircode/email/DebugHelper.java
rename to app/src/main/java/eu/faircode/email/DebugHelper.java
diff --git a/app/src/extra/java/eu/faircode/email/SSLHelper.java b/app/src/main/java/eu/faircode/email/SSLHelper.java
similarity index 100%
rename from app/src/extra/java/eu/faircode/email/SSLHelper.java
rename to app/src/main/java/eu/faircode/email/SSLHelper.java