diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java b/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
index d795a32..e51dcdc 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
@@ -2,6 +2,7 @@ package net.artelnatif.nicko;
 
 import net.artelnatif.nicko.config.Configuration;
 import net.artelnatif.nicko.config.ConfigurationManager;
+import net.artelnatif.nicko.mojang.MojangAPI;
 import net.artelnatif.nicko.storage.PlayerDataStore;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -14,6 +15,7 @@ public class Nicko {
     private ConfigurationManager configManager;
     private Logger logger;
     private File dataFolder;
+    private MojangAPI mojangAPI;
     private boolean bungeecord;
     private Configuration config;
 
@@ -35,6 +37,7 @@ public class Nicko {
         configManager = new ConfigurationManager(this);
         configManager.saveDefaultConfig();
 
+        mojangAPI = new MojangAPI(this);
         dataStore = new PlayerDataStore(this);
     }
 
@@ -50,6 +53,10 @@ public class Nicko {
         return dataFolder;
     }
 
+    public MojangAPI getMojangAPI() {
+        return mojangAPI;
+    }
+
     public ConfigurationManager getConfigManager() {
         return configManager;
     }
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
index ba629e8..91ede9d 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
@@ -9,14 +9,15 @@ import net.artelnatif.nicko.bukkit.gui.items.main.ExitGUI;
 import net.artelnatif.nicko.bukkit.pluginchannel.PluginMessageHandler;
 import net.artelnatif.nicko.bungee.NickoBungee;
 import net.artelnatif.nicko.config.Configuration;
-import net.artelnatif.nicko.event.PlayerJoinListener;
-import net.artelnatif.nicko.event.PlayerQuitListener;
-import net.artelnatif.nicko.i18n.Locale;
-import net.artelnatif.nicko.i18n.LocaleFileManager;
+import net.artelnatif.nicko.bukkit.event.PlayerJoinListener;
+import net.artelnatif.nicko.bukkit.event.PlayerQuitListener;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.LocaleFileManager;
 import net.artelnatif.nicko.impl.Internals;
 import net.artelnatif.nicko.impl.InternalsProvider;
 import net.artelnatif.nicko.mojang.MojangAPI;
-import net.artelnatif.nicko.placeholder.PlaceHolderHook;
+import net.artelnatif.nicko.bukkit.placeholder.PlaceHolderHook;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -83,7 +84,7 @@ public class NickoBukkit extends JavaPlugin {
                 getLogger().severe("Failed to open persistence, data will NOT be saved!");
             }
 
-            mojangAPI = new MojangAPI(this);
+            mojangAPI = new MojangAPI(nicko);
 
             localeFileManager = new LocaleFileManager();
             if (nicko.getConfig().customLocale()) {
@@ -126,7 +127,7 @@ public class NickoBukkit extends JavaPlugin {
         if (!nicko.getDataStore().getStorage().isError()) {
             getLogger().info("Closing persistence...");
             nicko.getDataStore().removeAllNames();
-            nicko.getDataStore().saveAll();
+            Bukkit.getOnlinePlayers().forEach(player -> nicko.getDataStore().saveData(player));
             if (!nicko.getDataStore().getStorage().getProvider().close()) {
                 getLogger().severe("Failed to close persistence!");
             }
@@ -148,10 +149,6 @@ public class NickoBukkit extends JavaPlugin {
         return nicko;
     }
 
-    public MojangAPI getMojangAPI() {
-        return mojangAPI;
-    }
-
     public LocaleFileManager getLocaleFileManager() {
         return localeFileManager;
     }
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
index aae48dc..c155361 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
@@ -1,10 +1,10 @@
 package net.artelnatif.nicko.bukkit.anvil;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
+import net.artelnatif.nicko.bukkit.appearance.AppearanceManager;
 import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18N;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import net.artelnatif.nicko.mojang.MojangUtils;
 import net.wesjd.anvilgui.AnvilGUI;
 import org.bukkit.Material;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
similarity index 94%
rename from nicko-core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
index 5376982..6fc4090 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
@@ -1,6 +1,8 @@
-package net.artelnatif.nicko.disguise;
+package net.artelnatif.nicko.bukkit.appearance;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
+import net.artelnatif.nicko.disguise.ActionResult;
+import net.artelnatif.nicko.disguise.NickoProfile;
 import net.artelnatif.nicko.storage.PlayerDataStore;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
index 6509c94..4569eec 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
@@ -1,9 +1,9 @@
 package net.artelnatif.nicko.bukkit.command.sub;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.appearance.AppearanceManager;
+import net.artelnatif.nicko.bukkit.i18n.I18N;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import net.artelnatif.nicko.mojang.MojangUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
index acc942d..51f51e2 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
@@ -1,7 +1,7 @@
 package net.artelnatif.nicko.bukkit.command.sub;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
+import net.artelnatif.nicko.bukkit.appearance.AppearanceManager;
 import net.artelnatif.nicko.mojang.MojangUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
similarity index 86%
rename from nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
index 21a1af9..575b2db 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
@@ -1,10 +1,10 @@
-package net.artelnatif.nicko.event;
+package net.artelnatif.nicko.bukkit.event;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
-import net.artelnatif.nicko.disguise.AppearanceManager;
+import net.artelnatif.nicko.bukkit.appearance.AppearanceManager;
 import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18N;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
similarity index 91%
rename from nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
index cfc9089..0794fdb 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.event;
+package net.artelnatif.nicko.bukkit.event;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
 import org.bukkit.entity.Player;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
index 261b707..0726a3f 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
@@ -26,7 +26,7 @@ public class CacheDetailledGUI {
     private final GUI gui;
 
     public CacheDetailledGUI(Player player) {
-        final ConcurrentMap<String, Optional<MojangSkin>> skins = NickoBukkit.getInstance().getMojangAPI().getCache().asMap();
+        final ConcurrentMap<String, Optional<MojangSkin>> skins = NickoBukkit.getInstance().getNicko().getMojangAPI().getCache().asMap();
         final List<String> loadedSkins = skins.entrySet().stream()
                 .filter(entry -> entry.getValue().isPresent())
                 .map(Map.Entry::getKey)
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
index f6d3440..03749cf 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
@@ -4,8 +4,8 @@ import de.studiocode.invui.item.ItemProvider;
 import de.studiocode.invui.item.builder.ItemBuilder;
 import de.studiocode.invui.item.impl.BaseItem;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18N;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -31,7 +31,7 @@ public class CacheInvalidate extends BaseItem {
         if (clickType.isLeftClick() || clickType.isRightClick()) {
             event.getView().close();
             player.sendMessage(I18N.translate(player, I18NDict.Event.Admin.CACHE_CLEAN));
-            NickoBukkit.getInstance().getMojangAPI().getCache().invalidateAll();
+            NickoBukkit.getInstance().getNicko().getMojangAPI().getCache().invalidateAll();
         }
     }
 }
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
index a11d266..23a802d 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
@@ -19,7 +19,7 @@ public class CacheOverview extends BaseItem {
     @Override
     public ItemProvider getItemProvider() {
         final ItemBuilder builder = new ItemBuilder(Material.OAK_SIGN);
-        final LoadingCache<String, Optional<MojangSkin>> cache = NickoBukkit.getInstance().getMojangAPI().getCache();
+        final LoadingCache<String, Optional<MojangSkin>> cache = NickoBukkit.getInstance().getNicko().getMojangAPI().getCache();
         final CacheStats stats = cache.stats();
         builder.setDisplayName("§6Skin cache §foverview:");
         builder.addLoreLines(
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
index 4ed2a82..51932f7 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
@@ -3,9 +3,9 @@ package net.artelnatif.nicko.bukkit.gui.items.main;
 import de.studiocode.invui.item.ItemProvider;
 import de.studiocode.invui.item.builder.ItemBuilder;
 import de.studiocode.invui.item.impl.BaseItem;
-import net.artelnatif.nicko.disguise.AppearanceManager;
-import net.artelnatif.nicko.i18n.I18N;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.appearance.AppearanceManager;
+import net.artelnatif.nicko.bukkit.i18n.I18N;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
index c81b38c..6c1df4e 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
@@ -7,7 +7,7 @@ import de.studiocode.invui.item.impl.CycleItem;
 import de.studiocode.invui.item.impl.SimpleItem;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
similarity index 98%
rename from nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
index d5b1f31..77b1a67 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package net.artelnatif.nicko.bukkit.i18n;
 
 import com.github.jsixface.YamlConfig;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
similarity index 97%
rename from nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
index f653be9..b2a2d66 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package net.artelnatif.nicko.bukkit.i18n;
 
 public record I18NDict(String key) {
     public static class Event {
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/Locale.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
similarity index 92%
rename from nicko-core/src/main/java/net/artelnatif/nicko/i18n/Locale.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
index 1aeeee9..9894aa7 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/Locale.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package net.artelnatif.nicko.bukkit.i18n;
 
 import java.io.Serializable;
 
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
similarity index 97%
rename from nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
index c0a4a75..e1f55bc 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.i18n;
+package net.artelnatif.nicko.bukkit.i18n;
 
 import com.github.jsixface.YamlConfig;
 import de.studiocode.invui.util.IOUtils;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
similarity index 97%
rename from nicko-core/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
index f359ef9..eb9460d 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.placeholder;
+package net.artelnatif.nicko.bukkit.placeholder;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
similarity index 90%
rename from nicko-core/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
index 3fd0cb0..16e2235 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
@@ -1,4 +1,4 @@
-package net.artelnatif.nicko.placeholder;
+package net.artelnatif.nicko.bukkit.placeholder;
 
 import net.artelnatif.nicko.bukkit.NickoBukkit;
 import org.bukkit.Bukkit;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
index 0c07f54..4ed8e7d 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
@@ -1,7 +1,7 @@
 package net.artelnatif.nicko.bungee.message;
 
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java b/nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
index fab2a43..a5eded8 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
@@ -1,6 +1,6 @@
 package net.artelnatif.nicko.disguise;
 
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 
 public class ActionResult<R> {
     private final I18NDict errorMessage;
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java b/nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
index 926ad28..1bc9de1 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
@@ -1,6 +1,6 @@
 package net.artelnatif.nicko.disguise;
 
-import net.artelnatif.nicko.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
 
 public class NickoProfile implements Cloneable {
     public static final NickoProfile EMPTY_PROFILE = new NickoProfile(null, null, Locale.ENGLISH, true);
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java b/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
index b3d9023..4f716d7 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
@@ -3,7 +3,7 @@ package net.artelnatif.nicko.impl;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.disguise.NickoProfile;
 import net.artelnatif.nicko.disguise.ActionResult;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import net.artelnatif.nicko.mojang.MojangAPI;
 import net.artelnatif.nicko.mojang.MojangSkin;
 import org.bukkit.entity.Player;
@@ -22,7 +22,7 @@ public interface Internals {
     default ActionResult<MojangSkin> fetchSkinTextures(NickoProfile profile, boolean reset) {
         Optional<MojangSkin> skin;
         try {
-            final MojangAPI mojang = NickoBukkit.getInstance().getMojangAPI();
+            final MojangAPI mojang = NickoBukkit.getInstance().getNicko().getMojangAPI();
             final Optional<String> uuid = mojang.getUUID(profile.getSkin());
             if (uuid.isPresent()) {
                 skin = (reset ? mojang.getSkinWithoutCaching(uuid.get()) : mojang.getSkin(uuid.get()));
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java b/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
index d780fa2..ba29006 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
@@ -7,7 +7,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
-import net.artelnatif.nicko.bukkit.NickoBukkit;
+import net.artelnatif.nicko.Nicko;
 
 import javax.annotation.Nonnull;
 import javax.net.ssl.HttpsURLConnection;
@@ -36,10 +36,10 @@ public class MojangAPI {
             .expireAfterWrite(24, TimeUnit.HOURS)
             .build(loader);
 
-    private final NickoBukkit instance;
+    private final Nicko nicko;
 
-    public MojangAPI(NickoBukkit instance) {
-        this.instance = instance;
+    public MojangAPI(Nicko nicko) {
+        this.nicko = nicko;
     }
 
     public Optional<MojangSkin> getSkin(String uuid) throws IOException, ExecutionException {
@@ -78,11 +78,11 @@ public class MojangAPI {
 
         switch (con.getResponseCode()) {
             case 400 -> {
-                instance.getLogger().warning("Failed to parse request: Invalid Name");
+                nicko.getLogger().warning("Failed to parse request: Invalid Name");
                 return getErrorObject();
             }
             case 429 -> {
-                instance.getLogger().warning("Failed to parse request: The connection is throttled.");
+                nicko.getLogger().warning("Failed to parse request: The connection is throttled.");
                 return getErrorObject();
             }
             case 200 -> {
@@ -97,12 +97,12 @@ public class MojangAPI {
                     final JsonElement jsonElt = JsonParser.parseString(builder.toString());
                     return jsonElt.getAsJsonObject();
                 } catch (JsonParseException | IllegalStateException exception) {
-                    instance.getLogger().warning("Failed to parse request (" + parametrizedUrl + ")!");
+                    nicko.getLogger().warning("Failed to parse request (" + parametrizedUrl + ")!");
                     return getErrorObject();
                 }
             }
             default -> {
-                instance.getLogger().warning("Unhandled response code from Mojang: " + con.getResponseCode());
+                nicko.getLogger().warning("Unhandled response code from Mojang: " + con.getResponseCode());
                 return getErrorObject();
             }
         }
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
index 5e4aae0..8a42fb2 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
@@ -1,12 +1,10 @@
 package net.artelnatif.nicko.storage;
 
 import net.artelnatif.nicko.Nicko;
-import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.disguise.NickoProfile;
 import net.artelnatif.nicko.mojang.MojangUtils;
 import net.artelnatif.nicko.storage.json.JSONStorage;
 import net.artelnatif.nicko.storage.sql.SQLStorage;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
@@ -16,10 +14,12 @@ import java.util.UUID;
 
 public class PlayerDataStore {
     private final Storage storage;
+    private final Nicko nicko;
     private final HashMap<UUID, NickoProfile> profiles = new HashMap<>();
     private final HashMap<UUID, String> names = new HashMap<>();
 
     public PlayerDataStore(Nicko nicko) {
+        this.nicko = nicko;
         this.storage = nicko.getConfig().local() ? new JSONStorage(nicko) : new SQLStorage(nicko);
     }
 
@@ -41,11 +41,6 @@ public class PlayerDataStore {
         names.clear();
     }
 
-    public void saveAll() {
-        Bukkit.getOnlinePlayers().forEach(this::saveData);
-    }
-
-
     public Optional<NickoProfile> getData(UUID uuid) {
         if (storage.isError()) {
             return Optional.empty();
@@ -70,7 +65,7 @@ public class PlayerDataStore {
         }
 
         try {
-            final Optional<String> uuidTrimmed = NickoBukkit.getInstance().getMojangAPI().getUUID(name);
+            final Optional<String> uuidTrimmed = nicko.getMojangAPI().getUUID(name);
             if (uuidTrimmed.isPresent()) {
                 final UUID uuid = MojangUtils.fromTrimmed(uuidTrimmed.get());
                 return getData(uuid);
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java b/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
index 3e8fd8a..edfedba 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
@@ -6,7 +6,7 @@ import net.artelnatif.nicko.Nicko;
 import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.disguise.ActionResult;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import net.artelnatif.nicko.storage.Storage;
 import net.artelnatif.nicko.storage.StorageProvider;
 
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java b/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
index 8b2237c..f6972d3 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
@@ -3,7 +3,7 @@ package net.artelnatif.nicko.storage.sql;
 import net.artelnatif.nicko.Nicko;
 import net.artelnatif.nicko.disguise.ActionResult;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.I18NDict;
+import net.artelnatif.nicko.bukkit.i18n.I18NDict;
 import net.artelnatif.nicko.storage.Storage;
 
 import java.nio.ByteBuffer;
diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
index d7292c4..1da2f82 100644
--- a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
+++ b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
@@ -7,7 +7,7 @@ import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.config.Configuration;
 import net.artelnatif.nicko.disguise.ActionResult;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
 import org.junit.jupiter.api.*;
 
 public class BrokenSQLTest {
diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
index 0096a12..f48f3a0 100644
--- a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
+++ b/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
@@ -7,7 +7,7 @@ import net.artelnatif.nicko.bukkit.NickoBukkit;
 import net.artelnatif.nicko.config.Configuration;
 import net.artelnatif.nicko.disguise.ActionResult;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.i18n.Locale;
+import net.artelnatif.nicko.bukkit.i18n.Locale;
 import org.junit.jupiter.api.*;
 
 public class SQLStorageTest {