diff --git a/composer.json b/composer.json
index 7afbad3..f598a4a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,8 @@
         "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)"
     },
     "autoload": {
-        "psr-0": {
-            "Barryvdh\\LaravelIdeHelper": "src/"
+        "psr-4": {
+            "Barryvdh\\LaravelIdeHelper\\": "src"
         }
     },
     "extra": {
diff --git a/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php b/src/Console/GeneratorCommand.php
old mode 100755
new mode 100644
similarity index 99%
rename from src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php
rename to src/Console/GeneratorCommand.php
index e1e1d55..eb75cab
--- a/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php
+++ b/src/Console/GeneratorCommand.php
@@ -8,7 +8,7 @@
  * @link      https://github.com/barryvdh/laravel-ide-helper
  */
 
-namespace Barryvdh\LaravelIdeHelper;
+namespace Barryvdh\LaravelIdeHelper\Console;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php b/src/Console/ModelsCommand.php
similarity index 99%
rename from src/Barryvdh/LaravelIdeHelper/ModelsCommand.php
rename to src/Console/ModelsCommand.php
index e9f700a..03a6bdb 100644
--- a/src/Barryvdh/LaravelIdeHelper/ModelsCommand.php
+++ b/src/Console/ModelsCommand.php
@@ -8,7 +8,7 @@
  * @link      https://github.com/barryvdh/laravel-ide-helper
  */
 
-namespace Barryvdh\LaravelIdeHelper;
+namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
diff --git a/src/Barryvdh/LaravelIdeHelper/IdeHelperServiceProvider.php b/src/IdeHelperServiceProvider.php
similarity index 79%
rename from src/Barryvdh/LaravelIdeHelper/IdeHelperServiceProvider.php
rename to src/IdeHelperServiceProvider.php
index 6448c08..3e267d8 100644
--- a/src/Barryvdh/LaravelIdeHelper/IdeHelperServiceProvider.php
+++ b/src/IdeHelperServiceProvider.php
@@ -11,6 +11,8 @@
 namespace Barryvdh\LaravelIdeHelper;
 
 use Illuminate\Support\ServiceProvider;
+use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
+Use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 
 class IdeHelperServiceProvider extends ServiceProvider {
 
@@ -28,7 +30,7 @@ class IdeHelperServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('barryvdh/laravel-ide-helper');
+        $this->app['config']->package('barryvdh/laravel-ide-helper', __DIR__ . '/config');
 	}
 
 	/**
@@ -38,18 +40,17 @@ class IdeHelperServiceProvider extends ServiceProvider {
 	 */
 	public function register()
 	{
-
-        $this->app['command.ide-helper.generate'] = $this->app->share(function($app)
+        $this->app['command.ide-helper.generate'] = $this->app->share(function()
         {
             return new GeneratorCommand;
         });
-        $this->commands('command.ide-helper.generate');
 
-        $this->app['command.ide-helper.models'] = $this->app->share(function($app)
+        $this->app['command.ide-helper.models'] = $this->app->share(function()
             {
                 return new ModelsCommand();
             });
-        $this->commands('command.ide-helper.models');
+
+        $this->commands('command.ide-helper.generate', 'command.ide-helper.models');
 	}
 
 	/**