diff --git a/src/bskyblock/addin/warps/Warp.java b/src/bskyblock/addon/warps/Warp.java
similarity index 93%
rename from src/bskyblock/addin/warps/Warp.java
rename to src/bskyblock/addon/warps/Warp.java
index 4dbda07..f55ca2f 100644
--- a/src/bskyblock/addin/warps/Warp.java
+++ b/src/bskyblock/addon/warps/Warp.java
@@ -1,10 +1,10 @@
-package bskyblock.addin.warps;
+package bskyblock.addon.warps;
 
 import java.util.Optional;
 
-import bskyblock.addin.warps.commands.WarpCommand;
-import bskyblock.addin.warps.commands.WarpsCommand;
-import bskyblock.addin.warps.config.PluginConfig;
+import bskyblock.addon.warps.commands.WarpCommand;
+import bskyblock.addon.warps.commands.WarpsCommand;
+import bskyblock.addon.warps.config.PluginConfig;
 import us.tastybento.bskyblock.BSkyBlock;
 import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.addons.Addon;
diff --git a/src/bskyblock/addin/warps/WarpPanelManager.java b/src/bskyblock/addon/warps/WarpPanelManager.java
similarity index 99%
rename from src/bskyblock/addin/warps/WarpPanelManager.java
rename to src/bskyblock/addon/warps/WarpPanelManager.java
index b5efee5..6169c55 100644
--- a/src/bskyblock/addin/warps/WarpPanelManager.java
+++ b/src/bskyblock/addon/warps/WarpPanelManager.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps;
+package bskyblock.addon.warps;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/bskyblock/addin/warps/WarpSignsManager.java b/src/bskyblock/addon/warps/WarpSignsManager.java
similarity index 98%
rename from src/bskyblock/addin/warps/WarpSignsManager.java
rename to src/bskyblock/addon/warps/WarpSignsManager.java
index 1c8ee71..ecb57ca 100644
--- a/src/bskyblock/addin/warps/WarpSignsManager.java
+++ b/src/bskyblock/addon/warps/WarpSignsManager.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps;
+package bskyblock.addon.warps;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,12 +27,12 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.SignChangeEvent;
 
-import bskyblock.addin.warps.config.Settings;
-import bskyblock.addin.warps.database.object.WarpsData;
-import bskyblock.addin.warps.event.WarpInitiateEvent;
-import bskyblock.addin.warps.event.WarpListEvent;
-import bskyblock.addin.warps.event.WarpRemoveEvent;
 import bskyblock.addon.level.Level;
+import bskyblock.addon.warps.config.Settings;
+import bskyblock.addon.warps.database.object.WarpsData;
+import bskyblock.addon.warps.event.WarpInitiateEvent;
+import bskyblock.addon.warps.event.WarpListEvent;
+import bskyblock.addon.warps.event.WarpRemoveEvent;
 import us.tastybento.bskyblock.BSkyBlock;
 import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.user.User;
diff --git a/src/bskyblock/addin/warps/commands/WarpCommand.java b/src/bskyblock/addon/warps/commands/WarpCommand.java
similarity index 97%
rename from src/bskyblock/addin/warps/commands/WarpCommand.java
rename to src/bskyblock/addon/warps/commands/WarpCommand.java
index 2f87571..fa05b0a 100644
--- a/src/bskyblock/addin/warps/commands/WarpCommand.java
+++ b/src/bskyblock/addon/warps/commands/WarpCommand.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.commands;
+package bskyblock.addon.warps.commands;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -7,7 +7,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.commands.CompositeCommand;
 import us.tastybento.bskyblock.api.user.User;
diff --git a/src/bskyblock/addin/warps/commands/WarpsCommand.java b/src/bskyblock/addon/warps/commands/WarpsCommand.java
similarity index 94%
rename from src/bskyblock/addin/warps/commands/WarpsCommand.java
rename to src/bskyblock/addon/warps/commands/WarpsCommand.java
index 6d62b8b..bd94e88 100644
--- a/src/bskyblock/addin/warps/commands/WarpsCommand.java
+++ b/src/bskyblock/addon/warps/commands/WarpsCommand.java
@@ -1,11 +1,11 @@
 /**
  * 
  */
-package bskyblock.addin.warps.commands;
+package bskyblock.addon.warps.commands;
 
 import java.util.List;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.commands.CompositeCommand;
 import us.tastybento.bskyblock.api.user.User;
diff --git a/src/bskyblock/addin/warps/config/PluginConfig.java b/src/bskyblock/addon/warps/config/PluginConfig.java
similarity index 81%
rename from src/bskyblock/addin/warps/config/PluginConfig.java
rename to src/bskyblock/addon/warps/config/PluginConfig.java
index b6cf214..0a01f43 100644
--- a/src/bskyblock/addin/warps/config/PluginConfig.java
+++ b/src/bskyblock/addon/warps/config/PluginConfig.java
@@ -1,6 +1,6 @@
-package bskyblock.addin.warps.config;
+package bskyblock.addon.warps.config;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 
 public class PluginConfig {
 
diff --git a/src/bskyblock/addin/warps/config/Settings.java b/src/bskyblock/addon/warps/config/Settings.java
similarity index 65%
rename from src/bskyblock/addin/warps/config/Settings.java
rename to src/bskyblock/addon/warps/config/Settings.java
index 4d4f684..ed9f2a5 100644
--- a/src/bskyblock/addin/warps/config/Settings.java
+++ b/src/bskyblock/addon/warps/config/Settings.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.config;
+package bskyblock.addon.warps.config;
 
 public class Settings {
 
diff --git a/src/bskyblock/addin/warps/database/object/WarpsData.java b/src/bskyblock/addon/warps/database/object/WarpsData.java
similarity index 95%
rename from src/bskyblock/addin/warps/database/object/WarpsData.java
rename to src/bskyblock/addon/warps/database/object/WarpsData.java
index 21034fe..6230fd8 100644
--- a/src/bskyblock/addin/warps/database/object/WarpsData.java
+++ b/src/bskyblock/addon/warps/database/object/WarpsData.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.database.object;
+package bskyblock.addon.warps.database.object;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/bskyblock/addin/warps/event/WarpCreateEvent.java b/src/bskyblock/addon/warps/event/WarpCreateEvent.java
similarity index 93%
rename from src/bskyblock/addin/warps/event/WarpCreateEvent.java
rename to src/bskyblock/addon/warps/event/WarpCreateEvent.java
index 9f2f612..53b718c 100644
--- a/src/bskyblock/addin/warps/event/WarpCreateEvent.java
+++ b/src/bskyblock/addon/warps/event/WarpCreateEvent.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.event;
+package bskyblock.addon.warps.event;
 
 import java.util.UUID;
 
@@ -6,7 +6,7 @@ import org.bukkit.Location;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 
 /**
  * This event is fired when a Warp is created
diff --git a/src/bskyblock/addin/warps/event/WarpInitiateEvent.java b/src/bskyblock/addon/warps/event/WarpInitiateEvent.java
similarity index 95%
rename from src/bskyblock/addin/warps/event/WarpInitiateEvent.java
rename to src/bskyblock/addon/warps/event/WarpInitiateEvent.java
index 5f42901..3921b11 100644
--- a/src/bskyblock/addin/warps/event/WarpInitiateEvent.java
+++ b/src/bskyblock/addon/warps/event/WarpInitiateEvent.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.event;
+package bskyblock.addon.warps.event;
 
 import java.util.UUID;
 
@@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 
 /**
  * This event is fired when a player tries to do a warp 
diff --git a/src/bskyblock/addin/warps/event/WarpListEvent.java b/src/bskyblock/addon/warps/event/WarpListEvent.java
similarity index 96%
rename from src/bskyblock/addin/warps/event/WarpListEvent.java
rename to src/bskyblock/addon/warps/event/WarpListEvent.java
index 12d3912..d5df305 100644
--- a/src/bskyblock/addin/warps/event/WarpListEvent.java
+++ b/src/bskyblock/addon/warps/event/WarpListEvent.java
@@ -15,7 +15,7 @@
  *     along with ASkyBlock.  If not, see <http://www.gnu.org/licenses/>.
  *******************************************************************************/
 
-package bskyblock.addin.warps.event;
+package bskyblock.addon.warps.event;
 
 import java.util.List;
 import java.util.UUID;
@@ -23,7 +23,7 @@ import java.util.UUID;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 
 /**
  * This event is fired when request is made for a sorted list of warps or when
diff --git a/src/bskyblock/addin/warps/event/WarpRemoveEvent.java b/src/bskyblock/addon/warps/event/WarpRemoveEvent.java
similarity index 94%
rename from src/bskyblock/addin/warps/event/WarpRemoveEvent.java
rename to src/bskyblock/addon/warps/event/WarpRemoveEvent.java
index bd2ee27..ef9bb97 100644
--- a/src/bskyblock/addin/warps/event/WarpRemoveEvent.java
+++ b/src/bskyblock/addon/warps/event/WarpRemoveEvent.java
@@ -1,4 +1,4 @@
-package bskyblock.addin.warps.event;
+package bskyblock.addon.warps.event;
 
 import java.util.UUID;
 
@@ -6,7 +6,7 @@ import org.bukkit.Location;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import bskyblock.addin.warps.Warp;
+import bskyblock.addon.warps.Warp;
 
 /**
  * This event is fired when a Warp is removed (when a warp sign is broken)