diff --git a/composer.json b/composer.json
index 0c3ed955..3e279c3a 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,8 @@
             ]
         },
         "classmap": [
-            "classes/"
+            "classes/",
+            "modules/"
         ]
     },
     "replace": {
diff --git a/config/autoload.php b/config/autoload.php
deleted file mode 100644
index 56d6ec46..00000000
--- a/config/autoload.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * notification_center extension for Contao Open Source CMS
- *
- * @copyright  Copyright (c) 2008-2015, terminal42
- * @author     terminal42 gmbh <info@terminal42.ch>
- * @license    LGPL
- */
-
-/**
- * Register PSR-0 namespace
- */
-if (class_exists('NamespaceClassLoader')) {
-    NamespaceClassLoader::add('NotificationCenter', 'system/modules/notification_center/library');
-}
-
-
-/**
- * Register classes outside the namespace folder
- */
-if (class_exists('NamespaceClassLoader')) {
-    NamespaceClassLoader::addClassMap(array
-    (
-        // DCA Helpers
-        'NotificationCenter\tl_form'                => 'system/modules/notification_center/classes/tl_form.php',
-        'NotificationCenter\tl_member'              => 'system/modules/notification_center/classes/tl_member.php',
-        'NotificationCenter\tl_module'              => 'system/modules/notification_center/classes/tl_module.php',
-        'NotificationCenter\tl_nc_gateway'          => 'system/modules/notification_center/classes/tl_nc_gateway.php',
-        'NotificationCenter\tl_nc_notification'     => 'system/modules/notification_center/classes/tl_nc_notification.php',
-        'NotificationCenter\tl_nc_language'         => 'system/modules/notification_center/classes/tl_nc_language.php',
-        'NotificationCenter\tl_nc_message'          => 'system/modules/notification_center/classes/tl_nc_message.php',
-        'NotificationCenter\tl_nc_queue'            => 'system/modules/notification_center/classes/tl_nc_queue.php'
-    ));
-}
-
-
-/**
- * Register Contao classes
- */
-ClassLoader::addClasses(array
-(
-    'Contao\ModulePasswordNotificationCenter'              => 'system/modules/notification_center/modules/ModulePasswordNotificationCenter.php',
-    'Contao\NewsletterModuleTrait'                         => 'system/modules/notification_center/modules/NewsletterModuleTrait.php',
-    'Contao\ModuleNewsletterSubscribeNotificationCenter'   => 'system/modules/notification_center/modules/ModuleNewsletterSubscribeNotificationCenter.php',
-    'Contao\ModuleNewsletterActivateNotificationCenter'    => 'system/modules/notification_center/modules/ModuleNewsletterActivateNotificationCenter.php',
-    'Contao\ModuleNewsletterUnsubscribeNotificationCenter' => 'system/modules/notification_center/modules/ModuleNewsletterUnsubscribeNotificationCenter.php',
-));