36 files changed, 238 insertions, 238 deletions

diff --git a/src/main/java/dev/tylerm/khs/command/Confirm.java b/src/main/java/cat/freya/khs/command/Confirm.java
index 9a13b72..34b145f 100644
--- a/src/main/java/dev/tylerm/khs/command/Confirm.java
+++ b/src/main/java/cat/freya/khs/command/Confirm.java
@@ -1,14 +1,14 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.command.util.ICommand;
+import cat.freya.khs.command.util.ICommand;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.function.Consumer;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Confirm implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Help.java b/src/main/java/cat/freya/khs/command/Help.java
index 5dfd7e9..6d7a1f3 100644
--- a/src/main/java/dev/tylerm/khs/command/Help.java
+++ b/src/main/java/cat/freya/khs/command/Help.java
@@ -1,8 +1,8 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.util.Pair;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.util.Pair;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -11,8 +11,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Help implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Join.java b/src/main/java/cat/freya/khs/command/Join.java
index d8ba212..237c70e 100644
--- a/src/main/java/dev/tylerm/khs/command/Join.java
+++ b/src/main/java/cat/freya/khs/command/Join.java
@@ -1,15 +1,15 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Join implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Leave.java b/src/main/java/cat/freya/khs/command/Leave.java
index dc485b6..7b64fe3 100644
--- a/src/main/java/dev/tylerm/khs/command/Leave.java
+++ b/src/main/java/cat/freya/khs/command/Leave.java
@@ -1,15 +1,15 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Leave implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Reload.java b/src/main/java/cat/freya/khs/command/Reload.java
index 098af6f..767d2c5 100644
--- a/src/main/java/dev/tylerm/khs/command/Reload.java
+++ b/src/main/java/cat/freya/khs/command/Reload.java
@@ -1,17 +1,17 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.*;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.*;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Config.messagePrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Config.messagePrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Reload implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Send.java b/src/main/java/cat/freya/khs/command/Send.java
index 6c8d449..1f110b8 100644
--- a/src/main/java/dev/tylerm/khs/command/Send.java
+++ b/src/main/java/cat/freya/khs/command/Send.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/SetExitLocation.java b/src/main/java/cat/freya/khs/command/SetExitLocation.java
index 9849f81..637088b 100644
--- a/src/main/java/dev/tylerm/khs/command/SetExitLocation.java
+++ b/src/main/java/cat/freya/khs/command/SetExitLocation.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.command.location.LocationUtils;
-import dev.tylerm.khs.command.location.Locations;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.command.location.LocationUtils;
+import cat.freya.khs.command.location.Locations;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.util.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/Start.java b/src/main/java/cat/freya/khs/command/Start.java
index 0a75855..e28a6cc 100644
--- a/src/main/java/dev/tylerm/khs/command/Start.java
+++ b/src/main/java/cat/freya/khs/command/Start.java
@@ -1,8 +1,8 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -11,8 +11,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static dev.tylerm.khs.configuration.Config.*;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Start implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Stop.java b/src/main/java/cat/freya/khs/command/Stop.java
index 557e147..c272c7b 100644
--- a/src/main/java/dev/tylerm/khs/command/Stop.java
+++ b/src/main/java/cat/freya/khs/command/Stop.java
@@ -1,16 +1,16 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.abortPrefix;
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.abortPrefix;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Stop implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Top.java b/src/main/java/cat/freya/khs/command/Top.java
index 27a438c..cf2aeaa 100644
--- a/src/main/java/dev/tylerm/khs/command/Top.java
+++ b/src/main/java/cat/freya/khs/command/Top.java
@@ -1,8 +1,8 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.database.util.PlayerInfo;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.database.util.PlayerInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -10,8 +10,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collections;
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Top implements ICommand {
 
diff --git a/src/main/java/dev/tylerm/khs/command/Wins.java b/src/main/java/cat/freya/khs/command/Wins.java
index 2a7f046..09e92d1 100644
--- a/src/main/java/dev/tylerm/khs/command/Wins.java
+++ b/src/main/java/cat/freya/khs/command/Wins.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command;
+package cat.freya.khs.command;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.database.util.PlayerInfo;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.database.util.PlayerInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/location/LocationUtils.java b/src/main/java/cat/freya/khs/command/location/LocationUtils.java
index 8c8e3f7..c914944 100644
--- a/src/main/java/dev/tylerm/khs/command/location/LocationUtils.java
+++ b/src/main/java/cat/freya/khs/command/location/LocationUtils.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.location;
+package cat.freya.khs.command.location;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/location/Locations.java b/src/main/java/cat/freya/khs/command/location/Locations.java
index c3d505c..f40419f 100644
--- a/src/main/java/dev/tylerm/khs/command/location/Locations.java
+++ b/src/main/java/cat/freya/khs/command/location/Locations.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.command.location;
+package cat.freya.khs.command.location;
 
 /**
  * @author bobby29831
diff --git a/src/main/java/dev/tylerm/khs/command/map/Add.java b/src/main/java/cat/freya/khs/command/map/Add.java
index 761db0f..ddbc384 100644
--- a/src/main/java/dev/tylerm/khs/command/map/Add.java
+++ b/src/main/java/cat/freya/khs/command/map/Add.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/Debug.java b/src/main/java/cat/freya/khs/command/map/Debug.java
index 07f4e69..b6a6515 100644
--- a/src/main/java/dev/tylerm/khs/command/map/Debug.java
+++ b/src/main/java/cat/freya/khs/command/map/Debug.java
@@ -1,13 +1,13 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
 import com.cryptomorin.xseries.XMaterial;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.PlayerLoader;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.PlayerLoader;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ public class Debug implements ICommand {
     private static final Map<Player, Map<Integer, Consumer<Player>>> debugMenuFunctions = new HashMap<>();
 
     public void execute(Player sender, String[] args) {
-        dev.tylerm.khs.configuration.Map map = Maps.getMap(args[0]);
+        cat.freya.khs.configuration.Map map = Maps.getMap(args[0]);
         if(map == null) {
             sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
@@ -36,7 +36,7 @@ public class Debug implements ICommand {
         sender.openInventory(debugMenu);
     }
 
-    private Inventory createMenu(dev.tylerm.khs.configuration.Map map, Player sender){
+    private Inventory createMenu(cat.freya.khs.configuration.Map map, Player sender){
         Map<Integer, Consumer<Player>> functions = new HashMap<>();
         Inventory debugMenu = Main.getInstance().getServer().createInventory(null, 9, "Debug Menu");
         debugMenu.setItem(0, createOption(functions, 0, XMaterial.LEATHER_CHESTPLATE.parseMaterial(), "&6Become a &lHider", 1, player -> {
@@ -45,7 +45,7 @@ public class Debug implements ICommand {
             }
             Main.getInstance().getBoard().addHider(player);
             PlayerLoader.loadHider(player, map);
-            if(Main.getInstance().getGame().getStatus() != dev.tylerm.khs.game.util.Status.STARTING)
+            if(Main.getInstance().getGame().getStatus() != cat.freya.khs.game.util.Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(1, createOption(functions, 1, XMaterial.GOLDEN_CHESTPLATE.parseMaterial(), "&cBecome a &lSeeker", 1, player -> {
@@ -54,7 +54,7 @@ public class Debug implements ICommand {
             }
             Main.getInstance().getBoard().addSeeker(player);
             PlayerLoader.loadSeeker(player, map);
-            if(Main.getInstance().getGame().getStatus() != dev.tylerm.khs.game.util.Status.STARTING)
+            if(Main.getInstance().getGame().getStatus() != cat.freya.khs.game.util.Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(2, createOption(functions, 2, XMaterial.IRON_CHESTPLATE.parseMaterial(), "&8Become a &lSpectator", 1, player -> {
@@ -114,7 +114,7 @@ public class Debug implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(dev.tylerm.khs.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(cat.freya.khs.configuration.Map::getName).collect(Collectors.toList());
         }
         return null;
     }
diff --git a/src/main/java/dev/tylerm/khs/command/map/GoTo.java b/src/main/java/cat/freya/khs/command/map/GoTo.java
index 5cce5a6..d27153e 100644
--- a/src/main/java/dev/tylerm/khs/command/map/GoTo.java
+++ b/src/main/java/cat/freya/khs/command/map/GoTo.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/List.java b/src/main/java/cat/freya/khs/command/map/List.java
index 987138d..1f9833a 100644
--- a/src/main/java/dev/tylerm/khs/command/map/List.java
+++ b/src/main/java/cat/freya/khs/command/map/List.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/Remove.java b/src/main/java/cat/freya/khs/command/map/Remove.java
index b5231a5..7a0cd3f 100644
--- a/src/main/java/dev/tylerm/khs/command/map/Remove.java
+++ b/src/main/java/cat/freya/khs/command/map/Remove.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/Save.java b/src/main/java/cat/freya/khs/command/map/Save.java
index 86871d4..7d3a3c0 100644
--- a/src/main/java/dev/tylerm/khs/command/map/Save.java
+++ b/src/main/java/cat/freya/khs/command/map/Save.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
diff --git a/src/main/java/dev/tylerm/khs/command/map/Status.java b/src/main/java/cat/freya/khs/command/map/Status.java
index 869fc26..e62e10d 100644
--- a/src/main/java/dev/tylerm/khs/command/map/Status.java
+++ b/src/main/java/cat/freya/khs/command/map/Status.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.map;
+package cat.freya.khs.command.map;
 
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/blockhunt/Enabled.java b/src/main/java/cat/freya/khs/command/map/blockhunt/Enabled.java
index 1d49473..b97e74b 100644
--- a/src/main/java/dev/tylerm/khs/command/map/blockhunt/Enabled.java
+++ b/src/main/java/cat/freya/khs/command/map/blockhunt/Enabled.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map.blockhunt;
+package cat.freya.khs.command.map.blockhunt;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Add.java b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/Add.java
index 4232bb5..052602c 100644
--- a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Add.java
+++ b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/Add.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map.blockhunt.blocks;
+package cat.freya.khs.command.map.blockhunt.blocks;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/List.java b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/List.java
index 9ba90fa..96d381c 100644
--- a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/List.java
+++ b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/List.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.map.blockhunt.blocks;
+package cat.freya.khs.command.map.blockhunt.blocks;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Remove.java b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/Remove.java
index 38ab4a3..020d8ca 100644
--- a/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Remove.java
+++ b/src/main/java/cat/freya/khs/command/map/blockhunt/blocks/Remove.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map.blockhunt.blocks;
+package cat.freya.khs.command.map.blockhunt.blocks;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/Border.java b/src/main/java/cat/freya/khs/command/map/set/Border.java
index 7ef3bf9..c40b742 100644
--- a/src/main/java/dev/tylerm/khs/command/map/set/Border.java
+++ b/src/main/java/cat/freya/khs/command/map/set/Border.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map.set;
+package cat.freya.khs.command.map.set;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/Bounds.java b/src/main/java/cat/freya/khs/command/map/set/Bounds.java
index 5fde50e..82adcf1 100644
--- a/src/main/java/dev/tylerm/khs/command/map/set/Bounds.java
+++ b/src/main/java/cat/freya/khs/command/map/set/Bounds.java
@@ -1,13 +1,13 @@
-package dev.tylerm.khs.command.map.set;
+package cat.freya.khs.command.map.set;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
+import cat.freya.khs.util.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/Lobby.java b/src/main/java/cat/freya/khs/command/map/set/Lobby.java
index a1c8036..847211c 100644
--- a/src/main/java/dev/tylerm/khs/command/map/set/Lobby.java
+++ b/src/main/java/cat/freya/khs/command/map/set/Lobby.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.map.set;
+package cat.freya.khs.command.map.set;
 
-import dev.tylerm.khs.command.location.LocationUtils;
-import dev.tylerm.khs.command.location.Locations;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.command.location.LocationUtils;
+import cat.freya.khs.command.location.Locations;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.util.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/SeekerLobby.java b/src/main/java/cat/freya/khs/command/map/set/SeekerLobby.java
index 7187ac9..4aebb51 100644
--- a/src/main/java/dev/tylerm/khs/command/map/set/SeekerLobby.java
+++ b/src/main/java/cat/freya/khs/command/map/set/SeekerLobby.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.map.set;
+package cat.freya.khs.command.map.set;
 
-import dev.tylerm.khs.command.location.LocationUtils;
-import dev.tylerm.khs.command.location.Locations;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.*;
-import dev.tylerm.khs.util.Location;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.command.location.LocationUtils;
+import cat.freya.khs.command.location.Locations;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.*;
+import cat.freya.khs.util.Location;
+import cat.freya.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/Spawn.java b/src/main/java/cat/freya/khs/command/map/set/Spawn.java
index 6541fac..44f4d13 100644
--- a/src/main/java/dev/tylerm/khs/command/map/set/Spawn.java
+++ b/src/main/java/cat/freya/khs/command/map/set/Spawn.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.map.set;
+package cat.freya.khs.command.map.set;
 
-import dev.tylerm.khs.command.location.LocationUtils;
-import dev.tylerm.khs.command.location.Locations;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.*;
-import dev.tylerm.khs.util.Location;
-import dev.tylerm.khs.configuration.Maps;
+import cat.freya.khs.command.location.LocationUtils;
+import cat.freya.khs.command.location.Locations;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.*;
+import cat.freya.khs.util.Location;
+import cat.freya.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/map/unset/Border.java b/src/main/java/cat/freya/khs/command/map/unset/Border.java
index f26b0e1..078ad17 100644
--- a/src/main/java/dev/tylerm/khs/command/map/unset/Border.java
+++ b/src/main/java/cat/freya/khs/command/map/unset/Border.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.command.map.unset;
+package cat.freya.khs.command.map.unset;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/tylerm/khs/command/util/CommandGroup.java b/src/main/java/cat/freya/khs/command/util/CommandGroup.java
index 444922c..ab5ca43 100644
--- a/src/main/java/dev/tylerm/khs/command/util/CommandGroup.java
+++ b/src/main/java/cat/freya/khs/command/util/CommandGroup.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.util;
+package cat.freya.khs.command.util;
 
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.util.Pair;
-import dev.tylerm.khs.util.Tuple;
-import dev.tylerm.khs.command.map.Save;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.util.Pair;
+import cat.freya.khs.util.Tuple;
+import cat.freya.khs.command.map.Save;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/dev/tylerm/khs/command/util/ICommand.java b/src/main/java/cat/freya/khs/command/util/ICommand.java
index 615f165..99f3e20 100644
--- a/src/main/java/dev/tylerm/khs/command/util/ICommand.java
+++ b/src/main/java/cat/freya/khs/command/util/ICommand.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.command.util;
+package cat.freya.khs.command.util;
 
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/command/world/Create.java b/src/main/java/cat/freya/khs/command/world/Create.java
index a3fecdc..8b429b3 100644
--- a/src/main/java/dev/tylerm/khs/command/world/Create.java
+++ b/src/main/java/cat/freya/khs/command/world/Create.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.world;
+package cat.freya.khs.command.world;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.util.Location;
-import dev.tylerm.khs.command.util.ICommand;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.util.Location;
+import cat.freya.khs.command.util.ICommand;
 import org.bukkit.World;
 import org.bukkit.WorldType;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/dev/tylerm/khs/command/world/Delete.java b/src/main/java/cat/freya/khs/command/world/Delete.java
index aef200e..629eef4 100644
--- a/src/main/java/dev/tylerm/khs/command/world/Delete.java
+++ b/src/main/java/cat/freya/khs/command/world/Delete.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.command.world;
+package cat.freya.khs.command.world;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.Confirm;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.world.WorldLoader;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.Confirm;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.world.WorldLoader;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/dev/tylerm/khs/command/world/List.java b/src/main/java/cat/freya/khs/command/world/List.java
index e907138..a65930e 100644
--- a/src/main/java/dev/tylerm/khs/command/world/List.java
+++ b/src/main/java/cat/freya/khs/command/world/List.java
@@ -1,9 +1,9 @@
-package dev.tylerm.khs.command.world;
+package cat.freya.khs.command.world;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.command.util.ICommand;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.command.util.ICommand;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
diff --git a/src/main/java/dev/tylerm/khs/command/world/Tp.java b/src/main/java/cat/freya/khs/command/world/Tp.java
index a2ada0a..ff6190a 100644
--- a/src/main/java/dev/tylerm/khs/command/world/Tp.java
+++ b/src/main/java/cat/freya/khs/command/world/Tp.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.command.world;
+package cat.freya.khs.command.world;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.util.ICommand;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.configuration.Localization;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.Main;
+import cat.freya.khs.command.util.ICommand;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.configuration.Localization;
+import cat.freya.khs.util.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;