diff --git a/src/com/sekwah/advancedportals/portals/PortalArg.java b/src/com/sekwah/advancedportals/api/PortalArg.java
similarity index 88%
rename from src/com/sekwah/advancedportals/portals/PortalArg.java
rename to src/com/sekwah/advancedportals/api/PortalArg.java
index c095ea8a..238db28b 100644
--- a/src/com/sekwah/advancedportals/portals/PortalArg.java
+++ b/src/com/sekwah/advancedportals/api/PortalArg.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.portals;
+package com.sekwah.advancedportals.api;
 
 public class PortalArg {
 
diff --git a/src/com/sekwah/advancedportals/portals/PortalTags.java b/src/com/sekwah/advancedportals/api/PortalTags.java
similarity index 95%
rename from src/com/sekwah/advancedportals/portals/PortalTags.java
rename to src/com/sekwah/advancedportals/api/PortalTags.java
index e98ca23f..c613c657 100644
--- a/src/com/sekwah/advancedportals/portals/PortalTags.java
+++ b/src/com/sekwah/advancedportals/api/PortalTags.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.portals;
+package com.sekwah.advancedportals.api;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/sekwah/advancedportals/events/WarpEvent.java b/src/com/sekwah/advancedportals/api/events/WarpEvent.java
similarity index 97%
rename from src/com/sekwah/advancedportals/events/WarpEvent.java
rename to src/com/sekwah/advancedportals/api/events/WarpEvent.java
index e38c3904..1ea02efd 100644
--- a/src/com/sekwah/advancedportals/events/WarpEvent.java
+++ b/src/com/sekwah/advancedportals/api/events/WarpEvent.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.events;
+package com.sekwah.advancedportals.api.events;
 
 import com.sekwah.advancedportals.portals.AdvancedPortal;
 import org.bukkit.entity.Player;
@@ -12,8 +12,6 @@ public final class WarpEvent extends Event implements Cancellable {
      * Use listeners so you can add new triggers easier and also other plugins can listen for the event
      * and add their own triggers
      */
-
-
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancelled = false;
diff --git a/src/com/sekwah/advancedportals/listeners/Listeners.java b/src/com/sekwah/advancedportals/listeners/Listeners.java
index 4d86f412..1ffd5939 100644
--- a/src/com/sekwah/advancedportals/listeners/Listeners.java
+++ b/src/com/sekwah/advancedportals/listeners/Listeners.java
@@ -1,16 +1,12 @@
 package com.sekwah.advancedportals.listeners;
 
-import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
-import com.google.common.base.Optional;
 import com.sekwah.advancedportals.AdvancedPortalsPlugin;
 import com.sekwah.advancedportals.ConfigAccessor;
 import com.sekwah.advancedportals.events.WarpEvent;
 import com.sekwah.advancedportals.portals.AdvancedPortal;
 import com.sekwah.advancedportals.portals.Portal;
-import com.sun.org.apache.regexp.internal.RE;
 import org.bukkit.*;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -23,12 +19,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 
-import java.lang.reflect.Field;
-import java.util.HashMap;
-
 public class Listeners implements Listener {
     // The needed config values will be stored so they are easier to access later
     // an example is in the interact event in this if statement if((!UseOnlyServerAxe || event.getItem().getItemMeta().getDisplayName().equals("\u00A7eP...