diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 9c7d43f6..10494823 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -28,4 +28,5 @@ dependencies {
     implementation "androidx.collection:collection:$collectionVersion"
     implementation "com.google.code.findbugs:jsr305:$jsr305Version"
     implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+    implementation "net.i2p.crypto:eddsa:$eddsaVersion"
 }
diff --git a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java b/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
similarity index 99%
rename from ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
rename to tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
index dcd5a041..f09d9a87 100644
--- a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2019-2020 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/build.gradle b/ui/build.gradle
index e4caeb6b..99852751 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -80,7 +80,6 @@ dependencies {
     implementation "androidx.preference:preference:$preferenceVersion"
     implementation "com.google.android.material:material:$materialComponentsVersion"
     implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
-    implementation "net.i2p.crypto:eddsa:$eddsaVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 }
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
index aac649dd..5c83f1dc 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
@@ -14,8 +14,6 @@ import android.widget.Toast;
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.util.ErrorMessages;
-import com.wireguard.android.util.ModuleLoader;
-import com.wireguard.android.util.ToolsInstaller;
 
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;