diff --git a/android/.gitignore b/onionwrapper-android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to onionwrapper-android/.gitignore
diff --git a/android/build.gradle b/onionwrapper-android/build.gradle
similarity index 93%
rename from android/build.gradle
rename to onionwrapper-android/build.gradle
index d8e4fea21d5c26610237239b48c1713001264526..23b9fd08e708672ea78cfec699f9137b95950074 100644
--- a/android/build.gradle
+++ b/onionwrapper-android/build.gradle
@@ -27,6 +27,6 @@ android {
 }
 
 dependencies {
-    implementation project(':core')
+    implementation project(':onionwrapper-core')
     implementation 'org.briarproject:dont-kill-me-lib:0.2.6'
 }
diff --git a/android/proguard-rules.pro b/onionwrapper-android/proguard-rules.pro
similarity index 100%
rename from android/proguard-rules.pro
rename to onionwrapper-android/proguard-rules.pro
diff --git a/android/src/main/AndroidManifest.xml b/onionwrapper-android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/src/main/AndroidManifest.xml
rename to onionwrapper-android/src/main/AndroidManifest.xml
diff --git a/core/.gitignore b/onionwrapper-core/.gitignore
similarity index 100%
rename from core/.gitignore
rename to onionwrapper-core/.gitignore
diff --git a/core/build.gradle b/onionwrapper-core/build.gradle
similarity index 100%
rename from core/build.gradle
rename to onionwrapper-core/build.gradle
diff --git a/core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/TorUtils.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
diff --git a/java/.gitignore b/onionwrapper-java/.gitignore
similarity index 100%
rename from java/.gitignore
rename to onionwrapper-java/.gitignore
diff --git a/java/build.gradle b/onionwrapper-java/build.gradle
similarity index 86%
rename from java/build.gradle
rename to onionwrapper-java/build.gradle
index e08ad5590810f3e64079c4ef60f7e556a266bcf2..9e35b43361b3a8f5c9d4f406c0c29df1527cdb8f 100644
--- a/java/build.gradle
+++ b/onionwrapper-java/build.gradle
@@ -8,7 +8,7 @@ java {
 }
 
 dependencies {
-    implementation project(':core')
+    implementation project(':onionwrapper-core')
     def jna_version = '4.5.2'
     implementation "net.java.dev.jna:jna:$jna_version"
     implementation "net.java.dev.jna:jna-platform:$jna_version"
diff --git a/java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
diff --git a/java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
diff --git a/java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
diff --git a/settings.gradle b/settings.gradle
index 5f5317bf3dba266f65ce682acedeb9916bd8453a..2bb9f2af6e7be08bf5b012a9037f63195f94ac9f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,6 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "Onion Wrapper"
-include ':core'
-include ':java'
-include ':android'
+include ':onionwrapper-core'
+include ':onionwrapper-java'
+include ':onionwrapper-android'