diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEvent.java b/network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java
similarity index 98%
rename from network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEvent.java
rename to network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java
index 70be093bf0..397d0c40a5 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEvent.java
+++ b/network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEventListener.java b/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
similarity index 96%
rename from network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEventListener.java
rename to network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
index 14c847504f..53cdca635f 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/BootstrapEventListener.java
+++ b/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 public interface BootstrapEventListener {
     void onBootstrapStatusEvent(BootstrapEvent bootstrapEvent);
diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/ControllerEventHandler.java b/network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java
similarity index 99%
rename from network/tor/src/main/java/bisq/tor/bootstrap/ControllerEventHandler.java
rename to network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java
index 672d6541e0..4f4e11578e 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/ControllerEventHandler.java
+++ b/network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 import net.freehaven.tor.control.EventHandler;
 
diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEvent.java b/network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEvent.java
similarity index 98%
rename from network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEvent.java
rename to network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEvent.java
index f695164776..f1228c50ea 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEvent.java
+++ b/network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEvent.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEventListener.java b/network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEventListener.java
similarity index 96%
rename from network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEventListener.java
rename to network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEventListener.java
index ca6d785352..a939095e96 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/HsDescUploadedEventListener.java
+++ b/network/tor/src/main/java/bisq/tor/controller/HsDescUploadedEventListener.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 public interface HsDescUploadedEventListener {
     void onHsDescUploaded(HsDescUploadedEvent uploadedEvent);
diff --git a/network/tor/src/main/java/bisq/tor/bootstrap/TorBootstrapFailed.java b/network/tor/src/main/java/bisq/tor/controller/TorBootstrapFailed.java
similarity index 96%
rename from network/tor/src/main/java/bisq/tor/bootstrap/TorBootstrapFailed.java
rename to network/tor/src/main/java/bisq/tor/controller/TorBootstrapFailed.java
index 901c7b7004..238b7f8b81 100644
--- a/network/tor/src/main/java/bisq/tor/bootstrap/TorBootstrapFailed.java
+++ b/network/tor/src/main/java/bisq/tor/controller/TorBootstrapFailed.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.bootstrap;
+package bisq.tor.controller;
 
 public class TorBootstrapFailed extends RuntimeException {
     public TorBootstrapFailed(String message) {
diff --git a/network/tor/src/main/java/bisq/tor/process/NativeTorController.java b/network/tor/src/main/java/bisq/tor/process/NativeTorController.java
index 2c968b1935..e355a3f999 100644
--- a/network/tor/src/main/java/bisq/tor/process/NativeTorController.java
+++ b/network/tor/src/main/java/bisq/tor/process/NativeTorController.java
@@ -18,7 +18,7 @@
 package bisq.tor.process;
 
 import bisq.tor.ClientTorrcGenerator;
-import bisq.tor.bootstrap.*;
+import bisq.tor.controller.*;
 import lombok.extern.slf4j.Slf4j;
 import net.freehaven.tor.control.PasswordDigest;
 import net.freehaven.tor.control.TorControlConnection;