From f3088fca8c3a0fdfce52438cc75ae2e2486f1068 Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Wed, 17 May 2023 13:27:15 +0200
Subject: [PATCH] refactor: move package
---
.gitignore | 7 +----
pom.xml | 2 +-
.../atnrch}/nicko/NickoBukkit.java | 28 +++++++++----------
.../atnrch}/nicko/anvil/AnvilManager.java | 14 +++++-----
.../atnrch}/nicko/command/NickoCommand.java | 10 +++----
.../nicko/command/sub/NickoCheckSubCmd.java | 12 ++++----
.../nicko/command/sub/NickoDebugSubCmd.java | 8 +++---
.../atnrch}/nicko/config/Configuration.java | 2 +-
.../nicko/config/ConfigurationManager.java | 2 +-
.../nicko/config/DataSourceConfiguration.java | 2 +-
.../atnrch}/nicko/disguise/ActionResult.java | 4 +--
.../nicko/disguise/AppearanceManager.java | 20 ++++++-------
.../atnrch}/nicko/disguise/NickoProfile.java | 4 +--
.../nicko/event/PlayerJoinListener.java | 18 ++++++------
.../nicko/event/PlayerQuitListener.java | 6 ++--
.../atnrch}/nicko/gui/AdminGUI.java | 6 ++--
.../atnrch}/nicko/gui/MainGUI.java | 14 +++++-----
.../atnrch}/nicko/gui/SettingsGUI.java | 8 +++---
.../nicko/gui/admin/CacheManagementGUI.java | 12 ++++----
.../gui/admin/cache/CacheDetailedGUI.java | 16 +++++------
.../nicko/gui/items/admin/ManageCache.java | 4 +--
.../gui/items/admin/cache/CacheDetailed.java | 4 +--
.../items/admin/cache/CacheInvalidate.java | 8 +++---
.../gui/items/admin/cache/CacheOverview.java | 6 ++--
.../items/admin/cache/SkinPlaceholder.java | 2 +-
.../nicko/gui/items/common/GoBack.java | 2 +-
.../gui/items/common/OptionUnavailable.java | 2 +-
.../nicko/gui/items/common/ScrollDown.java | 2 +-
.../nicko/gui/items/common/ScrollUp.java | 2 +-
.../nicko/gui/items/main/AdminSubGUI.java | 4 +--
.../atnrch}/nicko/gui/items/main/ExitGUI.java | 2 +-
.../nicko/gui/items/main/ResetAppearance.java | 8 +++---
.../nicko/gui/items/main/SettingsSubGUI.java | 4 +--
.../gui/items/settings/BungeeCordCycling.java | 6 ++--
.../gui/items/settings/LanguageCycling.java | 8 +++---
.../nicko/gui/items/skin/ChangeName.java | 4 +--
.../gui/items/skin/ChangeNameAndSkin.java | 4 +--
.../nicko/gui/items/skin/ChangeSkin.java | 4 +--
.../atnrch}/nicko/i18n/I18N.java | 6 ++--
.../atnrch}/nicko/i18n/I18NDict.java | 2 +-
.../atnrch}/nicko/i18n/Locale.java | 2 +-
.../atnrch}/nicko/i18n/LocaleFileManager.java | 4 +--
.../atnrch}/nicko/mojang/MojangAPI.java | 2 +-
.../atnrch}/nicko/mojang/MojangSkin.java | 2 +-
.../atnrch}/nicko/mojang/MojangUtils.java | 2 +-
.../nicko/placeholder/NickoExpansion.java | 6 ++--
.../nicko/placeholder/PlaceHolderHook.java | 4 +--
.../nicko/storage/PlayerDataStore.java | 22 +++++++--------
.../atnrch}/nicko/storage/Storage.java | 6 ++--
.../nicko/storage/StorageProvider.java | 2 +-
.../atnrch}/nicko/storage/cache/Cache.java | 6 ++--
.../nicko/storage/cache/CacheProvider.java | 2 +-
.../nicko/storage/cache/redis/RedisCache.java | 10 +++----
.../cache/redis/RedisCacheProvider.java | 4 +--
.../nicko/storage/json/JSONStorage.java | 14 +++++-----
.../storage/json/JSONStorageProvider.java | 4 +--
.../nicko/storage/name/PlayerNameStore.java | 2 +-
.../atnrch}/nicko/storage/sql/SQLStorage.java | 14 +++++-----
.../nicko/storage/sql/SQLStorageProvider.java | 8 +++---
.../atnrch}/nicko/wrapper/AbstractPacket.java | 2 +-
.../wrapper/WrapperPlayServerRespawn.java | 2 +-
.../WrapperPlayerServerPlayerInfo.java | 2 +-
.../WrapperPlayerServerPlayerInfoRemove.java | 2 +-
src/main/resources/plugin.yml | 2 +-
.../atnrch}/nicko/test/NickoPluginTest.java | 8 +++---
.../nicko/test/config/ConfigurationTest.java | 6 ++--
.../nicko/test/storage/BrokenSQLTest.java | 12 ++++----
.../nicko/test/storage/SQLStorageTest.java | 14 +++++-----
.../test/storage/cache/CacheStorageTest.java | 10 +++----
69 files changed, 225 insertions(+), 230 deletions(-)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/NickoBukkit.java (87%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/anvil/AnvilManager.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/command/NickoCommand.java (86%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/command/sub/NickoCheckSubCmd.java (82%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/command/sub/NickoDebugSubCmd.java (88%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/config/Configuration.java (97%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/config/ConfigurationManager.java (98%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/config/DataSourceConfiguration.java (96%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/disguise/ActionResult.java (88%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/disguise/AppearanceManager.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/disguise/NickoProfile.java (95%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/event/PlayerJoinListener.java (77%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/event/PlayerQuitListener.java (82%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/AdminGUI.java (85%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/MainGUI.java (76%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/SettingsGUI.java (83%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/admin/CacheManagementGUI.java (72%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/admin/cache/CacheDetailedGUI.java (82%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/admin/ManageCache.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/admin/cache/CacheDetailed.java (88%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/admin/cache/CacheInvalidate.java (88%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/admin/cache/CacheOverview.java (87%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/admin/cache/SkinPlaceholder.java (93%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/common/GoBack.java (94%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/common/OptionUnavailable.java (91%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/common/ScrollDown.java (93%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/common/ScrollUp.java (93%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/main/AdminSubGUI.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/main/ExitGUI.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/main/ResetAppearance.java (89%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/main/SettingsSubGUI.java (90%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/settings/BungeeCordCycling.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/settings/LanguageCycling.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/skin/ChangeName.java (90%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/skin/ChangeNameAndSkin.java (91%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/gui/items/skin/ChangeSkin.java (90%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/i18n/I18N.java (94%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/i18n/I18NDict.java (98%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/i18n/Locale.java (95%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/i18n/LocaleFileManager.java (94%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/mojang/MojangAPI.java (99%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/mojang/MojangSkin.java (95%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/mojang/MojangUtils.java (95%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/placeholder/NickoExpansion.java (92%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/placeholder/PlaceHolderHook.java (84%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/PlayerDataStore.java (83%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/Storage.java (78%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/StorageProvider.java (67%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/cache/Cache.java (77%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/cache/CacheProvider.java (63%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/cache/redis/RedisCache.java (65%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/cache/redis/RedisCacheProvider.java (83%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/json/JSONStorage.java (89%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/json/JSONStorageProvider.java (79%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/name/PlayerNameStore.java (93%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/sql/SQLStorage.java (94%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/storage/sql/SQLStorageProvider.java (93%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/wrapper/AbstractPacket.java (98%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/wrapper/WrapperPlayServerRespawn.java (99%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/wrapper/WrapperPlayerServerPlayerInfo.java (97%)
rename src/main/java/{net/artelnatif => xyz/atnrch}/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java (96%)
rename src/test/java/{net/artelnatif => xyz/atnrch}/nicko/test/NickoPluginTest.java (81%)
rename src/test/java/{net/artelnatif => xyz/atnrch}/nicko/test/config/ConfigurationTest.java (85%)
rename src/test/java/{net/artelnatif => xyz/atnrch}/nicko/test/storage/BrokenSQLTest.java (85%)
rename src/test/java/{net/artelnatif => xyz/atnrch}/nicko/test/storage/SQLStorageTest.java (92%)
rename src/test/java/{net/artelnatif => xyz/atnrch}/nicko/test/storage/cache/CacheStorageTest.java (84%)
diff --git a/.gitignore b/.gitignore
index a573eb1..67f8558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,9 +46,4 @@ v1_19_R1/target
target
# Maven Dependency Reduced Pom
-dependency-reduced-pom.xml
-
-# Kept for convenience
-v1_19_R3
-# MockBukkit logs
-logs
\ No newline at end of file
+dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1988940..aba14d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>net.artelnatif</groupId>
+ <groupId>xyz.atnrch</groupId>
<artifactId>nicko</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Nicko</name>
diff --git a/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java
similarity index 87%
rename from src/main/java/net/artelnatif/nicko/NickoBukkit.java
rename to src/main/java/xyz/atnrch/nicko/NickoBukkit.java
index 8310406..55b87f0 100644
--- a/src/main/java/net/artelnatif/nicko/NickoBukkit.java
+++ b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java
@@ -1,20 +1,20 @@
-package net.artelnatif.nicko;
+package xyz.atnrch.nicko;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;
-import net.artelnatif.nicko.command.NickoCommand;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.config.ConfigurationManager;
-import net.artelnatif.nicko.event.PlayerJoinListener;
-import net.artelnatif.nicko.event.PlayerQuitListener;
-import net.artelnatif.nicko.gui.items.common.OptionUnavailable;
-import net.artelnatif.nicko.gui.items.main.ExitGUI;
-import net.artelnatif.nicko.i18n.Locale;
-import net.artelnatif.nicko.i18n.LocaleFileManager;
-import net.artelnatif.nicko.mojang.MojangAPI;
-import net.artelnatif.nicko.placeholder.PlaceHolderHook;
-import net.artelnatif.nicko.storage.PlayerDataStore;
-import net.artelnatif.nicko.storage.name.PlayerNameStore;
+import xyz.atnrch.nicko.command.NickoCommand;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.config.ConfigurationManager;
+import xyz.atnrch.nicko.event.PlayerJoinListener;
+import xyz.atnrch.nicko.event.PlayerQuitListener;
+import xyz.atnrch.nicko.gui.items.common.OptionUnavailable;
+import xyz.atnrch.nicko.gui.items.main.ExitGUI;
+import xyz.atnrch.nicko.i18n.Locale;
+import xyz.atnrch.nicko.i18n.LocaleFileManager;
+import xyz.atnrch.nicko.mojang.MojangAPI;
+import xyz.atnrch.nicko.placeholder.PlaceHolderHook;
+import xyz.atnrch.nicko.storage.PlayerDataStore;
+import xyz.atnrch.nicko.storage.name.PlayerNameStore;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.PluginCommand;
diff --git a/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java b/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
rename to src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
index 6e53506..b741fef 100644
--- a/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
+++ b/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
@@ -1,11 +1,11 @@
-package net.artelnatif.nicko.anvil;
+package xyz.atnrch.nicko.anvil;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.mojang.MojangUtils;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.AppearanceManager;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.i18n.I18N;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.mojang.MojangUtils;
import net.wesjd.anvilgui.AnvilGUI;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/command/NickoCommand.java b/src/main/java/xyz/atnrch/nicko/command/NickoCommand.java
similarity index 86%
rename from src/main/java/net/artelnatif/nicko/command/NickoCommand.java
rename to src/main/java/xyz/atnrch/nicko/command/NickoCommand.java
index e10d6c6..114da47 100644
--- a/src/main/java/net/artelnatif/nicko/command/NickoCommand.java
+++ b/src/main/java/xyz/atnrch/nicko/command/NickoCommand.java
@@ -1,9 +1,9 @@
-package net.artelnatif.nicko.command;
+package xyz.atnrch.nicko.command;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.command.sub.NickoCheckSubCmd;
-import net.artelnatif.nicko.command.sub.NickoDebugSubCmd;
-import net.artelnatif.nicko.gui.MainGUI;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.command.sub.NickoCheckSubCmd;
+import xyz.atnrch.nicko.command.sub.NickoDebugSubCmd;
+import xyz.atnrch.nicko.gui.MainGUI;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java b/src/main/java/xyz/atnrch/nicko/command/sub/NickoCheckSubCmd.java
similarity index 82%
rename from src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
rename to src/main/java/xyz/atnrch/nicko/command/sub/NickoCheckSubCmd.java
index 56a4614..438b5e8 100644
--- a/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
+++ b/src/main/java/xyz/atnrch/nicko/command/sub/NickoCheckSubCmd.java
@@ -1,10 +1,10 @@
-package net.artelnatif.nicko.command.sub;
+package xyz.atnrch.nicko.command.sub;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.mojang.MojangUtils;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.AppearanceManager;
+import xyz.atnrch.nicko.i18n.I18N;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.mojang.MojangUtils;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java b/src/main/java/xyz/atnrch/nicko/command/sub/NickoDebugSubCmd.java
similarity index 88%
rename from src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
rename to src/main/java/xyz/atnrch/nicko/command/sub/NickoDebugSubCmd.java
index e7490ba..c416898 100644
--- a/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
+++ b/src/main/java/xyz/atnrch/nicko/command/sub/NickoDebugSubCmd.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.command.sub;
+package xyz.atnrch.nicko.command.sub;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.mojang.MojangUtils;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.AppearanceManager;
+import xyz.atnrch.nicko.mojang.MojangUtils;
import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/net/artelnatif/nicko/config/Configuration.java b/src/main/java/xyz/atnrch/nicko/config/Configuration.java
similarity index 97%
rename from src/main/java/net/artelnatif/nicko/config/Configuration.java
rename to src/main/java/xyz/atnrch/nicko/config/Configuration.java
index 31016bb..848eba1 100644
--- a/src/main/java/net/artelnatif/nicko/config/Configuration.java
+++ b/src/main/java/xyz/atnrch/nicko/config/Configuration.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.config;
+package xyz.atnrch.nicko.config;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java b/src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java
similarity index 98%
rename from src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
rename to src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java
index 37c680b..f322668 100644
--- a/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
+++ b/src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.config;
+package xyz.atnrch.nicko.config;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java b/src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java
similarity index 96%
rename from src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java
rename to src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java
index d180824..da4495f 100644
--- a/src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java
+++ b/src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.config;
+package xyz.atnrch.nicko.config;
public class DataSourceConfiguration {
public static final DataSourceConfiguration SQL_EMPTY = new DataSourceConfiguration("127.0.0.1", 3306, "root", "");
diff --git a/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java b/src/main/java/xyz/atnrch/nicko/disguise/ActionResult.java
similarity index 88%
rename from src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
rename to src/main/java/xyz/atnrch/nicko/disguise/ActionResult.java
index 83158b0..0e84447 100644
--- a/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
+++ b/src/main/java/xyz/atnrch/nicko/disguise/ActionResult.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.disguise;
+package xyz.atnrch.nicko.disguise;
-import net.artelnatif.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.i18n.I18NDict;
public class ActionResult<R> {
private final I18NDict errorMessage;
diff --git a/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java b/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
rename to src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
index 4659b9d..6b6ff82 100644
--- a/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
+++ b/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
@@ -1,17 +1,17 @@
-package net.artelnatif.nicko.disguise;
+package xyz.atnrch.nicko.disguise;
import com.comphenix.protocol.wrappers.*;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.mojang.MojangAPI;
-import net.artelnatif.nicko.mojang.MojangSkin;
-import net.artelnatif.nicko.storage.PlayerDataStore;
-import net.artelnatif.nicko.storage.name.PlayerNameStore;
-import net.artelnatif.nicko.wrapper.WrapperPlayServerRespawn;
-import net.artelnatif.nicko.wrapper.WrapperPlayerServerPlayerInfo;
-import net.artelnatif.nicko.wrapper.WrapperPlayerServerPlayerInfoRemove;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.mojang.MojangAPI;
+import xyz.atnrch.nicko.mojang.MojangSkin;
+import xyz.atnrch.nicko.storage.PlayerDataStore;
+import xyz.atnrch.nicko.storage.name.PlayerNameStore;
+import xyz.atnrch.nicko.wrapper.WrapperPlayServerRespawn;
+import xyz.atnrch.nicko.wrapper.WrapperPlayerServerPlayerInfo;
+import xyz.atnrch.nicko.wrapper.WrapperPlayerServerPlayerInfoRemove;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java b/src/main/java/xyz/atnrch/nicko/disguise/NickoProfile.java
similarity index 95%
rename from src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
rename to src/main/java/xyz/atnrch/nicko/disguise/NickoProfile.java
index 926ad28..3652f90 100644
--- a/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
+++ b/src/main/java/xyz/atnrch/nicko/disguise/NickoProfile.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.disguise;
+package xyz.atnrch.nicko.disguise;
-import net.artelnatif.nicko.i18n.Locale;
+import xyz.atnrch.nicko.i18n.Locale;
public class NickoProfile implements Cloneable {
public static final NickoProfile EMPTY_PROFILE = new NickoProfile(null, null, Locale.ENGLISH, true);
diff --git a/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java b/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
similarity index 77%
rename from src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
rename to src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
index d78ff18..4008add 100644
--- a/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
+++ b/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
@@ -1,13 +1,13 @@
-package net.artelnatif.nicko.event;
+package xyz.atnrch.nicko.event;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.storage.PlayerDataStore;
-import net.artelnatif.nicko.storage.name.PlayerNameStore;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.AppearanceManager;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.i18n.I18N;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.storage.PlayerDataStore;
+import xyz.atnrch.nicko.storage.name.PlayerNameStore;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
diff --git a/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java b/src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java
similarity index 82%
rename from src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
rename to src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java
index 6d83949..3f89078 100644
--- a/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
+++ b/src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.event;
+package xyz.atnrch.nicko.event;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.ActionResult;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
diff --git a/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java b/src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java
similarity index 85%
rename from src/main/java/net/artelnatif/nicko/gui/AdminGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java
index 6baa5a7..2ce2990 100644
--- a/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.gui;
+package xyz.atnrch.nicko.gui;
-import net.artelnatif.nicko.gui.items.admin.ManageCache;
-import net.artelnatif.nicko.gui.items.common.GoBack;
+import xyz.atnrch.nicko.gui.items.admin.ManageCache;
+import xyz.atnrch.nicko.gui.items.common.GoBack;
import org.bukkit.entity.Player;
import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window;
diff --git a/src/main/java/net/artelnatif/nicko/gui/MainGUI.java b/src/main/java/xyz/atnrch/nicko/gui/MainGUI.java
similarity index 76%
rename from src/main/java/net/artelnatif/nicko/gui/MainGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/MainGUI.java
index e8afe54..aea1c50 100644
--- a/src/main/java/net/artelnatif/nicko/gui/MainGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/MainGUI.java
@@ -1,11 +1,11 @@
-package net.artelnatif.nicko.gui;
+package xyz.atnrch.nicko.gui;
-import net.artelnatif.nicko.gui.items.main.AdminSubGUI;
-import net.artelnatif.nicko.gui.items.main.ResetAppearance;
-import net.artelnatif.nicko.gui.items.main.SettingsSubGUI;
-import net.artelnatif.nicko.gui.items.skin.ChangeName;
-import net.artelnatif.nicko.gui.items.skin.ChangeNameAndSkin;
-import net.artelnatif.nicko.gui.items.skin.ChangeSkin;
+import xyz.atnrch.nicko.gui.items.main.AdminSubGUI;
+import xyz.atnrch.nicko.gui.items.main.ResetAppearance;
+import xyz.atnrch.nicko.gui.items.main.SettingsSubGUI;
+import xyz.atnrch.nicko.gui.items.skin.ChangeName;
+import xyz.atnrch.nicko.gui.items.skin.ChangeNameAndSkin;
+import xyz.atnrch.nicko.gui.items.skin.ChangeSkin;
import org.bukkit.entity.Player;
import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window;
diff --git a/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java b/src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java
similarity index 83%
rename from src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java
index eef7069..dc6fbc7 100644
--- a/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.gui;
+package xyz.atnrch.nicko.gui;
-import net.artelnatif.nicko.gui.items.common.GoBack;
-import net.artelnatif.nicko.gui.items.settings.BungeeCordCycling;
-import net.artelnatif.nicko.gui.items.settings.LanguageCycling;
+import xyz.atnrch.nicko.gui.items.common.GoBack;
+import xyz.atnrch.nicko.gui.items.settings.BungeeCordCycling;
+import xyz.atnrch.nicko.gui.items.settings.LanguageCycling;
import org.bukkit.entity.Player;
import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window;
diff --git a/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java b/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
similarity index 72%
rename from src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
index 196ad40..58a2510 100644
--- a/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
@@ -1,10 +1,10 @@
-package net.artelnatif.nicko.gui.admin;
+package xyz.atnrch.nicko.gui.admin;
-import net.artelnatif.nicko.gui.AdminGUI;
-import net.artelnatif.nicko.gui.items.admin.cache.CacheDetailed;
-import net.artelnatif.nicko.gui.items.admin.cache.CacheInvalidate;
-import net.artelnatif.nicko.gui.items.admin.cache.CacheOverview;
-import net.artelnatif.nicko.gui.items.common.GoBack;
+import xyz.atnrch.nicko.gui.AdminGUI;
+import xyz.atnrch.nicko.gui.items.admin.cache.CacheDetailed;
+import xyz.atnrch.nicko.gui.items.admin.cache.CacheInvalidate;
+import xyz.atnrch.nicko.gui.items.admin.cache.CacheOverview;
+import xyz.atnrch.nicko.gui.items.common.GoBack;
import org.bukkit.entity.Player;
import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window;
diff --git a/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java b/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
similarity index 82%
rename from src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
index c02134c..d8b4c65 100644
--- a/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
@@ -1,16 +1,16 @@
-package net.artelnatif.nicko.gui.admin.cache;
+package xyz.atnrch.nicko.gui.admin.cache;
+import xyz.atnrch.nicko.gui.items.common.GoBack;
+import xyz.atnrch.nicko.gui.items.common.ScrollUp;
+import xyz.atnrch.nicko.mojang.MojangSkin;
import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.gui.ScrollGui;
import xyz.xenondevs.invui.gui.structure.Markers;
import xyz.xenondevs.invui.item.Item;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.gui.items.admin.cache.SkinPlaceholder;
-import net.artelnatif.nicko.gui.admin.CacheManagementGUI;
-import net.artelnatif.nicko.gui.items.common.GoBack;
-import net.artelnatif.nicko.gui.items.common.ScrollDown;
-import net.artelnatif.nicko.gui.items.common.ScrollUp;
-import net.artelnatif.nicko.mojang.MojangSkin;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.gui.items.admin.cache.SkinPlaceholder;
+import xyz.atnrch.nicko.gui.admin.CacheManagementGUI;
+import xyz.atnrch.nicko.gui.items.common.ScrollDown;
import org.bukkit.entity.Player;
import xyz.xenondevs.invui.window.Window;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCache.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCache.java
index ed814ec..5215caf 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCache.java
@@ -1,9 +1,9 @@
-package net.artelnatif.nicko.gui.items.admin;
+package xyz.atnrch.nicko.gui.items.admin;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.builder.SkullBuilder;
import xyz.xenondevs.invui.item.impl.AsyncItem;
-import net.artelnatif.nicko.gui.admin.CacheManagementGUI;
+import xyz.atnrch.nicko.gui.admin.CacheManagementGUI;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheDetailed.java
similarity index 88%
rename from src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheDetailed.java
index 830a859..9a55797 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheDetailed.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.admin.cache;
+package xyz.atnrch.nicko.gui.items.admin.cache;
-import net.artelnatif.nicko.gui.admin.cache.CacheDetailedGUI;
+import xyz.atnrch.nicko.gui.admin.cache.CacheDetailedGUI;
import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheInvalidate.java
similarity index 88%
rename from src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheInvalidate.java
index f454e92..7d3fa9a 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheInvalidate.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.gui.items.admin.cache;
+package xyz.atnrch.nicko.gui.items.admin.cache;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.i18n.I18N;
+import xyz.atnrch.nicko.i18n.I18NDict;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheOverview.java
similarity index 87%
rename from src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheOverview.java
index b916b95..a4f0b70 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheOverview.java
@@ -1,9 +1,9 @@
-package net.artelnatif.nicko.gui.items.admin.cache;
+package xyz.atnrch.nicko.gui.items.admin.cache;
import com.google.common.cache.CacheStats;
import com.google.common.cache.LoadingCache;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.mojang.MojangSkin;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.mojang.MojangSkin;
import org.bukkit.Material;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/SkinPlaceholder.java
similarity index 93%
rename from src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/SkinPlaceholder.java
index 2984c53..6f94d63 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/SkinPlaceholder.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.admin.cache;
+package xyz.atnrch.nicko.gui.items.admin.cache;
import org.bukkit.Material;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBack.java
similarity index 94%
rename from src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/common/GoBack.java
index 5d44816..f840a6a 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBack.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.common;
+package xyz.atnrch.nicko.gui.items.common;
import org.bukkit.Material;
import xyz.xenondevs.invui.gui.Gui;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/OptionUnavailable.java
similarity index 91%
rename from src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/common/OptionUnavailable.java
index 1f8e38a..97d42cb 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/OptionUnavailable.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.common;
+package xyz.atnrch.nicko.gui.items.common;
import org.bukkit.Material;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDown.java
similarity index 93%
rename from src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDown.java
index 8cc8536..e8c5ade 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDown.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.common;
+package xyz.atnrch.nicko.gui.items.common;
import org.bukkit.Material;
import xyz.xenondevs.invui.gui.ScrollGui;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUp.java
similarity index 93%
rename from src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUp.java
index cd30663..a4f64bd 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUp.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.common;
+package xyz.atnrch.nicko.gui.items.common;
import org.bukkit.Material;
import xyz.xenondevs.invui.gui.ScrollGui;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java b/src/main/java/xyz/atnrch/nicko/gui/items/main/AdminSubGUI.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/main/AdminSubGUI.java
index 0ad8982..dedf06d 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/main/AdminSubGUI.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.main;
+package xyz.atnrch.nicko.gui.items.main;
-import net.artelnatif.nicko.gui.AdminGUI;
+import xyz.atnrch.nicko.gui.AdminGUI;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.event.inventory.ClickType;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java b/src/main/java/xyz/atnrch/nicko/gui/items/main/ExitGUI.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/main/ExitGUI.java
index 3992b2a..438d137 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/main/ExitGUI.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.gui.items.main;
+package xyz.atnrch.nicko.gui.items.main;
import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java b/src/main/java/xyz/atnrch/nicko/gui/items/main/ResetAppearance.java
similarity index 89%
rename from src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/main/ResetAppearance.java
index 3c1e8c1..fb380ec 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/main/ResetAppearance.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.gui.items.main;
+package xyz.atnrch.nicko.gui.items.main;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.disguise.AppearanceManager;
+import xyz.atnrch.nicko.i18n.I18N;
+import xyz.atnrch.nicko.i18n.I18NDict;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java b/src/main/java/xyz/atnrch/nicko/gui/items/main/SettingsSubGUI.java
similarity index 90%
rename from src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/main/SettingsSubGUI.java
index 52f9c28..26e0f40 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/main/SettingsSubGUI.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.main;
+package xyz.atnrch.nicko.gui.items.main;
-import net.artelnatif.nicko.gui.SettingsGUI;
+import xyz.atnrch.nicko.gui.SettingsGUI;
import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java b/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCycling.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCycling.java
index 61a389b..76b20fc 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCycling.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.gui.items.settings;
+package xyz.atnrch.nicko.gui.items.settings;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java b/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCycling.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCycling.java
index abe1399..c6f6054 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCycling.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.gui.items.settings;
+package xyz.atnrch.nicko.gui.items.settings;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.Locale;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.i18n.Locale;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeName.java
similarity index 90%
rename from src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeName.java
index c485e1a..82cc9de 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeName.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.skin;
+package xyz.atnrch.nicko.gui.items.skin;
-import net.artelnatif.nicko.anvil.AnvilManager;
+import xyz.atnrch.nicko.anvil.AnvilManager;
import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeNameAndSkin.java
similarity index 91%
rename from src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeNameAndSkin.java
index 91fe0ff..fb3784f 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeNameAndSkin.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.skin;
+package xyz.atnrch.nicko.gui.items.skin;
-import net.artelnatif.nicko.anvil.AnvilManager;
+import xyz.atnrch.nicko.anvil.AnvilManager;
import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType;
import xyz.xenondevs.invui.item.builder.ItemBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeSkin.java
similarity index 90%
rename from src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java
rename to src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeSkin.java
index e3b96a3..cd61031 100644
--- a/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/skin/ChangeSkin.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.gui.items.skin;
+package xyz.atnrch.nicko.gui.items.skin;
-import net.artelnatif.nicko.anvil.AnvilManager;
+import xyz.atnrch.nicko.anvil.AnvilManager;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import xyz.xenondevs.invui.item.builder.SkullBuilder;
diff --git a/src/main/java/net/artelnatif/nicko/i18n/I18N.java b/src/main/java/xyz/atnrch/nicko/i18n/I18N.java
similarity index 94%
rename from src/main/java/net/artelnatif/nicko/i18n/I18N.java
rename to src/main/java/xyz/atnrch/nicko/i18n/I18N.java
index 40fe6ef..117f8c9 100644
--- a/src/main/java/net/artelnatif/nicko/i18n/I18N.java
+++ b/src/main/java/xyz/atnrch/nicko/i18n/I18N.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.i18n;
+package xyz.atnrch.nicko.i18n;
import com.github.jsixface.YamlConfig;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.bukkit.entity.Player;
import java.io.InputStream;
diff --git a/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java b/src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java
similarity index 98%
rename from src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
rename to src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java
index 4997810..6c3bd2c 100644
--- a/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
+++ b/src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package xyz.atnrch.nicko.i18n;
public class I18NDict {
private final String key;
diff --git a/src/main/java/net/artelnatif/nicko/i18n/Locale.java b/src/main/java/xyz/atnrch/nicko/i18n/Locale.java
similarity index 95%
rename from src/main/java/net/artelnatif/nicko/i18n/Locale.java
rename to src/main/java/xyz/atnrch/nicko/i18n/Locale.java
index 479e5cf..607b54c 100644
--- a/src/main/java/net/artelnatif/nicko/i18n/Locale.java
+++ b/src/main/java/xyz/atnrch/nicko/i18n/Locale.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package xyz.atnrch.nicko.i18n;
import java.io.Serializable;
diff --git a/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java b/src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java
similarity index 94%
rename from src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
rename to src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java
index ed7fe00..d2ff7e6 100644
--- a/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
+++ b/src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.i18n;
+package xyz.atnrch.nicko.i18n;
import com.github.jsixface.YamlConfig;
-import net.artelnatif.nicko.NickoBukkit;
+import xyz.atnrch.nicko.NickoBukkit;
import xyz.xenondevs.invui.util.IOUtils;
import java.io.*;
diff --git a/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java b/src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java
similarity index 99%
rename from src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
rename to src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java
index d8b3bf2..46eb2f1 100644
--- a/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
+++ b/src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.mojang;
+package xyz.atnrch.nicko.mojang;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java b/src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java
similarity index 95%
rename from src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
rename to src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java
index 8980bcb..2033147 100644
--- a/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
+++ b/src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.mojang;
+package xyz.atnrch.nicko.mojang;
import com.google.gson.JsonObject;
diff --git a/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java b/src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java
similarity index 95%
rename from src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
rename to src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java
index 135c210..6845392 100644
--- a/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
+++ b/src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.mojang;
+package xyz.atnrch.nicko.mojang;
import java.util.UUID;
import java.util.regex.Pattern;
diff --git a/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java b/src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java
similarity index 92%
rename from src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
rename to src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java
index 7f3e39d..02a4cf7 100644
--- a/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
+++ b/src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.placeholder;
+package xyz.atnrch.nicko.placeholder;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java b/src/main/java/xyz/atnrch/nicko/placeholder/PlaceHolderHook.java
similarity index 84%
rename from src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
rename to src/main/java/xyz/atnrch/nicko/placeholder/PlaceHolderHook.java
index c4d3750..b2900df 100644
--- a/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
+++ b/src/main/java/xyz/atnrch/nicko/placeholder/PlaceHolderHook.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.placeholder;
+package xyz.atnrch.nicko.placeholder;
-import net.artelnatif.nicko.NickoBukkit;
+import xyz.atnrch.nicko.NickoBukkit;
import org.bukkit.Bukkit;
public class PlaceHolderHook {
diff --git a/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java
similarity index 83%
rename from src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
rename to src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java
index 002c839..cae4147 100644
--- a/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java
@@ -1,15 +1,15 @@
-package net.artelnatif.nicko.storage;
+package xyz.atnrch.nicko.storage;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.mojang.MojangAPI;
-import net.artelnatif.nicko.mojang.MojangUtils;
-import net.artelnatif.nicko.storage.cache.Cache;
-import net.artelnatif.nicko.storage.cache.redis.RedisCache;
-import net.artelnatif.nicko.storage.json.JSONStorage;
-import net.artelnatif.nicko.storage.sql.SQLStorage;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.mojang.MojangAPI;
+import xyz.atnrch.nicko.mojang.MojangUtils;
+import xyz.atnrch.nicko.storage.cache.Cache;
+import xyz.atnrch.nicko.storage.cache.redis.RedisCache;
+import xyz.atnrch.nicko.storage.json.JSONStorage;
+import xyz.atnrch.nicko.storage.sql.SQLStorage;
import org.bukkit.entity.Player;
import java.io.IOException;
diff --git a/src/main/java/net/artelnatif/nicko/storage/Storage.java b/src/main/java/xyz/atnrch/nicko/storage/Storage.java
similarity index 78%
rename from src/main/java/net/artelnatif/nicko/storage/Storage.java
rename to src/main/java/xyz/atnrch/nicko/storage/Storage.java
index b23b1ef..830721b 100644
--- a/src/main/java/net/artelnatif/nicko/storage/Storage.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/Storage.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.storage;
+package xyz.atnrch.nicko.storage;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import java.util.Optional;
import java.util.UUID;
diff --git a/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java b/src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java
similarity index 67%
rename from src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
rename to src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java
index 41b66de..c12b930 100644
--- a/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.storage;
+package xyz.atnrch.nicko.storage;
public interface StorageProvider {
boolean init();
diff --git a/src/main/java/net/artelnatif/nicko/storage/cache/Cache.java b/src/main/java/xyz/atnrch/nicko/storage/cache/Cache.java
similarity index 77%
rename from src/main/java/net/artelnatif/nicko/storage/cache/Cache.java
rename to src/main/java/xyz/atnrch/nicko/storage/cache/Cache.java
index 92d5b75..dfdc061 100644
--- a/src/main/java/net/artelnatif/nicko/storage/cache/Cache.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/Cache.java
@@ -1,7 +1,7 @@
-package net.artelnatif.nicko.storage.cache;
+package xyz.atnrch.nicko.storage.cache;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import java.util.Optional;
import java.util.UUID;
diff --git a/src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java b/src/main/java/xyz/atnrch/nicko/storage/cache/CacheProvider.java
similarity index 63%
rename from src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java
rename to src/main/java/xyz/atnrch/nicko/storage/cache/CacheProvider.java
index e85fd3a..8c0d462 100644
--- a/src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/CacheProvider.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.storage.cache;
+package xyz.atnrch.nicko.storage.cache;
public interface CacheProvider {
boolean init();
diff --git a/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
similarity index 65%
rename from src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java
rename to src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
index 824cd72..1aeb8dd 100644
--- a/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
@@ -1,9 +1,9 @@
-package net.artelnatif.nicko.storage.cache.redis;
+package xyz.atnrch.nicko.storage.cache.redis;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.storage.cache.Cache;
-import net.artelnatif.nicko.storage.cache.CacheProvider;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.storage.cache.Cache;
+import xyz.atnrch.nicko.storage.cache.CacheProvider;
import java.util.Optional;
import java.util.UUID;
diff --git a/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
similarity index 83%
rename from src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java
rename to src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
index 65347e3..343cc3a 100644
--- a/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.storage.cache.redis;
+package xyz.atnrch.nicko.storage.cache.redis;
-import net.artelnatif.nicko.storage.cache.CacheProvider;
+import xyz.atnrch.nicko.storage.cache.CacheProvider;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
diff --git a/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java b/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java
similarity index 89%
rename from src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
rename to src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java
index a0f6846..cdd7537 100644
--- a/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java
@@ -1,13 +1,13 @@
-package net.artelnatif.nicko.storage.json;
+package xyz.atnrch.nicko.storage.json;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.storage.Storage;
-import net.artelnatif.nicko.storage.StorageProvider;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.storage.Storage;
+import xyz.atnrch.nicko.storage.StorageProvider;
import java.io.*;
import java.util.Optional;
diff --git a/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java b/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java
similarity index 79%
rename from src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
rename to src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java
index ac2be77..2d58096 100644
--- a/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java
@@ -1,6 +1,6 @@
-package net.artelnatif.nicko.storage.json;
+package xyz.atnrch.nicko.storage.json;
-import net.artelnatif.nicko.storage.StorageProvider;
+import xyz.atnrch.nicko.storage.StorageProvider;
import java.io.File;
diff --git a/src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java b/src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java
similarity index 93%
rename from src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java
rename to src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java
index c439d4e..6dccd32 100644
--- a/src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.storage.name;
+package xyz.atnrch.nicko.storage.name;
import org.bukkit.entity.Player;
diff --git a/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java b/src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorage.java
similarity index 94%
rename from src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
rename to src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorage.java
index 8dcea73..87e03e8 100644
--- a/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorage.java
@@ -1,11 +1,11 @@
-package net.artelnatif.nicko.storage.sql;
+package xyz.atnrch.nicko.storage.sql;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18NDict;
-import net.artelnatif.nicko.i18n.Locale;
-import net.artelnatif.nicko.storage.Storage;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.i18n.I18NDict;
+import xyz.atnrch.nicko.i18n.Locale;
+import xyz.atnrch.nicko.storage.Storage;
import java.io.ByteArrayInputStream;
import java.nio.ByteBuffer;
diff --git a/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java b/src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorageProvider.java
similarity index 93%
rename from src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
rename to src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorageProvider.java
index 1a733e7..9888efd 100644
--- a/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorageProvider.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.storage.sql;
+package xyz.atnrch.nicko.storage.sql;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.config.DataSourceConfiguration;
-import net.artelnatif.nicko.storage.StorageProvider;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.config.DataSourceConfiguration;
+import xyz.atnrch.nicko.storage.StorageProvider;
import org.mariadb.jdbc.MariaDbDataSource;
import java.sql.Connection;
diff --git a/src/main/java/net/artelnatif/nicko/wrapper/AbstractPacket.java b/src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java
similarity index 98%
rename from src/main/java/net/artelnatif/nicko/wrapper/AbstractPacket.java
rename to src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java
index f636bf3..c1ff601 100644
--- a/src/main/java/net/artelnatif/nicko/wrapper/AbstractPacket.java
+++ b/src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package net.artelnatif.nicko.wrapper;
+package xyz.atnrch.nicko.wrapper;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
diff --git a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayServerRespawn.java b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java
similarity index 99%
rename from src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayServerRespawn.java
rename to src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java
index ace7147..c8d46a1 100644
--- a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayServerRespawn.java
+++ b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.wrapper;
+package xyz.atnrch.nicko.wrapper;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.InternalStructure;
diff --git a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfo.java b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
similarity index 97%
rename from src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
rename to src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
index fc64027..dad7be6 100644
--- a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
+++ b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.wrapper;
+package xyz.atnrch.nicko.wrapper;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
similarity index 96%
rename from src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
rename to src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
index bc6e912..a218e67 100644
--- a/src/main/java/net/artelnatif/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
+++ b/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.wrapper;
+package xyz.atnrch.nicko.wrapper;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 66cda8f..3ab1d56 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
name: Nicko
-main: net.artelnatif.nicko.NickoBukkit
+main: xyz.atnrch.nicko.NickoBukkit
version: 1.0-SNAPSHOT
author: Ineanto
api-version: 1.13
diff --git a/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java
similarity index 81%
rename from src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
rename to src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java
index f71f9c6..0cfd752 100644
--- a/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java
@@ -1,9 +1,9 @@
-package net.artelnatif.nicko.test;
+package xyz.atnrch.nicko.test;
import be.seeseemelk.mockbukkit.MockBukkit;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.config.DataSourceConfiguration;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.config.DataSourceConfiguration;
import org.junit.jupiter.api.*;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java b/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java
similarity index 85%
rename from src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java
rename to src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java
index 8c461c8..fd44eb9 100644
--- a/src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java
@@ -1,8 +1,8 @@
-package net.artelnatif.nicko.test.config;
+package xyz.atnrch.nicko.test.config;
import be.seeseemelk.mockbukkit.MockBukkit;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.config.Configuration;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.config.Configuration;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
similarity index 85%
rename from src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
rename to src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
index 1b4f7c2..af1d913 100644
--- a/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
@@ -1,13 +1,13 @@
-package net.artelnatif.nicko.test.storage;
+package xyz.atnrch.nicko.test.storage;
import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.config.DataSourceConfiguration;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.config.DataSourceConfiguration;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.junit.jupiter.api.*;
import java.util.Optional;
diff --git a/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
similarity index 92%
rename from src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
rename to src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
index 15f3b82..5f33ae9 100644
--- a/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
@@ -1,14 +1,14 @@
-package net.artelnatif.nicko.test.storage;
+package xyz.atnrch.nicko.test.storage;
import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.config.DataSourceConfiguration;
-import net.artelnatif.nicko.i18n.Locale;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.config.DataSourceConfiguration;
+import xyz.atnrch.nicko.i18n.Locale;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.disguise.ActionResult;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.junit.jupiter.api.*;
import java.util.Optional;
diff --git a/src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/cache/CacheStorageTest.java
similarity index 84%
rename from src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java
rename to src/test/java/xyz/atnrch/nicko/test/storage/cache/CacheStorageTest.java
index 1e039af..c5b1df0 100644
--- a/src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/storage/cache/CacheStorageTest.java
@@ -1,12 +1,12 @@
-package net.artelnatif.nicko.test.storage.cache;
+package xyz.atnrch.nicko.test.storage.cache;
import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock;
-import net.artelnatif.nicko.NickoBukkit;
-import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.config.DataSourceConfiguration;
-import net.artelnatif.nicko.disguise.NickoProfile;
+import xyz.atnrch.nicko.NickoBukkit;
+import xyz.atnrch.nicko.config.Configuration;
+import xyz.atnrch.nicko.config.DataSourceConfiguration;
+import xyz.atnrch.nicko.disguise.NickoProfile;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;