From d17aadc09a060fbbe11db13da50ecbe6f97355f6 Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Mon, 3 Apr 2023 11:03:05 +0200
Subject: [PATCH] feat(build): rework structure

---
 core/pom.xml                                  | 188 ------------------
 pom.xml                                       | 177 ++++++++++++++++-
 .../net/artelnatif/nicko/NickoBukkit.java     |   0
 .../artelnatif/nicko/anvil/AnvilManager.java  |   0
 .../nicko/appearance/AppearanceManager.java   |   0
 .../nicko/command/NickoCommand.java           |   0
 .../nicko/command/sub/NickoCheckSubCmd.java   |   0
 .../nicko/command/sub/NickoDebugSubCmd.java   |   0
 .../nicko/config/Configuration.java           |   0
 .../nicko/config/ConfigurationManager.java    |   0
 .../nicko/config/DataSourceConfiguration.java |   0
 .../nicko/disguise/ActionResult.java          |   0
 .../nicko/disguise/NickoProfile.java          |   0
 .../nicko/event/PlayerJoinListener.java       |   0
 .../nicko/event/PlayerQuitListener.java       |   0
 .../net/artelnatif/nicko/gui/AdminGUI.java    |   0
 .../net/artelnatif/nicko/gui/MainGUI.java     |   0
 .../net/artelnatif/nicko/gui/SettingsGUI.java |   0
 .../nicko/gui/admin/CacheManagementGUI.java   |   0
 .../gui/admin/cache/CacheDetailedGUI.java     |   0
 .../nicko/gui/items/admin/ManageCache.java    |   0
 .../gui/items/admin/cache/CacheDetailed.java  |   0
 .../items/admin/cache/CacheInvalidate.java    |   0
 .../gui/items/admin/cache/CacheOverview.java  |   0
 .../items/admin/cache/SkinPlaceholder.java    |   0
 .../nicko/gui/items/common/GoBack.java        |   0
 .../gui/items/common/OptionUnavailable.java   |   0
 .../nicko/gui/items/common/ScrollDown.java    |   0
 .../nicko/gui/items/common/ScrollUp.java      |   0
 .../nicko/gui/items/main/AdminSubGUI.java     |   0
 .../nicko/gui/items/main/ExitGUI.java         |   0
 .../nicko/gui/items/main/ResetAppearance.java |   0
 .../nicko/gui/items/main/SettingsSubGUI.java  |   0
 .../gui/items/settings/BungeeCordCycling.java |   0
 .../gui/items/settings/LanguageCycling.java   |   0
 .../nicko/gui/items/skin/ChangeName.java      |   0
 .../gui/items/skin/ChangeNameAndSkin.java     |   0
 .../nicko/gui/items/skin/ChangeSkin.java      |   0
 .../java/net/artelnatif/nicko/i18n/I18N.java  |   0
 .../net/artelnatif/nicko/i18n/I18NDict.java   |   0
 .../net/artelnatif/nicko/i18n/Locale.java     |   0
 .../nicko/i18n/LocaleFileManager.java         |   0
 .../artelnatif/nicko/mojang/MojangAPI.java    |   0
 .../artelnatif/nicko/mojang/MojangSkin.java   |   0
 .../artelnatif/nicko/mojang/MojangUtils.java  |   0
 .../nicko/placeholder/NickoExpansion.java     |   0
 .../nicko/placeholder/PlaceHolderHook.java    |   0
 .../nicko/storage/PlayerDataStore.java        |   0
 .../net/artelnatif/nicko/storage/Storage.java |   0
 .../nicko/storage/StorageProvider.java        |   0
 .../artelnatif/nicko/storage/cache/Cache.java |   0
 .../nicko/storage/cache/CacheProvider.java    |   0
 .../nicko/storage/cache/redis/RedisCache.java |   0
 .../cache/redis/RedisCacheProvider.java       |   0
 .../nicko/storage/json/JSONStorage.java       |   0
 .../storage/json/JSONStorageProvider.java     |   0
 .../nicko/storage/name/PlayerNameStore.java   |   0
 .../nicko/storage/sql/SQLStorage.java         |   0
 .../nicko/storage/sql/SQLStorageProvider.java |   0
 {core/src => src}/main/resources/config.yml   |   0
 {core/src => src}/main/resources/en.yml       |   0
 {core/src => src}/main/resources/fr.yml       |   0
 {core/src => src}/main/resources/plugin.yml   |   0
 .../nicko/test/NickoPluginTest.java           |   0
 .../nicko/test/config/ConfigurationTest.java  |   0
 .../nicko/test/storage/BrokenSQLTest.java     |   0
 .../nicko/test/storage/SQLStorageTest.java    |   0
 .../test/storage/cache/CacheStorageTest.java  |   0
 68 files changed, 171 insertions(+), 194 deletions(-)
 delete mode 100644 core/pom.xml
 rename {core/src => src}/main/java/net/artelnatif/nicko/NickoBukkit.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/anvil/AnvilManager.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/appearance/AppearanceManager.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/command/NickoCommand.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/config/Configuration.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/config/ConfigurationManager.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/disguise/ActionResult.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/disguise/NickoProfile.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/AdminGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/MainGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/SettingsGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/i18n/I18N.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/i18n/I18NDict.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/i18n/Locale.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/mojang/MojangAPI.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/mojang/MojangSkin.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/mojang/MojangUtils.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/Storage.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/StorageProvider.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/cache/Cache.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java (100%)
 rename {core/src => src}/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java (100%)
 rename {core/src => src}/main/resources/config.yml (100%)
 rename {core/src => src}/main/resources/en.yml (100%)
 rename {core/src => src}/main/resources/fr.yml (100%)
 rename {core/src => src}/main/resources/plugin.yml (100%)
 rename {core/src => src}/test/java/net/artelnatif/nicko/test/NickoPluginTest.java (100%)
 rename {core/src => src}/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java (100%)
 rename {core/src => src}/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java (100%)
 rename {core/src => src}/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java (100%)
 rename {core/src => src}/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java (100%)

diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index dc79a10..0000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>core</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <parent>
-        <groupId>net.artelnatif</groupId>
-        <artifactId>nicko-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/repository/public/</url>
-        </repository>
-        <repository>
-            <id>papermc</id>
-            <url>https://repo.papermc.io/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>codemc-snapshots</id>
-            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
-        </repository>
-        <repository>
-            <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>5.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- PlaceHolder API -->
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Spigot API -->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.19.4-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Inventory Lib -->
-        <dependency>
-            <groupId>xyz.xenondevs.invui</groupId>
-            <artifactId>invui</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <!-- AnvilGUI -->
-        <dependency>
-            <groupId>net.wesjd</groupId>
-            <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
-        </dependency>
-        <!-- Google Guava (GSON) -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- MockBukkit 1.19 (Bukkit Unit Tests) -->
-        <dependency>
-            <groupId>com.github.seeseemelk</groupId>
-            <artifactId>MockBukkit-v1.19</artifactId>
-            <version>2.29.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- MariaDB JDBC Driver -->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.2</version>
-        </dependency>
-        <!-- YAML Reader -->
-        <dependency>
-            <groupId>com.github.jsixface</groupId>
-            <artifactId>yamlconfig</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.13.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.3</version>
-        </dependency>
-        <!-- Redis -->
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>4.3.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>net.wesjd:anvilgui</include>
-                                    <include>xyz.xenondevs.invui:*</include>
-                                    <include>com.github.jsixface:*</include>
-                                    <include>com.fasterxml.jackson.dataformat</include>
-                                    <include>com.fasterxml.jackson.core</include>
-                                    <include>org.mariadb.jdbc</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>net.wesjd.anvilgui</pattern>
-                                    <shadedPattern>net.artelnatif.libs.anvilgui</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>xyz.xenondevs.invui</pattern>
-                                    <shadedPattern>net.artelnatif.libs.invui</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.github.jsixface</pattern>
-                                    <shadedPattern>net.artelnatif.libs.yaml</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.fasterxml.jackson.dataformat</pattern>
-                                    <shadedPattern>net.artelnatif.libs.jackson.yaml</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.fasterxml.jackson.core</pattern>
-                                    <shadedPattern>net.artelnatif.libs.jackson.core</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.mariadb.jdbc</pattern>
-                                    <shadedPattern>net.artelnatif.libs.mariadb</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <!-- Prevents breaking AnvilGUI's VersionWrapper. -->
-                            <minimizeJar>false</minimizeJar>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
-            </resource>
-        </resources>
-    </build>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c2fa63a..d0ef690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,17 +5,182 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.artelnatif</groupId>
-    <artifactId>nicko-parent</artifactId>
+    <artifactId>nicko</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>Nicko</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>core</module>
-    </modules>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <repositories>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/repository/public/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+        </repository>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>5.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- PlaceHolder API -->
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.11.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Spigot API -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Inventory Lib -->
+        <dependency>
+            <groupId>xyz.xenondevs.invui</groupId>
+            <artifactId>invui</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!-- AnvilGUI -->
+        <dependency>
+            <groupId>net.wesjd</groupId>
+            <artifactId>anvilgui</artifactId>
+            <version>1.6.3-SNAPSHOT</version>
+        </dependency>
+        <!-- Google Guava (GSON) -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- MockBukkit 1.19 (Bukkit Unit Tests) -->
+        <dependency>
+            <groupId>com.github.seeseemelk</groupId>
+            <artifactId>MockBukkit-v1.19</artifactId>
+            <version>2.29.0</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- MariaDB JDBC Driver -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <!-- YAML Reader -->
+        <dependency>
+            <groupId>com.github.jsixface</groupId>
+            <artifactId>yamlconfig</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.13.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.13.3</version>
+        </dependency>
+        <!-- Redis -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M7</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>net.wesjd:anvilgui</include>
+                                    <include>xyz.xenondevs.invui:*</include>
+                                    <include>com.github.jsixface:*</include>
+                                    <include>com.fasterxml.jackson.dataformat</include>
+                                    <include>com.fasterxml.jackson.core</include>
+                                    <include>org.mariadb.jdbc</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>net.wesjd.anvilgui</pattern>
+                                    <shadedPattern>net.artelnatif.libs.anvilgui</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>xyz.xenondevs.invui</pattern>
+                                    <shadedPattern>net.artelnatif.libs.invui</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.github.jsixface</pattern>
+                                    <shadedPattern>net.artelnatif.libs.yaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson.dataformat</pattern>
+                                    <shadedPattern>net.artelnatif.libs.jackson.yaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson.core</pattern>
+                                    <shadedPattern>net.artelnatif.libs.jackson.core</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.mariadb.jdbc</pattern>
+                                    <shadedPattern>net.artelnatif.libs.mariadb</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <!-- Prevents breaking AnvilGUI's VersionWrapper. -->
+                            <minimizeJar>false</minimizeJar>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/</directory>
+            </resource>
+        </resources>
+    </build>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/src/main/java/net/artelnatif/nicko/NickoBukkit.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
rename to src/main/java/net/artelnatif/nicko/NickoBukkit.java
diff --git a/core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java b/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
rename to src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/appearance/AppearanceManager.java b/src/main/java/net/artelnatif/nicko/appearance/AppearanceManager.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/appearance/AppearanceManager.java
rename to src/main/java/net/artelnatif/nicko/appearance/AppearanceManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java b/src/main/java/net/artelnatif/nicko/command/NickoCommand.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java
rename to src/main/java/net/artelnatif/nicko/command/NickoCommand.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java b/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
rename to src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java b/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
rename to src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/config/Configuration.java b/src/main/java/net/artelnatif/nicko/config/Configuration.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/config/Configuration.java
rename to src/main/java/net/artelnatif/nicko/config/Configuration.java
diff --git a/core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java b/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
rename to src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java b/src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java
rename to src/main/java/net/artelnatif/nicko/config/DataSourceConfiguration.java
diff --git a/core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java b/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
rename to src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
diff --git a/core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java b/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
rename to src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
diff --git a/core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java b/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
rename to src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
diff --git a/core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java b/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
rename to src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java b/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/AdminGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java b/src/main/java/net/artelnatif/nicko/gui/MainGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/MainGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java b/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java b/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java b/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailedGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java b/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java
rename to src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java b/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java
rename to src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java b/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java
rename to src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java b/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java
rename to src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java b/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java
rename to src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java b/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java
rename to src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java b/src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java
rename to src/main/java/net/artelnatif/nicko/gui/items/common/OptionUnavailable.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java b/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java
rename to src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java b/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java
rename to src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java b/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java b/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java b/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java
rename to src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java b/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java
rename to src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java b/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java
rename to src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java b/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java
rename to src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java b/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java
rename to src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java b/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java
rename to src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java
diff --git a/core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java b/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java
rename to src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java
diff --git a/core/src/main/java/net/artelnatif/nicko/i18n/I18N.java b/src/main/java/net/artelnatif/nicko/i18n/I18N.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/i18n/I18N.java
rename to src/main/java/net/artelnatif/nicko/i18n/I18N.java
diff --git a/core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java b/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
rename to src/main/java/net/artelnatif/nicko/i18n/I18NDict.java
diff --git a/core/src/main/java/net/artelnatif/nicko/i18n/Locale.java b/src/main/java/net/artelnatif/nicko/i18n/Locale.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/i18n/Locale.java
rename to src/main/java/net/artelnatif/nicko/i18n/Locale.java
diff --git a/core/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java b/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
rename to src/main/java/net/artelnatif/nicko/i18n/LocaleFileManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java b/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
rename to src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java b/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
rename to src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java b/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
rename to src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
diff --git a/core/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java b/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
rename to src/main/java/net/artelnatif/nicko/placeholder/NickoExpansion.java
diff --git a/core/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java b/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
rename to src/main/java/net/artelnatif/nicko/placeholder/PlaceHolderHook.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
rename to src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/Storage.java b/src/main/java/net/artelnatif/nicko/storage/Storage.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/Storage.java
rename to src/main/java/net/artelnatif/nicko/storage/Storage.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java b/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
rename to src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/cache/Cache.java b/src/main/java/net/artelnatif/nicko/storage/cache/Cache.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/cache/Cache.java
rename to src/main/java/net/artelnatif/nicko/storage/cache/Cache.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java b/src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java
rename to src/main/java/net/artelnatif/nicko/storage/cache/CacheProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java b/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java
rename to src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCache.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java b/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java
rename to src/main/java/net/artelnatif/nicko/storage/cache/redis/RedisCacheProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java b/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
rename to src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java b/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
rename to src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java b/src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java
rename to src/main/java/net/artelnatif/nicko/storage/name/PlayerNameStore.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java b/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
rename to src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java b/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
rename to src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
diff --git a/core/src/main/resources/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from core/src/main/resources/config.yml
rename to src/main/resources/config.yml
diff --git a/core/src/main/resources/en.yml b/src/main/resources/en.yml
similarity index 100%
rename from core/src/main/resources/en.yml
rename to src/main/resources/en.yml
diff --git a/core/src/main/resources/fr.yml b/src/main/resources/fr.yml
similarity index 100%
rename from core/src/main/resources/fr.yml
rename to src/main/resources/fr.yml
diff --git a/core/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from core/src/main/resources/plugin.yml
rename to src/main/resources/plugin.yml
diff --git a/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java b/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
rename to src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
diff --git a/core/src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java b/src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java
rename to src/test/java/net/artelnatif/nicko/test/config/ConfigurationTest.java
diff --git a/core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java b/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
rename to src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
diff --git a/core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java b/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
rename to src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
diff --git a/core/src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java b/src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java
rename to src/test/java/net/artelnatif/nicko/test/storage/cache/CacheStorageTest.java