diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index b28c3c43..a544de52 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -16,7 +16,7 @@ import java.util.Random;
 import java.util.StringTokenizer;
 
 import org.json.JSONArray;
-import org.torproject.android.hsutils.GrantedPermissionsAction;
+import org.torproject.android.storage.GrantedPermissionsAction;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
diff --git a/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java b/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java
index 0e967566..0cf359b0 100644
--- a/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java
+++ b/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java
@@ -4,6 +4,8 @@ import android.app.Application;
 import android.content.Context;
 
 import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.storage.ExternalStorage;
+import org.torproject.android.zip.ZipIt;
 
 import java.io.File;
 
diff --git a/app/src/main/java/org/torproject/android/hsutils/ExternalStorage.java b/app/src/main/java/org/torproject/android/storage/ExternalStorage.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/hsutils/ExternalStorage.java
rename to app/src/main/java/org/torproject/android/storage/ExternalStorage.java
index 400f39ae..6da650da 100644
--- a/app/src/main/java/org/torproject/android/hsutils/ExternalStorage.java
+++ b/app/src/main/java/org/torproject/android/storage/ExternalStorage.java
@@ -1,4 +1,4 @@
-package org.torproject.android.hsutils;
+package org.torproject.android.storage;
 
 import android.os.Environment;
 
diff --git a/app/src/main/java/org/torproject/android/hsutils/GrantedPermissionsAction.java b/app/src/main/java/org/torproject/android/storage/GrantedPermissionsAction.java
similarity index 78%
rename from app/src/main/java/org/torproject/android/hsutils/GrantedPermissionsAction.java
rename to app/src/main/java/org/torproject/android/storage/GrantedPermissionsAction.java
index 31731fa6..9a62a74e 100644
--- a/app/src/main/java/org/torproject/android/hsutils/GrantedPermissionsAction.java
+++ b/app/src/main/java/org/torproject/android/storage/GrantedPermissionsAction.java
@@ -1,4 +1,4 @@
-package org.torproject.android.hsutils;
+package org.torproject.android.storage;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/org/torproject/android/hsutils/ZipIt.java b/app/src/main/java/org/torproject/android/zip/ZipIt.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/hsutils/ZipIt.java
rename to app/src/main/java/org/torproject/android/zip/ZipIt.java
index 25d74a50..84a0b7a6 100644
--- a/app/src/main/java/org/torproject/android/hsutils/ZipIt.java
+++ b/app/src/main/java/org/torproject/android/zip/ZipIt.java
@@ -1,4 +1,4 @@
-package org.torproject.android.hsutils;
+package org.torproject.android.zip;
 
 
 import java.io.BufferedInputStream;