diff --git a/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java b/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
index 53cdca635f..195856b1eb 100644
--- a/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
+++ b/network/tor/src/main/java/bisq/tor/controller/BootstrapEventListener.java
@@ -17,6 +17,8 @@
 
 package bisq.tor.controller;
 
+import bisq.tor.controller.events.BootstrapEvent;
+
 public interface BootstrapEventListener {
     void onBootstrapStatusEvent(BootstrapEvent bootstrapEvent);
 }
diff --git a/network/tor/src/main/java/bisq/tor/controller/NativeTorController.java b/network/tor/src/main/java/bisq/tor/controller/NativeTorController.java
index 9880aaa4c9..3c82157366 100644
--- a/network/tor/src/main/java/bisq/tor/controller/NativeTorController.java
+++ b/network/tor/src/main/java/bisq/tor/controller/NativeTorController.java
@@ -18,6 +18,7 @@
 package bisq.tor.controller;
 
 import bisq.tor.ClientTorrcGenerator;
+import bisq.tor.controller.events.BootstrapEvent;
 import bisq.tor.controller.events.ControllerEventHandler;
 import bisq.tor.process.NativeTorProcess;
 import lombok.extern.slf4j.Slf4j;
diff --git a/network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java b/network/tor/src/main/java/bisq/tor/controller/events/BootstrapEvent.java
similarity index 98%
rename from network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java
rename to network/tor/src/main/java/bisq/tor/controller/events/BootstrapEvent.java
index 397d0c40a5..5df54fb760 100644
--- a/network/tor/src/main/java/bisq/tor/controller/BootstrapEvent.java
+++ b/network/tor/src/main/java/bisq/tor/controller/events/BootstrapEvent.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.controller;
+package bisq.tor.controller.events;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java b/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
index 28011ecf5e..d98229fecd 100644
--- a/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
+++ b/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.controller.events;
 
-import bisq.tor.controller.BootstrapEvent;
 import bisq.tor.controller.BootstrapEventListener;
 import bisq.tor.controller.HsDescUploadedEvent;
 import bisq.tor.controller.HsDescUploadedEventListener;