diff --git a/composer.json b/composer.json
index 2339e75..97ea146 100755
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Djereg\\Laravel\\RabbitMQ\\": "src",
-      "Djereg\\Laravel\\RabbitMQ\\Core\\": "src/core",
-      "Djereg\\Laravel\\RabbitMQ\\Event\\": "src/event",
-      "Djereg\\Laravel\\RabbitMQ\\RPC\\Client\\": "src/client",
-      "Djereg\\Laravel\\RabbitMQ\\RPC\\Server\\": "src/server"
+      "Djereg\\Laravel\\RabbitMQ\\": "src"
     }
   },
   "autoload-dev": {
diff --git a/src/Providers/EventServiceProvider.php b/src/Providers/EventServiceProvider.php
index a71c534..12997c1 100644
--- a/src/Providers/EventServiceProvider.php
+++ b/src/Providers/EventServiceProvider.php
@@ -36,4 +36,9 @@ public function register(): void
             }
         });
     }
+
+    public function shouldDiscoverEvents(): bool
+    {
+        return true;
+    }
 }