diff --git a/dist/dependency-reduced-pom.xml b/dist/dependency-reduced-pom.xml
index dd3ab08..9ac078f 100644
--- a/dist/dependency-reduced-pom.xml
+++ b/dist/dependency-reduced-pom.xml
@@ -24,7 +24,7 @@
             <configuration>
               <artifactSet>
                 <includes>
-                  <include>net.artelnatif:nicko-*</include>
+                  <include>net.artelnatif:*</include>
                 </includes>
               </artifactSet>
             </configuration>
diff --git a/dist/pom.xml b/dist/pom.xml
index f090d9e..2b838e5 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -30,7 +30,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>net.artelnatif:nicko-*</include>
+                                    <include>net.artelnatif:*</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -46,11 +46,21 @@
             <artifactId>nicko-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>nicko-v1_18_R1</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
             <artifactId>nicko-v1_18_R2</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>nicko-v1_19_R1</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/core/dependency-reduced-pom.xml b/nicko-core/dependency-reduced-pom.xml
similarity index 94%
rename from core/dependency-reduced-pom.xml
rename to nicko-core/dependency-reduced-pom.xml
index 551faa3..4b22f67 100644
--- a/core/dependency-reduced-pom.xml
+++ b/nicko-core/dependency-reduced-pom.xml
@@ -35,7 +35,6 @@
             <configuration>
               <artifactSet>
                 <includes>
-                  <include>net.artelnatif:nicko-*</include>
                   <include>xyz.upperlevel.spigot.book:spigot-book-api</include>
                   <include>net.wesjd:anvilgui</include>
                 </includes>
@@ -93,7 +92,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0-M1</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/core/pom.xml b/nicko-core/pom.xml
similarity index 97%
rename from core/pom.xml
rename to nicko-core/pom.xml
index 2bae2bb..9836dea 100644
--- a/core/pom.xml
+++ b/nicko-core/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.0-M1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -92,7 +92,6 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>net.artelnatif:nicko-*</include>
                                     <include>xyz.upperlevel.spigot.book:spigot-book-api</include>
                                     <include>net.wesjd:anvilgui</include>
                                 </includes>
diff --git a/core/src/main/java/com/yoshiplex/rainbow/RainbowText.java b/nicko-core/src/main/java/com/yoshiplex/rainbow/RainbowText.java
similarity index 100%
rename from core/src/main/java/com/yoshiplex/rainbow/RainbowText.java
rename to nicko-core/src/main/java/com/yoshiplex/rainbow/RainbowText.java
diff --git a/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
diff --git a/core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
diff --git a/core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java
diff --git a/core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/NickoPermissions.java b/nicko-core/src/main/java/net/artelnatif/nicko/command/NickoPermissions.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/NickoPermissions.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/command/NickoPermissions.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/NickoTabCompleter.java b/nicko-core/src/main/java/net/artelnatif/nicko/command/NickoTabCompleter.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/NickoTabCompleter.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/command/NickoTabCompleter.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java b/nicko-core/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 nicko-core/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/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoGUISubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoGUISubCmd.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/sub/NickoGUISubCmd.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoGUISubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/command/sub/NickoSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoSubCmd.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/command/sub/NickoSubCmd.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoSubCmd.java
diff --git a/core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java b/nicko-core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java
diff --git a/core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
diff --git a/core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
diff --git a/core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
diff --git a/core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
diff --git a/core/src/main/java/net/artelnatif/nicko/i18n/I18N.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/i18n/I18N.java
diff --git a/core/src/main/java/net/artelnatif/nicko/impl/Internals.java b/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/impl/Internals.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
diff --git a/core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java b/nicko-core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
diff --git a/core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
diff --git a/core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java b/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/Storage.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/storage/Storage.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java b/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java b/nicko-core/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 nicko-core/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/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java b/nicko-core/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 nicko-core/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/nicko-core/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 nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
diff --git a/core/src/main/java/net/artelnatif/nicko/utils/PlayerUtils.java b/nicko-core/src/main/java/net/artelnatif/nicko/utils/PlayerUtils.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/utils/PlayerUtils.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/utils/PlayerUtils.java
diff --git a/core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java b/nicko-core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java
similarity index 100%
rename from core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java
diff --git a/core/src/main/resources/bungee.yml b/nicko-core/src/main/resources/bungee.yml
similarity index 100%
rename from core/src/main/resources/bungee.yml
rename to nicko-core/src/main/resources/bungee.yml
diff --git a/core/src/main/resources/config.yml b/nicko-core/src/main/resources/config.yml
similarity index 100%
rename from core/src/main/resources/config.yml
rename to nicko-core/src/main/resources/config.yml
diff --git a/core/src/main/resources/plugin.yml b/nicko-core/src/main/resources/plugin.yml
similarity index 100%
rename from core/src/main/resources/plugin.yml
rename to nicko-core/src/main/resources/plugin.yml
diff --git a/core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java b/nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java
similarity index 100%
rename from core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java
rename to nicko-core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java
diff --git a/pom.xml b/pom.xml
index bc5ab6e..b7e4c1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>core</module>
+        <module>nicko-core</module>
         <module>dist</module>
         <module>v1_18_R2</module>
         <module>v1_18_R1</module>
diff --git a/v1_18_R1/src/main/java/net/artelnatif/impl/v1_18_R1.java b/v1_18_R1/src/main/java/net/artelnatif/nicko/impl/v1_18_R1.java
similarity index 98%
rename from v1_18_R1/src/main/java/net/artelnatif/impl/v1_18_R1.java
rename to v1_18_R1/src/main/java/net/artelnatif/nicko/impl/v1_18_R1.java
index 1bd0558..19e7a7f 100644
--- a/v1_18_R1/src/main/java/net/artelnatif/impl/v1_18_R1.java
+++ b/v1_18_R1/src/main/java/net/artelnatif/nicko/impl/v1_18_R1.java
@@ -1,11 +1,10 @@
-package net.artelnatif.impl;
+package net.artelnatif.nicko.impl;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
 import net.artelnatif.nicko.NickoBukkit;
 import net.artelnatif.nicko.disguise.NickoProfile;
-import net.artelnatif.nicko.impl.Internals;
 import net.artelnatif.nicko.mojang.MojangSkin;
 import net.minecraft.network.chat.IChatBaseComponent;
 import net.minecraft.network.protocol.game.*;
diff --git a/v1_19_R1/pom.xml b/v1_19_R1/pom.xml
index dc4803f..308ec46 100644
--- a/v1_19_R1/pom.xml
+++ b/v1_19_R1/pom.xml
@@ -2,14 +2,16 @@
 <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">
-    <parent>
-        <artifactId>nicko-parent</artifactId>
-        <groupId>net.artelnatif</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>net.artelnatif</groupId>
+        <artifactId>nicko-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>nicko-v1_19_R1</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -24,5 +26,4 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
 </project>
\ No newline at end of file