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 515ecf1972..9880aaa4c9 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.ControllerEventHandler;
 import bisq.tor.process.NativeTorProcess;
 import lombok.extern.slf4j.Slf4j;
 import net.freehaven.tor.control.PasswordDigest;
diff --git a/network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java b/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
similarity index 92%
rename from network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java
rename to network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
index 4f4e11578e..28011ecf5e 100644
--- a/network/tor/src/main/java/bisq/tor/controller/ControllerEventHandler.java
+++ b/network/tor/src/main/java/bisq/tor/controller/events/ControllerEventHandler.java
@@ -15,8 +15,12 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.tor.controller;
+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;
 import net.freehaven.tor.control.EventHandler;
 
 import java.util.List;