diff --git a/briar-api/src/main/java/org/briarproject/briar/api/logging/PersistentLogManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/logging/PersistentLogManager.java
similarity index 95%
rename from briar-api/src/main/java/org/briarproject/briar/api/logging/PersistentLogManager.java
rename to bramble-api/src/main/java/org/briarproject/bramble/api/logging/PersistentLogManager.java
index c6ffb16f1..a26c714c2 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/logging/PersistentLogManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/logging/PersistentLogManager.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.api.logging;
+package org.briarproject.bramble.api.logging;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.settings.Settings;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
index e2b7deae8..3ba1c25ad 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
@@ -13,6 +13,7 @@ import org.briarproject.bramble.identity.IdentityModule;
 import org.briarproject.bramble.io.IoModule;
 import org.briarproject.bramble.keyagreement.KeyAgreementModule;
 import org.briarproject.bramble.lifecycle.LifecycleModule;
+import org.briarproject.bramble.logging.LoggingModule;
 import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.record.RecordModule;
@@ -41,6 +42,7 @@ import dagger.Module;
 		IoModule.class,
 		KeyAgreementModule.class,
 		LifecycleModule.class,
+		LoggingModule.class,
 		PluginModule.class,
 		PropertiesModule.class,
 		RecordModule.class,
diff --git a/briar-core/src/main/java/org/briarproject/briar/logging/BriefLogFormatter.java b/bramble-core/src/main/java/org/briarproject/bramble/logging/BriefLogFormatter.java
similarity index 97%
rename from briar-core/src/main/java/org/briarproject/briar/logging/BriefLogFormatter.java
rename to bramble-core/src/main/java/org/briarproject/bramble/logging/BriefLogFormatter.java
index fae52b378..89778a28e 100644
--- a/briar-core/src/main/java/org/briarproject/briar/logging/BriefLogFormatter.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/logging/BriefLogFormatter.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.logging;
+package org.briarproject.bramble.logging;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
diff --git a/briar-core/src/main/java/org/briarproject/briar/logging/FlushingStreamHandler.java b/bramble-core/src/main/java/org/briarproject/bramble/logging/FlushingStreamHandler.java
similarity index 96%
rename from briar-core/src/main/java/org/briarproject/briar/logging/FlushingStreamHandler.java
rename to bramble-core/src/main/java/org/briarproject/bramble/logging/FlushingStreamHandler.java
index 2ffa08c4f..da5aab0f5 100644
--- a/briar-core/src/main/java/org/briarproject/briar/logging/FlushingStreamHandler.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/logging/FlushingStreamHandler.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.logging;
+package org.briarproject.bramble.logging;
 
 import java.io.OutputStream;
 import java.util.concurrent.Executor;
diff --git a/briar-core/src/main/java/org/briarproject/briar/logging/LoggingModule.java b/bramble-core/src/main/java/org/briarproject/bramble/logging/LoggingModule.java
similarity index 84%
rename from briar-core/src/main/java/org/briarproject/briar/logging/LoggingModule.java
rename to bramble-core/src/main/java/org/briarproject/bramble/logging/LoggingModule.java
index 6d876afd8..33799a522 100644
--- a/briar-core/src/main/java/org/briarproject/briar/logging/LoggingModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/logging/LoggingModule.java
@@ -1,7 +1,7 @@
-package org.briarproject.briar.logging;
+package org.briarproject.bramble.logging;
 
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.briar.api.logging.PersistentLogManager;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 
 import java.util.logging.Formatter;
 
diff --git a/briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/logging/PersistentLogManagerImpl.java
similarity index 98%
rename from briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java
rename to bramble-core/src/main/java/org/briarproject/bramble/logging/PersistentLogManagerImpl.java
index 04a5e7b46..5e82664a9 100644
--- a/briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/logging/PersistentLogManagerImpl.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.logging;
+package org.briarproject.bramble.logging;
 
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.SecretKey;
@@ -8,13 +8,13 @@ import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook;
 import org.briarproject.bramble.api.lifecycle.ShutdownManager;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.system.Scheduler;
 import org.briarproject.bramble.api.transport.StreamReaderFactory;
 import org.briarproject.bramble.api.transport.StreamWriter;
 import org.briarproject.bramble.api.transport.StreamWriterFactory;
-import org.briarproject.briar.api.logging.PersistentLogManager;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
index de68a6358..80faa2b28 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
@@ -20,6 +20,7 @@ import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
 import org.briarproject.bramble.api.keyagreement.PayloadParser;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 import org.briarproject.bramble.api.plugin.PluginManager;
 import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.bramble.api.system.AndroidExecutor;
@@ -46,7 +47,6 @@ import org.briarproject.briar.api.feed.FeedManager;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.logging.PersistentLogManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.api.privategroup.GroupMessageFactory;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
index 7ad4d4739..a8ecb8bf9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
@@ -19,6 +19,7 @@ import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
 import org.briarproject.bramble.BrambleAndroidEagerSingletons;
 import org.briarproject.bramble.BrambleCoreEagerSingletons;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
@@ -27,7 +28,6 @@ import org.briarproject.briar.android.reporting.BriarReportPrimer;
 import org.briarproject.briar.android.reporting.BriarReportSenderFactory;
 import org.briarproject.briar.android.reporting.DevReportActivity;
 import org.briarproject.briar.android.util.UiUtils;
-import org.briarproject.briar.api.logging.PersistentLogManager;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
index ff47fb806..21395b737 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
@@ -14,10 +14,10 @@ import android.os.Looper;
 import org.acra.builder.ReportBuilder;
 import org.acra.builder.ReportPrimer;
 import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.BriarApplication;
-import org.briarproject.briar.api.logging.PersistentLogManager;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
index 83418af24..a2f9851ec 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
@@ -7,12 +7,12 @@ import android.view.MenuItem;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.logging.PersistentLogManager;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
-import org.briarproject.briar.api.logging.PersistentLogManager;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
index c4cb380c7..5ba057706 100644
--- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
+++ b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
@@ -6,7 +6,6 @@ import org.briarproject.briar.feed.DnsModule;
 import org.briarproject.briar.feed.FeedModule;
 import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.introduction.IntroductionModule;
-import org.briarproject.briar.logging.LoggingModule;
 import org.briarproject.briar.messaging.MessagingModule;
 import org.briarproject.briar.privategroup.PrivateGroupModule;
 import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
@@ -23,7 +22,6 @@ import dagger.Module;
 		ForumModule.class,
 		GroupInvitationModule.class,
 		IntroductionModule.class,
-		LoggingModule.class,
 		MessagingModule.class,
 		PrivateGroupModule.class,
 		SharingModule.class,