diff --git a/new-implementation/lib/IslandWorld-8.5.jar b/core/lib/IslandWorld-8.5.jar
similarity index 100%
rename from new-implementation/lib/IslandWorld-8.5.jar
rename to core/lib/IslandWorld-8.5.jar
diff --git a/new-implementation/lib/Towny-0.93.1.0.jar b/core/lib/Towny-0.93.1.0.jar
similarity index 100%
rename from new-implementation/lib/Towny-0.93.1.0.jar
rename to core/lib/Towny-0.93.1.0.jar
diff --git a/new-implementation/pom.xml b/core/pom.xml
similarity index 99%
rename from new-implementation/pom.xml
rename to core/pom.xml
index 8d2eb2e..2e96300 100644
--- a/new-implementation/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.epiceric.shopchest</groupId>
-    <artifactId>shopchest-new</artifactId>
+    <artifactId>shopchest</artifactId>
     <version>1.13-SNAPSHOT</version>
 
     <name>ShopChest</name>
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/ShopChestImpl.java b/core/src/main/java/de/epiceric/shopchest/ShopChestImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/ShopChestImpl.java
rename to core/src/main/java/de/epiceric/shopchest/ShopChestImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/ShopManagerImpl.java b/core/src/main/java/de/epiceric/shopchest/ShopManagerImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/ShopManagerImpl.java
rename to core/src/main/java/de/epiceric/shopchest/ShopManagerImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/command/CreateSubCommand.java b/core/src/main/java/de/epiceric/shopchest/command/CreateSubCommand.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/command/CreateSubCommand.java
rename to core/src/main/java/de/epiceric/shopchest/command/CreateSubCommand.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/command/InfoSubCommand.java b/core/src/main/java/de/epiceric/shopchest/command/InfoSubCommand.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/command/InfoSubCommand.java
rename to core/src/main/java/de/epiceric/shopchest/command/InfoSubCommand.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/command/RemoveSubCommand.java b/core/src/main/java/de/epiceric/shopchest/command/RemoveSubCommand.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/command/RemoveSubCommand.java
rename to core/src/main/java/de/epiceric/shopchest/command/RemoveSubCommand.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java b/core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java
rename to core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/config/ConfigManager.java b/core/src/main/java/de/epiceric/shopchest/config/ConfigManager.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/config/ConfigManager.java
rename to core/src/main/java/de/epiceric/shopchest/config/ConfigManager.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/database/Database.java b/core/src/main/java/de/epiceric/shopchest/database/Database.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/database/Database.java
rename to core/src/main/java/de/epiceric/shopchest/database/Database.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/database/MySQL.java b/core/src/main/java/de/epiceric/shopchest/database/MySQL.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/database/MySQL.java
rename to core/src/main/java/de/epiceric/shopchest/database/MySQL.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/database/SQLite.java b/core/src/main/java/de/epiceric/shopchest/database/SQLite.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/database/SQLite.java
rename to core/src/main/java/de/epiceric/shopchest/database/SQLite.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/ChestInteractListener.java b/core/src/main/java/de/epiceric/shopchest/listener/ChestInteractListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/ChestInteractListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/ChestInteractListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/ChunkLoadListener.java b/core/src/main/java/de/epiceric/shopchest/listener/ChunkLoadListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/ChunkLoadListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/ChunkLoadListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/CreativeSelectListener.java b/core/src/main/java/de/epiceric/shopchest/listener/CreativeSelectListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/CreativeSelectListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/CreativeSelectListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/PlayerJoinQuitListener.java b/core/src/main/java/de/epiceric/shopchest/listener/PlayerJoinQuitListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/PlayerJoinQuitListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/PlayerJoinQuitListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/ShopCommandListener.java b/core/src/main/java/de/epiceric/shopchest/listener/internal/ShopCommandListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/ShopCommandListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/internal/ShopCommandListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/ShopInteractListener.java b/core/src/main/java/de/epiceric/shopchest/listener/internal/ShopInteractListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/ShopInteractListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/internal/ShopInteractListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopCommandMonitorListener.java b/core/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopCommandMonitorListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopCommandMonitorListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopCommandMonitorListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopInteractMonitorListener.java b/core/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopInteractMonitorListener.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopInteractMonitorListener.java
rename to core/src/main/java/de/epiceric/shopchest/listener/internal/monitor/ShopInteractMonitorListener.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/player/ShopPlayerImpl.java b/core/src/main/java/de/epiceric/shopchest/player/ShopPlayerImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/player/ShopPlayerImpl.java
rename to core/src/main/java/de/epiceric/shopchest/player/ShopPlayerImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java b/core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java
rename to core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/shop/ShopProductImpl.java b/core/src/main/java/de/epiceric/shopchest/shop/ShopProductImpl.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/shop/ShopProductImpl.java
rename to core/src/main/java/de/epiceric/shopchest/shop/ShopProductImpl.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/shop/hologram/Hologram.java b/core/src/main/java/de/epiceric/shopchest/shop/hologram/Hologram.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/shop/hologram/Hologram.java
rename to core/src/main/java/de/epiceric/shopchest/shop/hologram/Hologram.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/util/Counter.java b/core/src/main/java/de/epiceric/shopchest/util/Counter.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/util/Counter.java
rename to core/src/main/java/de/epiceric/shopchest/util/Counter.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/util/ItemUtil.java b/core/src/main/java/de/epiceric/shopchest/util/ItemUtil.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/util/ItemUtil.java
rename to core/src/main/java/de/epiceric/shopchest/util/ItemUtil.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/util/Logger.java b/core/src/main/java/de/epiceric/shopchest/util/Logger.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/util/Logger.java
rename to core/src/main/java/de/epiceric/shopchest/util/Logger.java
diff --git a/new-implementation/src/main/java/de/epiceric/shopchest/util/NmsUtil.java b/core/src/main/java/de/epiceric/shopchest/util/NmsUtil.java
similarity index 100%
rename from new-implementation/src/main/java/de/epiceric/shopchest/util/NmsUtil.java
rename to core/src/main/java/de/epiceric/shopchest/util/NmsUtil.java
diff --git a/new-implementation/src/main/resources/config.properties b/core/src/main/resources/config.properties
similarity index 100%
rename from new-implementation/src/main/resources/config.properties
rename to core/src/main/resources/config.properties
diff --git a/new-implementation/src/main/resources/hologram-format.yml b/core/src/main/resources/hologram-format.yml
similarity index 100%
rename from new-implementation/src/main/resources/hologram-format.yml
rename to core/src/main/resources/hologram-format.yml
diff --git a/new-implementation/src/main/resources/item_names.txt b/core/src/main/resources/item_names.txt
similarity index 100%
rename from new-implementation/src/main/resources/item_names.txt
rename to core/src/main/resources/item_names.txt
diff --git a/new-implementation/src/main/resources/lang/de_DE-legacy.lang b/core/src/main/resources/lang/de_DE-legacy.lang
similarity index 100%
rename from new-implementation/src/main/resources/lang/de_DE-legacy.lang
rename to core/src/main/resources/lang/de_DE-legacy.lang
diff --git a/new-implementation/src/main/resources/lang/de_DE.lang b/core/src/main/resources/lang/de_DE.lang
similarity index 100%
rename from new-implementation/src/main/resources/lang/de_DE.lang
rename to core/src/main/resources/lang/de_DE.lang
diff --git a/new-implementation/src/main/resources/lang/en_US-legacy.lang b/core/src/main/resources/lang/en_US-legacy.lang
similarity index 100%
rename from new-implementation/src/main/resources/lang/en_US-legacy.lang
rename to core/src/main/resources/lang/en_US-legacy.lang
diff --git a/new-implementation/src/main/resources/lang/en_US.lang b/core/src/main/resources/lang/en_US.lang
similarity index 100%
rename from new-implementation/src/main/resources/lang/en_US.lang
rename to core/src/main/resources/lang/en_US.lang
diff --git a/new-implementation/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
similarity index 100%
rename from new-implementation/src/main/resources/plugin.yml
rename to core/src/main/resources/plugin.yml
diff --git a/pom.xml b/pom.xml
index 8e0f16e..e73fc26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <modules>
         <module>api</module>
-        <module>new-implementation</module>
+        <module>core</module>
         <module>nms</module>
     </modules>