diff --git a/src/main/java/com/alttd/playershops/PlayerShops.java b/src/main/java/com/alttd/playershops/PlayerShops.java
index 2798b6a..2fdac2b 100644
--- a/src/main/java/com/alttd/playershops/PlayerShops.java
+++ b/src/main/java/com/alttd/playershops/PlayerShops.java
@@ -1,7 +1,8 @@
 package com.alttd.playershops;
 
+import com.alttd.playershops.api.ShopHandler;
 import com.alttd.playershops.config.Config;
-import com.alttd.playershops.handler.ShopHandler;
+import com.alttd.playershops.handler.ShopHandlerImpl;
 import com.alttd.playershops.listener.PlayerListener;
 import com.alttd.playershops.listener.ShopListener;
 import lombok.Getter;
@@ -35,7 +36,7 @@ public class PlayerShops extends JavaPlugin {
         registerListeners();
         registerCommands();
 
-        shopHandler = new ShopHandler(instance);
+        shopHandler = new ShopHandlerImpl(instance);
     }
 
     private boolean setupEconomy() {
@@ -56,10 +57,8 @@ public class PlayerShops extends JavaPlugin {
     }
 
     private void registerListeners() {
-        shopListener = new ShopListener();
-        shopListener.register(this);
-        playerListener = new PlayerListener();
-        playerListener.register(this);
+        shopListener = new ShopListener(this);
+        playerListener = new PlayerListener(this);
     }
 
     private void UnregisterListeners() {
diff --git a/src/main/java/com/alttd/playershops/handler/ShopHandler.java b/src/main/java/com/alttd/playershops/handler/ShopHandlerImpl.java
similarity index 95%
rename from src/main/java/com/alttd/playershops/handler/ShopHandler.java
rename to src/main/java/com/alttd/playershops/handler/ShopHandlerImpl.java
index 8cdacb7..56d93f3 100644
--- a/src/main/java/com/alttd/playershops/handler/ShopHandler.java
+++ b/src/main/java/com/alttd/playershops/handler/ShopHandlerImpl.java
@@ -1,6 +1,7 @@
 package com.alttd.playershops.handler;
 
 import com.alttd.playershops.PlayerShops;
+import com.alttd.playershops.api.ShopHandler;
 import com.alttd.playershops.config.Config;
 import com.alttd.playershops.shop.AbstractShop;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -15,7 +16,7 @@ import org.bukkit.block.BlockFace;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class ShopHandler implements com.alttd.playershops.api.ShopHandler {
+public class ShopHandlerImpl implements ShopHandler {
 
     private final PlayerShops plugin;
     @Getter
@@ -25,7 +26,7 @@ public class ShopHandler implements com.alttd.playershops.api.ShopHandler {
     @Getter
     private final ArrayList<Material> shopMaterials;
 
-    public ShopHandler(PlayerShops instance) {
+    public ShopHandlerImpl(PlayerShops instance) {
         plugin = instance;
         shopLocation = new ConcurrentHashMap<>();
         shopBuildLimits = new Object2IntOpenHashMap<>();