91 files changed, 463 insertions, 463 deletions

diff --git a/pom.xml b/pom.xml
index a157781..5471d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
-    <groupId>dev.tylerm</groupId>
+    <groupId>cat.freya</groupId>
     <artifactId>KenshinsHideAndSeek</artifactId>
     <version>1.7.6</version>
     <name>Hide and Seek Plugin</name>
@@ -27,11 +27,11 @@
                             <relocations>
                                 <relocation>
                                     <pattern>com.cryptomorin.xseries</pattern>
-                                    <shadedPattern>dev.tylerm.depend.xseries</shadedPattern>
+                                    <shadedPattern>cat.freya.depend.xseries</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.zaxxer.hikari</pattern>
-                                    <shadedPattern>dev.tylerm.depend.hikari</shadedPattern>
+                                    <shadedPattern>cat.freya.depend.hikari</shadedPattern>
                                 </relocation>
                             </relocations>
                             <artifactSet>
diff --git a/src/main/java/dev/tylerm/khs/Main.java b/src/main/java/cat/freya/khs/Main.java
index bb69c99..d1dfa63 100644
--- a/src/main/java/dev/tylerm/khs/Main.java
+++ b/src/main/java/cat/freya/khs/Main.java
@@ -1,24 +1,24 @@
-package dev.tylerm.khs;
+package cat.freya.khs;
 
-import dev.tylerm.khs.command.*;
-import dev.tylerm.khs.command.map.Debug;
-import dev.tylerm.khs.command.map.GoTo;
-import dev.tylerm.khs.command.map.Save;
-import dev.tylerm.khs.command.map.blockhunt.blocks.Add;
-import dev.tylerm.khs.command.map.blockhunt.blocks.List;
-import dev.tylerm.khs.command.map.blockhunt.blocks.Remove;
-import dev.tylerm.khs.command.map.set.*;
-import dev.tylerm.khs.configuration.*;
-import dev.tylerm.khs.game.*;
-import dev.tylerm.khs.game.listener.*;
-import dev.tylerm.khs.game.util.Status;
-import dev.tylerm.khs.util.PAPIExpansion;
-import dev.tylerm.khs.command.map.blockhunt.Enabled;
-import dev.tylerm.khs.command.world.Create;
-import dev.tylerm.khs.command.world.Delete;
-import dev.tylerm.khs.command.world.Tp;
-import dev.tylerm.khs.database.Database;
-import dev.tylerm.khs.command.util.CommandGroup;
+import cat.freya.khs.command.*;
+import cat.freya.khs.command.map.Debug;
+import cat.freya.khs.command.map.GoTo;
+import cat.freya.khs.command.map.Save;
+import cat.freya.khs.command.map.blockhunt.blocks.Add;
+import cat.freya.khs.command.map.blockhunt.blocks.List;
+import cat.freya.khs.command.map.blockhunt.blocks.Remove;
+import cat.freya.khs.command.map.set.*;
+import cat.freya.khs.configuration.*;
+import cat.freya.khs.game.*;
+import cat.freya.khs.game.listener.*;
+import cat.freya.khs.game.util.Status;
+import cat.freya.khs.util.PAPIExpansion;
+import cat.freya.khs.command.map.blockhunt.Enabled;
+import cat.freya.khs.command.world.Create;
+import cat.freya.khs.command.world.Delete;
+import cat.freya.khs.command.world.Tp;
+import cat.freya.khs.database.Database;
+import cat.freya.khs.command.util.CommandGroup;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -33,8 +33,8 @@ import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-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 Main extends JavaPlugin implements Listener {
 	
@@ -114,12 +114,12 @@ public class Main extends JavaPlugin implements Listener {
 								new Bounds()
 						),
 						new CommandGroup("unset",
-								new dev.tylerm.khs.command.map.unset.Border()
+								new cat.freya.khs.command.map.unset.Border()
 						),
-						new dev.tylerm.khs.command.map.Add(),
-						new dev.tylerm.khs.command.map.Remove(),
-						new dev.tylerm.khs.command.map.List(),
-						new dev.tylerm.khs.command.map.Status(),
+						new cat.freya.khs.command.map.Add(),
+						new cat.freya.khs.command.map.Remove(),
+						new cat.freya.khs.command.map.List(),
+						new cat.freya.khs.command.map.Status(),
 						new Save(),
 						new Debug(),
 						new GoTo()
@@ -127,7 +127,7 @@ public class Main extends JavaPlugin implements Listener {
 				new CommandGroup("world",
 					new Create(),
 					new Delete(),
-					new dev.tylerm.khs.command.world.List(),
+					new cat.freya.khs.command.world.List(),
 					new Tp()
 				),
 				new SetExitLocation(),
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;
diff --git a/src/main/java/dev/tylerm/khs/configuration/Config.java b/src/main/java/cat/freya/khs/configuration/Config.java
index 36d74d8..ac5fcb7 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Config.java
+++ b/src/main/java/cat/freya/khs/configuration/Config.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import com.cryptomorin.xseries.XItemStack;
 import com.cryptomorin.xseries.XMaterial;
 import com.cryptomorin.xseries.XSound;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.util.CountdownDisplay;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.util.CountdownDisplay;
+import cat.freya.khs.util.Location;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java b/src/main/java/cat/freya/khs/configuration/ConfigManager.java
index 3a81cb8..16396d0 100644
--- a/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java
+++ b/src/main/java/cat/freya/khs/configuration/ConfigManager.java
@@ -1,6 +1,6 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/dev/tylerm/khs/configuration/Items.java b/src/main/java/cat/freya/khs/configuration/Items.java
index af8216d..bdc56ad 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Items.java
+++ b/src/main/java/cat/freya/khs/configuration/Items.java
@@ -1,7 +1,7 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import com.cryptomorin.xseries.XItemStack;
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java b/src/main/java/cat/freya/khs/configuration/Leaderboard.java
index 93ba855..96e0bf4 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java
+++ b/src/main/java/cat/freya/khs/configuration/Leaderboard.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/dev/tylerm/khs/configuration/Localization.java b/src/main/java/cat/freya/khs/configuration/Localization.java
index 2ac84e7..8b18696 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Localization.java
+++ b/src/main/java/cat/freya/khs/configuration/Localization.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import net.md_5.bungee.api.ChatColor;
 
diff --git a/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java b/src/main/java/cat/freya/khs/configuration/LocalizationString.java
index 5dc3724..b3b80d2 100644
--- a/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java
+++ b/src/main/java/cat/freya/khs/configuration/LocalizationString.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import org.bukkit.entity.Entity;
 
diff --git a/src/main/java/dev/tylerm/khs/configuration/Map.java b/src/main/java/cat/freya/khs/configuration/Map.java
index 7d3ef9f..cbb6d66 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Map.java
+++ b/src/main/java/cat/freya/khs/configuration/Map.java
@@ -1,26 +1,26 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.events.Border;
-import dev.tylerm.khs.util.Location;
-import dev.tylerm.khs.world.WorldLoader;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.events.Border;
+import cat.freya.khs.util.Location;
+import cat.freya.khs.world.WorldLoader;
 import org.bukkit.*;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import static dev.tylerm.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Config.*;
 
 public class Map {
 
     private final String name;
 
-    private dev.tylerm.khs.util.Location
-        spawnPosition = dev.tylerm.khs.util.Location.getDefault(),
-        lobbyPosition = dev.tylerm.khs.util.Location.getDefault(),
-        seekerLobbyPosition = dev.tylerm.khs.util.Location.getDefault();
+    private cat.freya.khs.util.Location
+        spawnPosition = cat.freya.khs.util.Location.getDefault(),
+        lobbyPosition = cat.freya.khs.util.Location.getDefault(),
+        seekerLobbyPosition = cat.freya.khs.util.Location.getDefault();
 
     private int
         xBoundMin = 0,
@@ -51,15 +51,15 @@ public class Map {
         this.worldLoader = new WorldLoader(this);
     }
 
-    public void setSpawn(dev.tylerm.khs.util.Location pos) {
+    public void setSpawn(cat.freya.khs.util.Location pos) {
         this.spawnPosition = pos;
     }
 
-    public void setLobby(dev.tylerm.khs.util.Location pos) {
+    public void setLobby(cat.freya.khs.util.Location pos) {
         this.lobbyPosition = pos;
     }
 
-    public void setSeekerLobby(dev.tylerm.khs.util.Location pos) {
+    public void setSeekerLobby(cat.freya.khs.util.Location pos) {
         this.seekerLobbyPosition = pos;
     }
 
@@ -100,7 +100,7 @@ public class Map {
     }
 
     @NotNull
-    public dev.tylerm.khs.util.Location getGameSpawn() {
+    public cat.freya.khs.util.Location getGameSpawn() {
         if(mapSaveEnabled) {
             return spawnPosition.changeWorld("hs_"+name);
         } else {
@@ -117,7 +117,7 @@ public class Map {
     }
 
     @NotNull
-    public dev.tylerm.khs.util.Location getSpawn() {
+    public cat.freya.khs.util.Location getSpawn() {
         return spawnPosition;
     }
 
@@ -127,7 +127,7 @@ public class Map {
     }
 
     @NotNull
-    public dev.tylerm.khs.util.Location getLobby() {
+    public cat.freya.khs.util.Location getLobby() {
         return lobbyPosition;
     }
 
@@ -137,7 +137,7 @@ public class Map {
     }
 
     @NotNull
-    public dev.tylerm.khs.util.Location getSeekerLobby() {
+    public cat.freya.khs.util.Location getSeekerLobby() {
         return seekerLobbyPosition;
     }
 
diff --git a/src/main/java/dev/tylerm/khs/configuration/Maps.java b/src/main/java/cat/freya/khs/configuration/Maps.java
index 54c6d5b..eeca3ba 100644
--- a/src/main/java/dev/tylerm/khs/configuration/Maps.java
+++ b/src/main/java/cat/freya/khs/configuration/Maps.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.configuration;
+package cat.freya.khs.configuration;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.util.Location;
+import cat.freya.khs.Main;
+import cat.freya.khs.util.Location;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/dev/tylerm/khs/database/Database.java b/src/main/java/cat/freya/khs/database/Database.java
index 42c4798..1b9479e 100644
--- a/src/main/java/dev/tylerm/khs/database/Database.java
+++ b/src/main/java/cat/freya/khs/database/Database.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.database;
+package cat.freya.khs.database;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -11,11 +11,11 @@ import java.util.UUID;
 
 import com.google.common.io.ByteStreams;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Config;
-import dev.tylerm.khs.database.connections.DatabaseConnection;
-import dev.tylerm.khs.database.connections.MySQLConnection;
-import dev.tylerm.khs.database.connections.SQLiteConnection;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Config;
+import cat.freya.khs.database.connections.DatabaseConnection;
+import cat.freya.khs.database.connections.MySQLConnection;
+import cat.freya.khs.database.connections.SQLiteConnection;
 
 public class Database {
 
diff --git a/src/main/java/dev/tylerm/khs/database/GameDataTable.java b/src/main/java/cat/freya/khs/database/GameDataTable.java
index ed54baa..4e79206 100644
--- a/src/main/java/dev/tylerm/khs/database/GameDataTable.java
+++ b/src/main/java/cat/freya/khs/database/GameDataTable.java
@@ -17,12 +17,12 @@
  *
  */
 
-package dev.tylerm.khs.database;
+package cat.freya.khs.database;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.database.util.PlayerInfo;
-import dev.tylerm.khs.game.Board;
-import dev.tylerm.khs.game.util.WinType;
+import cat.freya.khs.Main;
+import cat.freya.khs.database.util.PlayerInfo;
+import cat.freya.khs.game.Board;
+import cat.freya.khs.game.util.WinType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/dev/tylerm/khs/database/InventoryTable.java b/src/main/java/cat/freya/khs/database/InventoryTable.java
index 3fc62fb..4da3e90 100644
--- a/src/main/java/dev/tylerm/khs/database/InventoryTable.java
+++ b/src/main/java/cat/freya/khs/database/InventoryTable.java
@@ -1,6 +1,6 @@
-package dev.tylerm.khs.database;
+package cat.freya.khs.database;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.io.BukkitObjectInputStream;
 import org.bukkit.util.io.BukkitObjectOutputStream;
diff --git a/src/main/java/dev/tylerm/khs/database/LegacyTable.java b/src/main/java/cat/freya/khs/database/LegacyTable.java
index 7bf079c..f27e87f 100644
--- a/src/main/java/dev/tylerm/khs/database/LegacyTable.java
+++ b/src/main/java/cat/freya/khs/database/LegacyTable.java
@@ -17,9 +17,9 @@
  *
  */
 
-package dev.tylerm.khs.database;
+package cat.freya.khs.database;
 
-import dev.tylerm.khs.database.util.LegacyPlayerInfo;
+import cat.freya.khs.database.util.LegacyPlayerInfo;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/src/main/java/dev/tylerm/khs/database/NameDataTable.java b/src/main/java/cat/freya/khs/database/NameDataTable.java
index 1ce7143..37691fc 100644
--- a/src/main/java/dev/tylerm/khs/database/NameDataTable.java
+++ b/src/main/java/cat/freya/khs/database/NameDataTable.java
@@ -17,9 +17,9 @@
  *
  */
 
-package dev.tylerm.khs.database;
+package cat.freya.khs.database;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java b/src/main/java/cat/freya/khs/database/connections/DatabaseConnection.java
index 7dd8c01..0420ffa 100644
--- a/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java
+++ b/src/main/java/cat/freya/khs/database/connections/DatabaseConnection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package dev.tylerm.khs.database.connections;
+package cat.freya.khs.database.connections;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java b/src/main/java/cat/freya/khs/database/connections/MySQLConnection.java
index 0f7ce30..359f4b0 100644
--- a/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java
+++ b/src/main/java/cat/freya/khs/database/connections/MySQLConnection.java
@@ -17,12 +17,12 @@
  *
  */
 
-package dev.tylerm.khs.database.connections;
+package cat.freya.khs.database.connections;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Config;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Config;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java b/src/main/java/cat/freya/khs/database/connections/SQLiteConnection.java
index 70a31fd..eac3b2c 100644
--- a/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java
+++ b/src/main/java/cat/freya/khs/database/connections/SQLiteConnection.java
@@ -17,9 +17,9 @@
  *
  */
 
-package dev.tylerm.khs.database.connections;
+package cat.freya.khs.database.connections;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.sqlite.SQLiteConfig;
 
 import java.io.File;
diff --git a/src/main/java/dev/tylerm/khs/database/util/LegacyPlayerInfo.java b/src/main/java/cat/freya/khs/database/util/LegacyPlayerInfo.java
index bbf6e55..5288fa7 100644
--- a/src/main/java/dev/tylerm/khs/database/util/LegacyPlayerInfo.java
+++ b/src/main/java/cat/freya/khs/database/util/LegacyPlayerInfo.java
@@ -17,7 +17,7 @@
  *
  */
 
-package dev.tylerm.khs.database.util;
+package cat.freya.khs.database.util;
 
 public class LegacyPlayerInfo {
 
diff --git a/src/main/java/dev/tylerm/khs/database/util/PlayerInfo.java b/src/main/java/cat/freya/khs/database/util/PlayerInfo.java
index 555a954..964cd8e 100644
--- a/src/main/java/dev/tylerm/khs/database/util/PlayerInfo.java
+++ b/src/main/java/cat/freya/khs/database/util/PlayerInfo.java
@@ -17,7 +17,7 @@
  *
  */
 
-package dev.tylerm.khs.database.util;
+package cat.freya.khs.database.util;
 
 import java.util.UUID;
 
diff --git a/src/main/java/dev/tylerm/khs/game/Board.java b/src/main/java/cat/freya/khs/game/Board.java
index c02174b..e8e378d 100644
--- a/src/main/java/dev/tylerm/khs/game/Board.java
+++ b/src/main/java/cat/freya/khs/game/Board.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.game;
+package cat.freya.khs.game;
 
-import dev.tylerm.khs.game.events.Border;
-import dev.tylerm.khs.game.events.Glow;
-import dev.tylerm.khs.game.events.Taunt;
-import dev.tylerm.khs.game.util.Status;
-import dev.tylerm.khs.Main;
+import cat.freya.khs.game.events.Border;
+import cat.freya.khs.game.events.Glow;
+import cat.freya.khs.game.events.Taunt;
+import cat.freya.khs.game.util.Status;
+import cat.freya.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -13,9 +13,9 @@ import org.bukkit.scoreboard.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static dev.tylerm.khs.configuration.Config.*;
-import static dev.tylerm.khs.configuration.Leaderboard.*;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Leaderboard.*;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Board {
 
@@ -230,7 +230,7 @@ public class Board {
     }
 
     public String getMapName() {
-        dev.tylerm.khs.configuration.Map map = Main.getInstance().getGame().getCurrentMap();
+        cat.freya.khs.configuration.Map map = Main.getInstance().getGame().getCurrentMap();
         if(map == null) return "Invalid";
         else return map.getName();
     }
diff --git a/src/main/java/dev/tylerm/khs/game/Disguiser.java b/src/main/java/cat/freya/khs/game/Disguiser.java
index 68166a3..4ec4e15 100644
--- a/src/main/java/dev/tylerm/khs/game/Disguiser.java
+++ b/src/main/java/cat/freya/khs/game/Disguiser.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.game;
+package cat.freya.khs.game;
 
-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;
 
-import dev.tylerm.khs.game.util.Disguise;
-import dev.tylerm.khs.configuration.Map;
+import cat.freya.khs.game.util.Disguise;
+import cat.freya.khs.configuration.Map;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/dev/tylerm/khs/game/EntityHider.java b/src/main/java/cat/freya/khs/game/EntityHider.java
index dc4e02f..6224f17 100644
--- a/src/main/java/dev/tylerm/khs/game/EntityHider.java
+++ b/src/main/java/cat/freya/khs/game/EntityHider.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.game;
+package cat.freya.khs.game;
 
 import static com.comphenix.protocol.PacketType.Play.Server.*;
 
diff --git a/src/main/java/dev/tylerm/khs/game/Game.java b/src/main/java/cat/freya/khs/game/Game.java
index 3de09ef..69e9b82 100644
--- a/src/main/java/dev/tylerm/khs/game/Game.java
+++ b/src/main/java/cat/freya/khs/game/Game.java
@@ -17,21 +17,21 @@
  *
  */
 
-package dev.tylerm.khs.game;
+package cat.freya.khs.game;
 
 import com.cryptomorin.xseries.messages.ActionBar;
 import com.cryptomorin.xseries.messages.Titles;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import dev.tylerm.khs.game.events.Glow;
-import dev.tylerm.khs.game.events.Taunt;
-import dev.tylerm.khs.game.listener.RespawnHandler;
-import dev.tylerm.khs.game.util.CountdownDisplay;
-import dev.tylerm.khs.game.util.Status;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Map;
-import dev.tylerm.khs.configuration.Maps;
-import dev.tylerm.khs.game.util.WinType;
+import cat.freya.khs.game.events.Glow;
+import cat.freya.khs.game.events.Taunt;
+import cat.freya.khs.game.listener.RespawnHandler;
+import cat.freya.khs.game.util.CountdownDisplay;
+import cat.freya.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Map;
+import cat.freya.khs.configuration.Maps;
+import cat.freya.khs.game.util.WinType;
 import org.bukkit.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -40,8 +40,8 @@ import org.bukkit.inventory.ItemStack;
 import java.util.*;
 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 Game {
 
diff --git a/src/main/java/dev/tylerm/khs/game/PlayerLoader.java b/src/main/java/cat/freya/khs/game/PlayerLoader.java
index 2387388..cb606a1 100644
--- a/src/main/java/dev/tylerm/khs/game/PlayerLoader.java
+++ b/src/main/java/cat/freya/khs/game/PlayerLoader.java
@@ -17,13 +17,13 @@
  *
  */
 
-package dev.tylerm.khs.game;
+package cat.freya.khs.game;
 
 import com.cryptomorin.xseries.messages.Titles;
 import net.md_5.bungee.api.ChatColor;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Items;
-import dev.tylerm.khs.configuration.Map;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Items;
+import cat.freya.khs.configuration.Map;
 import org.bukkit.GameMode;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
@@ -33,10 +33,10 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import static dev.tylerm.khs.configuration.Config.*;
-import static dev.tylerm.khs.configuration.Items.HIDER_ITEMS;
-import static dev.tylerm.khs.configuration.Items.SEEKER_ITEMS;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Items.HIDER_ITEMS;
+import static cat.freya.khs.configuration.Items.SEEKER_ITEMS;
+import static cat.freya.khs.configuration.Localization.message;
 
 @SuppressWarnings("deprecation")
 public class PlayerLoader {
diff --git a/src/main/java/dev/tylerm/khs/game/events/Border.java b/src/main/java/cat/freya/khs/game/events/Border.java
index adcb5ce..87f9845 100644
--- a/src/main/java/dev/tylerm/khs/game/events/Border.java
+++ b/src/main/java/cat/freya/khs/game/events/Border.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.game.events;
+package cat.freya.khs.game.events;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Map;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Map;
 
-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 Border {
 
diff --git a/src/main/java/dev/tylerm/khs/game/events/Glow.java b/src/main/java/cat/freya/khs/game/events/Glow.java
index 6015f26..8680b61 100644
--- a/src/main/java/dev/tylerm/khs/game/events/Glow.java
+++ b/src/main/java/cat/freya/khs/game/events/Glow.java
@@ -1,12 +1,12 @@
-package dev.tylerm.khs.game.events;
+package cat.freya.khs.game.events;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
-import dev.tylerm.khs.util.packet.EntityMetadataPacket;
-import dev.tylerm.khs.Main;
+import cat.freya.khs.util.packet.EntityMetadataPacket;
+import cat.freya.khs.Main;
 import org.bukkit.entity.Player;
 
-import static dev.tylerm.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Config.*;
 
 public class Glow {
 
diff --git a/src/main/java/dev/tylerm/khs/game/events/Taunt.java b/src/main/java/cat/freya/khs/game/events/Taunt.java
index 98a9351..931c802 100644
--- a/src/main/java/dev/tylerm/khs/game/events/Taunt.java
+++ b/src/main/java/cat/freya/khs/game/events/Taunt.java
@@ -1,6 +1,6 @@
-package dev.tylerm.khs.game.events;
+package cat.freya.khs.game.events;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.Color;
 import org.bukkit.FireworkEffect;
 import org.bukkit.World;
@@ -13,9 +13,9 @@ import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
 
-import static dev.tylerm.khs.configuration.Config.*;
-import static dev.tylerm.khs.configuration.Config.tauntDelay;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Config.tauntDelay;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class Taunt {
 
diff --git a/src/main/java/dev/tylerm/khs/game/listener/BlockedCommandHandler.java b/src/main/java/cat/freya/khs/game/listener/BlockedCommandHandler.java
index f99c678..dac75b0 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/BlockedCommandHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/BlockedCommandHandler.java
@@ -1,16 +1,16 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
-import static dev.tylerm.khs.configuration.Config.blockedCommands;
-import static dev.tylerm.khs.configuration.Config.errorPrefix;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.blockedCommands;
+import static cat.freya.khs.configuration.Config.errorPrefix;
+import static cat.freya.khs.configuration.Localization.message;
 
 public class BlockedCommandHandler implements Listener {
 
diff --git a/src/main/java/dev/tylerm/khs/game/listener/ChatHandler.java b/src/main/java/cat/freya/khs/game/listener/ChatHandler.java
index e387a92..3ff8539 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/ChatHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/ChatHandler.java
@@ -1,6 +1,6 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/DamageHandler.java b/src/main/java/cat/freya/khs/game/listener/DamageHandler.java
index 7111d7b..898f021 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/DamageHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/DamageHandler.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
 import com.cryptomorin.xseries.XSound;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.Board;
-import dev.tylerm.khs.game.Game;
-import dev.tylerm.khs.game.PlayerLoader;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.Board;
+import cat.freya.khs.game.Game;
+import cat.freya.khs.game.PlayerLoader;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -16,8 +16,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 
-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 DamageHandler implements Listener {
 
diff --git a/src/main/java/dev/tylerm/khs/game/listener/DisguiseHandler.java b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java
index a09aded..d874ae9 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/DisguiseHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
 import static com.comphenix.protocol.PacketType.Play.Client.*;
 
@@ -8,8 +8,8 @@ import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.EnumWrappers;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.util.Disguise;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.util.Disguise;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.attribute.Attribute;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/InteractHandler.java b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java
index 806b90b..09ab62b 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/InteractHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
 import com.cryptomorin.xseries.XMaterial;
 import com.cryptomorin.xseries.messages.ActionBar;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.Board;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.Board;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -20,9 +20,9 @@ import org.bukkit.inventory.meta.SkullMeta;
 import java.util.ArrayList;
 import java.util.List;
 
-import static dev.tylerm.khs.configuration.Config.*;
-import static dev.tylerm.khs.configuration.Config.glowPowerupItem;
-import static dev.tylerm.khs.configuration.Localization.message;
+import static cat.freya.khs.configuration.Config.*;
+import static cat.freya.khs.configuration.Config.glowPowerupItem;
+import static cat.freya.khs.configuration.Localization.message;
 
 @SuppressWarnings("deprecation")
 public class InteractHandler implements Listener {
diff --git a/src/main/java/dev/tylerm/khs/game/listener/InventoryHandler.java b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java
index bb87a50..ccf292d 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/InventoryHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java
@@ -17,14 +17,14 @@
  *
  */
 
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
 import com.cryptomorin.xseries.XMaterial;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.command.map.Debug;
-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.map.Debug;
+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.bukkit.event.EventHandler;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/JoinLeaveHandler.java b/src/main/java/cat/freya/khs/game/listener/JoinLeaveHandler.java
index 2a4d9cc..ba83fa4 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/JoinLeaveHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/JoinLeaveHandler.java
@@ -1,9 +1,9 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Items;
-import dev.tylerm.khs.game.PlayerLoader;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Items;
+import cat.freya.khs.game.PlayerLoader;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
-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 JoinLeaveHandler implements Listener {
 
diff --git a/src/main/java/dev/tylerm/khs/game/listener/MovementHandler.java b/src/main/java/cat/freya/khs/game/listener/MovementHandler.java
index 7d4be5b..b6007a8 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/MovementHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/MovementHandler.java
@@ -1,9 +1,9 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
 import com.google.common.collect.Sets;
-import dev.tylerm.khs.game.listener.events.PlayerJumpEvent;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Map;
+import cat.freya.khs.game.listener.events.PlayerJumpEvent;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Map;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/PlayerHandler.java b/src/main/java/cat/freya/khs/game/listener/PlayerHandler.java
index c27400a..5c60536 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/PlayerHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/PlayerHandler.java
@@ -1,8 +1,8 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Items;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Items;
+import cat.freya.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -13,8 +13,8 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.inventory.ItemStack;
 
-import static dev.tylerm.khs.configuration.Config.dropItems;
-import static dev.tylerm.khs.configuration.Config.regenHealth;
+import static cat.freya.khs.configuration.Config.dropItems;
+import static cat.freya.khs.configuration.Config.regenHealth;
 
 public class PlayerHandler implements Listener {
 
diff --git a/src/main/java/dev/tylerm/khs/game/listener/RespawnHandler.java b/src/main/java/cat/freya/khs/game/listener/RespawnHandler.java
index 0932e4c..63aaab6 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/RespawnHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/RespawnHandler.java
@@ -1,6 +1,6 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/WorldInteractHandler.java b/src/main/java/cat/freya/khs/game/listener/WorldInteractHandler.java
index 97334b2..883d963 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/WorldInteractHandler.java
+++ b/src/main/java/cat/freya/khs/game/listener/WorldInteractHandler.java
@@ -1,7 +1,7 @@
-package dev.tylerm.khs.game.listener;
+package cat.freya.khs.game.listener;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.game.Board;
+import cat.freya.khs.Main;
+import cat.freya.khs.game.Board;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/dev/tylerm/khs/game/listener/events/PlayerJumpEvent.java b/src/main/java/cat/freya/khs/game/listener/events/PlayerJumpEvent.java
index 24c47b9..b3cd0ad 100644
--- a/src/main/java/dev/tylerm/khs/game/listener/events/PlayerJumpEvent.java
+++ b/src/main/java/cat/freya/khs/game/listener/events/PlayerJumpEvent.java
@@ -17,7 +17,7 @@
  *
  */
 
-package dev.tylerm.khs.game.listener.events;
+package cat.freya.khs.game.listener.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
diff --git a/src/main/java/dev/tylerm/khs/game/util/CountdownDisplay.java b/src/main/java/cat/freya/khs/game/util/CountdownDisplay.java
index 5292627..05548d4 100644
--- a/src/main/java/dev/tylerm/khs/game/util/CountdownDisplay.java
+++ b/src/main/java/cat/freya/khs/game/util/CountdownDisplay.java
@@ -17,7 +17,7 @@
  *
  */
 
-package dev.tylerm.khs.game.util;
+package cat.freya.khs.game.util;
 
 public enum CountdownDisplay {
     CHAT,
diff --git a/src/main/java/dev/tylerm/khs/game/util/Disguise.java b/src/main/java/cat/freya/khs/game/util/Disguise.java
index 1bc185e..56b1283 100644
--- a/src/main/java/dev/tylerm/khs/game/util/Disguise.java
+++ b/src/main/java/cat/freya/khs/game/util/Disguise.java
@@ -1,10 +1,10 @@
-package dev.tylerm.khs.game.util;
+package cat.freya.khs.game.util;
 
 import com.cryptomorin.xseries.XSound;
 import com.cryptomorin.xseries.messages.ActionBar;
-import dev.tylerm.khs.util.packet.BlockChangePacket;
-import dev.tylerm.khs.util.packet.EntityTeleportPacket;
-import dev.tylerm.khs.Main;
+import cat.freya.khs.util.packet.BlockChangePacket;
+import cat.freya.khs.util.packet.EntityTeleportPacket;
+import cat.freya.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/main/java/dev/tylerm/khs/game/util/Status.java b/src/main/java/cat/freya/khs/game/util/Status.java
index 70035af..c38b9ee 100644
--- a/src/main/java/dev/tylerm/khs/game/util/Status.java
+++ b/src/main/java/cat/freya/khs/game/util/Status.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.game.util;
+package cat.freya.khs.game.util;
 
 public enum Status {
 
diff --git a/src/main/java/dev/tylerm/khs/game/util/WinType.java b/src/main/java/cat/freya/khs/game/util/WinType.java
index ad8bfd7..38a6920 100644
--- a/src/main/java/dev/tylerm/khs/game/util/WinType.java
+++ b/src/main/java/cat/freya/khs/game/util/WinType.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.game.util;
+package cat.freya.khs.game.util;
 
 public enum WinType {
 
diff --git a/src/main/java/dev/tylerm/khs/util/Location.java b/src/main/java/cat/freya/khs/util/Location.java
index 658b3cc..f42e203 100644
--- a/src/main/java/dev/tylerm/khs/util/Location.java
+++ b/src/main/java/cat/freya/khs/util/Location.java
@@ -1,7 +1,7 @@
-package dev.tylerm.khs.util;
+package cat.freya.khs.util;
 
-import dev.tylerm.khs.world.VoidGenerator;
-import dev.tylerm.khs.Main;
+import cat.freya.khs.world.VoidGenerator;
+import cat.freya.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 
-import static dev.tylerm.khs.configuration.Config.spawnPatch;
+import static cat.freya.khs.configuration.Config.spawnPatch;
 
 public class Location {
 
diff --git a/src/main/java/dev/tylerm/khs/util/PAPIExpansion.java b/src/main/java/cat/freya/khs/util/PAPIExpansion.java
index 2cdd85a..a569c0f 100644
--- a/src/main/java/dev/tylerm/khs/util/PAPIExpansion.java
+++ b/src/main/java/cat/freya/khs/util/PAPIExpansion.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.util;
+package cat.freya.khs.util;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.database.Database;
-import dev.tylerm.khs.database.util.PlayerInfo;
-import dev.tylerm.khs.game.Board;
-import dev.tylerm.khs.game.util.Status;
+import cat.freya.khs.Main;
+import cat.freya.khs.database.Database;
+import cat.freya.khs.database.util.PlayerInfo;
+import cat.freya.khs.game.Board;
+import cat.freya.khs.game.util.Status;
 
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
@@ -14,8 +14,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Optional;
 import java.util.UUID;
 
-import static dev.tylerm.khs.configuration.Config.placeholderError;
-import static dev.tylerm.khs.configuration.Config.placeholderNoData;
+import static cat.freya.khs.configuration.Config.placeholderError;
+import static cat.freya.khs.configuration.Config.placeholderNoData;
 
 public class PAPIExpansion extends PlaceholderExpansion  {
 
diff --git a/src/main/java/dev/tylerm/khs/util/Pair.java b/src/main/java/cat/freya/khs/util/Pair.java
index a650e76..6baf9b9 100644
--- a/src/main/java/dev/tylerm/khs/util/Pair.java
+++ b/src/main/java/cat/freya/khs/util/Pair.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.util;
+package cat.freya.khs.util;
 
 public class Pair<L, R> {
 
diff --git a/src/main/java/dev/tylerm/khs/util/Tuple.java b/src/main/java/cat/freya/khs/util/Tuple.java
index 64ebda6..b3228e1 100644
--- a/src/main/java/dev/tylerm/khs/util/Tuple.java
+++ b/src/main/java/cat/freya/khs/util/Tuple.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.util;
+package cat.freya.khs.util;
 
 public class Tuple<L, C, R> {
 
diff --git a/src/main/java/dev/tylerm/khs/util/packet/AbstractPacket.java b/src/main/java/cat/freya/khs/util/packet/AbstractPacket.java
index e6113ac..cede0e1 100644
--- a/src/main/java/dev/tylerm/khs/util/packet/AbstractPacket.java
+++ b/src/main/java/cat/freya/khs/util/packet/AbstractPacket.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.util.packet;
+package cat.freya.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/src/main/java/dev/tylerm/khs/util/packet/BlockChangePacket.java b/src/main/java/cat/freya/khs/util/packet/BlockChangePacket.java
index 0603832..7b71b0d 100644
--- a/src/main/java/dev/tylerm/khs/util/packet/BlockChangePacket.java
+++ b/src/main/java/cat/freya/khs/util/packet/BlockChangePacket.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.util.packet;
+package cat.freya.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.wrappers.BlockPosition;
diff --git a/src/main/java/dev/tylerm/khs/util/packet/EntityMetadataPacket.java b/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java
index cf5d2a1..04f1ad5 100644
--- a/src/main/java/dev/tylerm/khs/util/packet/EntityMetadataPacket.java
+++ b/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java
@@ -1,11 +1,11 @@
-package dev.tylerm.khs.util.packet;
+package cat.freya.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.wrappers.WrappedDataValue;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 
-import dev.tylerm.khs.Main;
+import cat.freya.khs.Main;
 
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/tylerm/khs/util/packet/EntityTeleportPacket.java b/src/main/java/cat/freya/khs/util/packet/EntityTeleportPacket.java
index cd29e28..eec03d0 100644
--- a/src/main/java/dev/tylerm/khs/util/packet/EntityTeleportPacket.java
+++ b/src/main/java/cat/freya/khs/util/packet/EntityTeleportPacket.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.util.packet;
+package cat.freya.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/dev/tylerm/khs/world/VoidGenerator.java b/src/main/java/cat/freya/khs/world/VoidGenerator.java
index eb972e8..947fddb 100644
--- a/src/main/java/dev/tylerm/khs/world/VoidGenerator.java
+++ b/src/main/java/cat/freya/khs/world/VoidGenerator.java
@@ -1,4 +1,4 @@
-package dev.tylerm.khs.world;
+package cat.freya.khs.world;
 
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/dev/tylerm/khs/world/WorldLoader.java b/src/main/java/cat/freya/khs/world/WorldLoader.java
index 6f13548..8460365 100644
--- a/src/main/java/dev/tylerm/khs/world/WorldLoader.java
+++ b/src/main/java/cat/freya/khs/world/WorldLoader.java
@@ -1,7 +1,7 @@
-package dev.tylerm.khs.world;
+package cat.freya.khs.world;
 
-import dev.tylerm.khs.Main;
-import dev.tylerm.khs.configuration.Map;
+import cat.freya.khs.Main;
+import cat.freya.khs.configuration.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
 import org.bukkit.World;
@@ -10,8 +10,8 @@ import org.bukkit.WorldCreator;
 import java.io.*;
 import java.nio.file.Files;
 
-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 WorldLoader {
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2d510d6..6e6bd05 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: KenshinsHideAndSeek
-main: dev.tylerm.khs.Main
+main: cat.freya.khs.Main
 version: 1.7.6
 author: KenshinEto
 load: STARTUP