diff --git a/.env.dev.example b/.env.dev.example
index a6dec8e9..3637656e 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -2,10 +2,13 @@ APP_ENV=dev
 APP_KEY=base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI=
 APP_DEBUG=true
 APP_LOCALE=en
-APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 APP_SETTINGS_STORE=json
 
+APP_LOG=daily
+APP_LOG_LEVEL=debug
+APP_LOG_MAX_FILES=7
+
 DB_CONNECTION=local
 DB_HOST=127.0.0.1
 DB_PORT=3306
diff --git a/app/Events/TestEvent.php b/app/Events/TestEvent.php
new file mode 100644
index 00000000..a0ad6c80
--- /dev/null
+++ b/app/Events/TestEvent.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\User;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+class TestEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 1cde5718..5797eb9e 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -8,7 +8,6 @@ class HomeController extends AppBaseController
 {
     /**
      * Show the application dashboard.
-     * @return \Illuminate\Http\Response
      */
     public function index()
     {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index a182657e..87517454 100755
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -13,9 +13,9 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\SomeEvent' => [
+        /*'App\Events\TestEvent' => [
             'App\Listeners\EventListener',
-        ],
+        ],*/
     ];
 
     /**
diff --git a/composer.json b/composer.json
index ae985a23..d9dd3434 100755
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,8 @@
         "mockery/mockery": "0.9.*",
         "laravel/homestead": "v6.2.2",
         "filp/whoops": "~2.0",
-        "orchestra/testbench": "v3.5.2"
+        "orchestra/testbench": "v3.5.2",
+        "bpocallaghan/generators": "5.0.1"
     },
     "autoload": {
         "classmap": [
diff --git a/composer.lock b/composer.lock
index 67f4b8db..b993e76b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "33bef024a559e95406c1115a955a8c5e",
+    "content-hash": "0cb626a4524ce3b7000623610d46d686",
     "packages": [
         {
             "name": "anlutro/l4-settings",
@@ -6654,6 +6654,57 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "bpocallaghan/generators",
+            "version": "5.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bpocallaghan/generators.git",
+                "reference": "69641f0b43e996e2155b43bb87af296dd3ef6349"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bpocallaghan/generators/zipball/69641f0b43e996e2155b43bb87af296dd3ef6349",
+                "reference": "69641f0b43e996e2155b43bb87af296dd3ef6349",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Bpocallaghan\\Generators\\GeneratorsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Bpocallaghan\\Generators\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ben-Piet O'Callaghan",
+                    "email": "bpocallaghan@gmail.com"
+                }
+            ],
+            "description": "Custom Laravel 5 File Generators with config and publishable stubs.",
+            "keywords": [
+                "commands",
+                "config",
+                "customization",
+                "generators",
+                "laravel",
+                "stubs"
+            ],
+            "time": "2017-11-16T12:28:04+00:00"
+        },
         {
             "name": "filp/whoops",
             "version": "2.1.14",
diff --git a/config/app.php b/config/app.php
index 10dc83ef..c5e21f57 100755
--- a/config/app.php
+++ b/config/app.php
@@ -15,8 +15,9 @@ return [
     'key' => env('APP_KEY'),
     'cipher' => 'AES-256-CBC',
 
-    'log' => env('APP_LOG', 'single'),
+    'log' => env('APP_LOG', 'daily'),
     'log_level' => env('APP_LOG_LEVEL', 'debug'),
+    'log_max_files' => env('APP_LOG_MAX_FILES', 7),
 
     'providers' => [
 
diff --git a/config/modules.php b/config/modules.php
index d4d134f0..fa118b64 100644
--- a/config/modules.php
+++ b/config/modules.php
@@ -8,12 +8,13 @@ return [
         'enabled' => true,
         'path' => resource_path() . '/stubs/modules',
         'files' => [
-            'start' => 'start.php',
             'routes' => 'Http/routes.php',
+            'event-service-provider' => 'Providers/EventServiceProvider.php',
             'views/index' => 'Resources/views/index.blade.php',
             'views/index-admin' => 'Resources/views/admin/index.blade.php',
             'views/frontend' => 'Resources/views/layouts/frontend.blade.php',
             'views/admin' => 'Resources/views/layouts/admin.blade.php',
+            'listener-test' => 'Listeners/TestEventListener.php',
             'controller-admin' => 'Http/Controllers/AdminController.php',
             'scaffold/config' => 'Config/config.php',
             'composer' => 'composer.json',
@@ -22,6 +23,8 @@ return [
             'start' => ['LOWER_NAME', 'ROUTES_LOCATION'],
             'routes' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
             'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
+            'event-service-provider' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
+            'listener-test' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
             'views/index' => ['LOWER_NAME'],
             'views/index-admin' => ['LOWER_NAME', 'STUDLY_NAME'],
             'views/frontend' => ['STUDLY_NAME'],
@@ -60,7 +63,7 @@ return [
             'test' => ['path' => 'tests', 'generate' => true],
             'repository' => ['path' => 'Repositories', 'generate' => false],
             'event' => ['path' => 'Events', 'generate' => false],
-            'listener' => ['path' => 'Listeners', 'generate' => false],
+            'listener' => ['path' => 'Listeners', 'generate' => true],
             'policies' => ['path' => 'Policies', 'generate' => false],
             'rules' => ['path' => 'Rules', 'generate' => false],
             'jobs' => ['path' => 'Jobs', 'generate' => false],
diff --git a/modules/Sample/composer.json b/modules/Sample/composer.json
index 90256c27..1aaf7abc 100644
--- a/modules/Sample/composer.json
+++ b/modules/Sample/composer.json
@@ -10,10 +10,11 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Modules\\Sample\\Providers\\SampleServiceProvider"
+                "Modules\\Sample\\Providers\\SampleServiceProvider",
+                "Modules\\Sample\\Providers\\EventServiceProvider"
             ],
             "aliases": {
-                
+
             }
         }
     },
diff --git a/modules/Sample/module.json b/modules/Sample/module.json
index 4f60e44c..7f563f3b 100644
--- a/modules/Sample/module.json
+++ b/modules/Sample/module.json
@@ -6,11 +6,10 @@
     "active": 1,
     "order": 0,
     "providers": [
-        "Modules\\Sample\\Providers\\SampleServiceProvider"
+        "Modules\\Sample\\Providers\\SampleServiceProvider",
+        "Modules\\Sample\\Providers\\EventServiceProvider"
     ],
     "aliases": {},
-    "files": [
-        "start.php"
-    ],
+    "files": [],
     "requires": []
 }
diff --git a/modules/Sample/start.php b/modules/Sample/start.php
deleted file mode 100644
index f062bff0..00000000
--- a/modules/Sample/start.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register Namespaces And Routes
-|--------------------------------------------------------------------------
-|
-| When a module starting, this file will executed automatically. This helps
-| to register some namespaces like translator or view. Also this file
-| will load the routes file for each module. You may also modify
-| this file as you want.
-|
-*/
-
-/*if (!app()->routesAreCached()) {
-    require __DIR__ . '/Http/routes.php';
-}*/
diff --git a/resources/stubs/modules/composer.stub b/resources/stubs/modules/composer.stub
index cdaa56c6..9b4e90c5 100644
--- a/resources/stubs/modules/composer.stub
+++ b/resources/stubs/modules/composer.stub
@@ -10,10 +10,11 @@
     "extra": {
         "laravel": {
             "providers": [
-                "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\$STUDLY_NAME$ServiceProvider"
+                "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\$STUDLY_NAME$ServiceProvider",
+                "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\EventServiceProvider"
             ],
             "aliases": {
-                
+
             }
         }
     },
diff --git a/resources/stubs/modules/event-service-provider.stub b/resources/stubs/modules/event-service-provider.stub
new file mode 100644
index 00000000..d7b03ca8
--- /dev/null
+++ b/resources/stubs/modules/event-service-provider.stub
@@ -0,0 +1,25 @@
+<?php
+
+namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Providers;
+
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event listener mappings for the application.
+     */
+    protected $listen = [
+        'App\Events\TestEvent' => [
+            '$MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners\TestEventListener',
+        ],
+    ];
+
+    /**
+     * Register any events for your application.
+     */
+    public function boot()
+    {
+        parent::boot();
+    }
+}
diff --git a/resources/stubs/modules/json.stub b/resources/stubs/modules/json.stub
index 19e544db..4f2ddfe8 100644
--- a/resources/stubs/modules/json.stub
+++ b/resources/stubs/modules/json.stub
@@ -6,11 +6,10 @@
     "active": 1,
     "order": 0,
     "providers": [
-        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\$STUDLY_NAME$ServiceProvider"
+        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\$STUDLY_NAME$ServiceProvider",
+        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\EventServiceProvider"
     ],
     "aliases": {},
-    "files": [
-        "start.php"
-    ],
+    "files": [],
     "requires": []
 }
diff --git a/resources/stubs/modules/listener-test.stub b/resources/stubs/modules/listener-test.stub
new file mode 100644
index 00000000..5d3b2e84
--- /dev/null
+++ b/resources/stubs/modules/listener-test.stub
@@ -0,0 +1,16 @@
+<?php
+
+namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners;
+
+use App\Events\TestEvent;
+use Log;
+
+class TestEventListener
+{
+    /**
+     * Handle the event.
+     */
+    public function handle(TestEvent $event) {
+        Log::info('Received event', [$event]);
+    }
+}