diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java
index 225f96c..3e29cba 100644
--- a/src/main/java/world/bentobox/warps/Warp.java
+++ b/src/main/java/world/bentobox/warps/Warp.java
@@ -16,6 +16,7 @@ import world.bentobox.level.Level;
 import world.bentobox.warps.commands.WarpCommand;
 import world.bentobox.warps.commands.WarpsCommand;
 import world.bentobox.warps.config.Settings;
+import world.bentobox.warps.listeners.WarpSignsListener;
 
 /**
  * Addin to BentoBox that enables welcome warp signs
diff --git a/src/main/java/world/bentobox/warps/WarpSignsListener.java b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
similarity index 99%
rename from src/main/java/world/bentobox/warps/WarpSignsListener.java
rename to src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
index 2ed72a3..999323c 100644
--- a/src/main/java/world/bentobox/warps/WarpSignsListener.java
+++ b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
@@ -1,4 +1,4 @@
-package world.bentobox.warps;
+package world.bentobox.warps.listeners;
 
 import java.util.Map;
 import java.util.UUID;
@@ -19,6 +19,7 @@ import org.bukkit.event.block.SignChangeEvent;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.warps.Warp;
 import world.bentobox.warps.event.WarpRemoveEvent;
 
 /**
diff --git a/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java b/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java
similarity index 98%
rename from src/test/java/world/bentobox/warps/WarpSignsListenerTest.java
rename to src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java
index 930e170..1a0f840 100644
--- a/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java
+++ b/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java
@@ -1,4 +1,4 @@
-package world.bentobox.warps;
+package world.bentobox.warps.listeners;
 
 
 import static org.junit.Assert.assertEquals;
@@ -50,7 +50,10 @@ import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.warps.Warp;
+import world.bentobox.warps.WarpSignsManager;
 import world.bentobox.warps.config.Settings;
+import world.bentobox.warps.listeners.WarpSignsListener;
 
 /**
  * @author tastybento