diff --git a/nicko-core/dependency-reduced-pom.xml b/core/dependency-reduced-pom.xml
similarity index 100%
rename from nicko-core/dependency-reduced-pom.xml
rename to core/dependency-reduced-pom.xml
diff --git a/nicko-core/pom.xml b/core/pom.xml
similarity index 99%
rename from nicko-core/pom.xml
rename to core/pom.xml
index 642bcdb..ba2f9a7 100644
--- a/nicko-core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nicko-core</artifactId>
+    <artifactId>core</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java b/core/src/main/java/net/artelnatif/nicko/Nicko.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
rename to core/src/main/java/net/artelnatif/nicko/Nicko.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/BungeeCordSupport.java b/core/src/main/java/net/artelnatif/nicko/bukkit/BungeeCordSupport.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/BungeeCordSupport.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/BungeeCordSupport.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java b/core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java b/core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java b/core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/appearance/AppearanceManager.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java b/core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java b/core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java b/core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java b/core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerJoinListener.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java b/core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/event/PlayerQuitListener.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java b/core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java b/core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18N.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java b/core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/i18n/I18NDict.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java b/core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/i18n/Locale.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java b/core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/i18n/LocaleFileManager.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java b/core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/NickoExpansion.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java b/core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/placeholder/PlaceHolderHook.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java b/core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java
rename to core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java b/core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
rename to core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/FetchMessageListener.java b/core/src/main/java/net/artelnatif/nicko/bungee/event/FetchMessageListener.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/FetchMessageListener.java
rename to core/src/main/java/net/artelnatif/nicko/bungee/event/FetchMessageListener.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/UpdateMessageListener.java b/core/src/main/java/net/artelnatif/nicko/bungee/event/UpdateMessageListener.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/UpdateMessageListener.java
rename to core/src/main/java/net/artelnatif/nicko/bungee/event/UpdateMessageListener.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java b/core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
rename to core/src/main/java/net/artelnatif/nicko/bungee/message/MessageDecoder.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java b/core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java
rename to core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/config/Configuration.java b/core/src/main/java/net/artelnatif/nicko/config/Configuration.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/config/Configuration.java
rename to core/src/main/java/net/artelnatif/nicko/config/Configuration.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java b/core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
rename to core/src/main/java/net/artelnatif/nicko/config/ConfigurationManager.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java b/core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
rename to core/src/main/java/net/artelnatif/nicko/disguise/ActionResult.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java b/core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
rename to core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java b/core/src/main/java/net/artelnatif/nicko/impl/Internals.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/impl/Internals.java
rename to core/src/main/java/net/artelnatif/nicko/impl/Internals.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java b/core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
rename to core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java b/core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
rename to core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java b/core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
rename to core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java b/core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
rename to core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
rename to core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/Storage.java b/core/src/main/java/net/artelnatif/nicko/storage/Storage.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/Storage.java
rename to core/src/main/java/net/artelnatif/nicko/storage/Storage.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java b/core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
rename to core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java b/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
rename to core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java b/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
rename to core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java b/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
rename to core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java b/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
rename to core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
diff --git a/nicko-core/src/main/resources/bungee.yml b/core/src/main/resources/bungee.yml
similarity index 100%
rename from nicko-core/src/main/resources/bungee.yml
rename to core/src/main/resources/bungee.yml
diff --git a/nicko-core/src/main/resources/config.yml b/core/src/main/resources/config.yml
similarity index 100%
rename from nicko-core/src/main/resources/config.yml
rename to core/src/main/resources/config.yml
diff --git a/nicko-core/src/main/resources/en.yml b/core/src/main/resources/en.yml
similarity index 100%
rename from nicko-core/src/main/resources/en.yml
rename to core/src/main/resources/en.yml
diff --git a/nicko-core/src/main/resources/fr.yml b/core/src/main/resources/fr.yml
similarity index 100%
rename from nicko-core/src/main/resources/fr.yml
rename to core/src/main/resources/fr.yml
diff --git a/nicko-core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
similarity index 100%
rename from nicko-core/src/main/resources/plugin.yml
rename to core/src/main/resources/plugin.yml
diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java b/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
similarity index 100%
rename from nicko-core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
rename to core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java b/core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
similarity index 100%
rename from nicko-core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
rename to core/src/test/java/net/artelnatif/nicko/test/storage/BrokenSQLTest.java
diff --git a/nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java b/core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
similarity index 100%
rename from nicko-core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
rename to core/src/test/java/net/artelnatif/nicko/test/storage/SQLStorageTest.java
diff --git a/dist/pom.xml b/dist/pom.xml
index d81b2f5..680582d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -76,32 +76,57 @@
     <dependencies>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-v1_17_R1</artifactId>
+            <artifactId>v1_14_R1</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-v1_18_R1</artifactId>
+            <artifactId>v1_15_R1</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-v1_18_R2</artifactId>
+            <artifactId>v1_16_R1</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-v1_19_R1</artifactId>
+            <artifactId>v1_16_R2</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-v1_19_R2</artifactId>
+            <artifactId>v1_16_R3</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>v1_17_R1</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>v1_18_R1</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>v1_18_R2</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>v1_19_R1</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.artelnatif</groupId>
+            <artifactId>v1_19_R2</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 31e0c49..7836e09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,13 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>nicko-core</module>
+        <module>core</module>
         <module>dist</module>
+        <module>v1_14_R1</module>
+        <module>v1_15_R1</module>
+        <module>v1_16_R1</module>
+        <module>v1_16_R2</module>
+        <module>v1_16_R3</module>
         <module>v1_17_R1</module>
         <module>v1_18_R1</module>
         <module>v1_18_R2</module>
diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml
index 2fb37e9..7ca2642 100644
--- a/v1_17_R1/pom.xml
+++ b/v1_17_R1/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nicko-v1_17_R1</artifactId>
+    <artifactId>v1_17_R1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/v1_18_R1/pom.xml b/v1_18_R1/pom.xml
index b97ff0c..d842952 100644
--- a/v1_18_R1/pom.xml
+++ b/v1_18_R1/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>nicko-v1_18_R1</artifactId>
+    <artifactId>v1_18_R1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml
index 2d8d8f7..4eb30ad 100644
--- a/v1_18_R2/pom.xml
+++ b/v1_18_R2/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>nicko-v1_18_R2</artifactId>
+    <artifactId>v1_18_R2</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/v1_19_R1/pom.xml b/v1_19_R1/pom.xml
index 308ec46..ccdb982 100644
--- a/v1_19_R1/pom.xml
+++ b/v1_19_R1/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>nicko-v1_19_R1</artifactId>
+    <artifactId>v1_19_R1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/v1_19_R2/pom.xml b/v1_19_R2/pom.xml
index ee71c1d..52dd10e 100644
--- a/v1_19_R2/pom.xml
+++ b/v1_19_R2/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>nicko-v1_19_R2</artifactId>
+    <artifactId>v1_19_R2</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>net.artelnatif</groupId>
-            <artifactId>nicko-core</artifactId>
+            <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>