diff --git a/composer.json b/composer.json
index b10afb4..387c044 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,16 @@
 	"autoload": {
 		"psr-4": {
 			"cgoIT\\aeo\\": "src/"
-		}
+		},
+		"classmap": [
+			"src/Resources/contao/"
+		],
+		"exclude-from-classmap": [
+			"src/Resources/contao/config/",
+			"src/Resources/contao/dca/",
+			"src/Resources/contao/languages/",
+			"src/Resources/contao/templates/"
+		]
  	},
 	"extra": {
 		"contao-manager-plugin": "cgoIT\\aeo\\ContaoManagerPlugin"
diff --git a/src/ContaoManagerPlugin.php b/src/ContaoManagerPlugin.php
index e62e63e..b464aa6 100644
--- a/src/ContaoManagerPlugin.php
+++ b/src/ContaoManagerPlugin.php
@@ -2,6 +2,7 @@
 
 namespace cgoIT\aeo;
 
+use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
@@ -19,8 +20,8 @@ class ContaoManagerPlugin implements BundlePluginInterface
     public function getBundles(ParserInterface $parser)
     {
         return [
-            BundleConfig::create('CgoITAeoBundle::class')
-                ->setLoadAfter(['Contao\CoreBundle\ContaoCoreBundle'])
+            BundleConfig::create(CgoITAeoBundle::class)
+                ->setLoadAfter([ContaoCoreBundle::class])
                 ->setLoadAfter(['*'])
                 ->setReplace(['aeo']),
         ];