diff --git a/composer.json b/composer.json
index b03c3bf..f5e551e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "lagbox/settings",
+    "name": "lagbox/laravel-settings",
     "description": "Laravel persistent settings",
     "license": "MIT",
     "keywords": ["laravel", "settings"],
@@ -11,16 +11,18 @@
     ],
     "require": {
         "php": ">=5.6",
-        "illuminate/support": "5.2.*",
-        "illuminate/cache": "5.2.*",
-        "illuminate/events": "5.2.*"
+        "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+        "illuminate/support": "5.1.*|5.2.*|5.3.*",
+        "illuminate/cache": "5.1.*|5.2.*|5.3.*",
+        "illuminate/events": "5.1.*|5.2.*|5.3.*",
+        "illuminate/database": "5.1.*|5.2.*|5.3.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*"
     },
     "autoload": {
         "psr-4": {
-            "lagbox\\settings\\": "src"
+            "lagbox\\Settings\\": "src"
         },
         "files": [
             "src/helpers.php"
diff --git a/src/config/settings.php b/config/settings.php
similarity index 100%
rename from src/config/settings.php
rename to config/settings.php
diff --git a/src/database/migrations/2016_02_12_070250_create_settings_table_migration.php b/database/migrations/2016_02_12_070250_create_settings_table_migration.php
similarity index 100%
rename from src/database/migrations/2016_02_12_070250_create_settings_table_migration.php
rename to database/migrations/2016_02_12_070250_create_settings_table_migration.php
diff --git a/src/Events/SettingsSaved.php b/src/Events/SettingsSaved.php
index 897ffd3..10f1fd1 100644
--- a/src/Events/SettingsSaved.php
+++ b/src/Events/SettingsSaved.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace lagbox\settings\Events;
+namespace lagbox\Settings\Events;
 
 class SettingsSaved
 {
diff --git a/src/Facades/Settings.php b/src/Facades/Settings.php
new file mode 100644
index 0000000..7aef229
--- /dev/null
+++ b/src/Facades/Settings.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace lagbox\Settings\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Settings extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'settings';
+    }
+}
diff --git a/src/Listeners/SettingsListener.php b/src/Listeners/SettingsListener.php
index 815260a..82cf551 100644
--- a/src/Listeners/SettingsListener.php
+++ b/src/Listeners/SettingsListener.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace lagbox\settings\Listeners;
+namespace lagbox\Settings\Listeners;
 
-use lagbox\settings\Setting;
-use lagbox\settings\Events\SettingsSaved;
+use lagbox\Settings\Setting;
+use lagbox\Settings\Events\SettingsSaved;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 class SettingsListener
diff --git a/src/Setting.php b/src/Setting.php
index 5148109..14c6c56 100644
--- a/src/Setting.php
+++ b/src/Setting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace lagbox\settings;
+namespace lagbox\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Settings.php b/src/Settings.php
index cd2863a..4629f17 100644
--- a/src/Settings.php
+++ b/src/Settings.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace lagbox\settings;
+namespace lagbox\Settings;
 
-use lagbox\settings\Setting;
-use lagbox\settings\Events\SettingsSaved;
+use lagbox\Settings\Setting;
+use lagbox\Settings\Events\SettingsSaved;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Events\Dispatcher as Event;
 use Illuminate\Contracts\Config\Repository as Config;
@@ -30,7 +30,7 @@ class Settings
 
     /**
      * Setting model
-     * @var \lagbox\settings\Setting
+     * @var \lagbox\Settings\Setting
      */
     protected $setting;
 
@@ -64,7 +64,7 @@ class Settings
      * @param \Illuminate\Contracts\Cache\Repository   $cache
      * @param \Illuminate\Contracts\Config\Repository  $config
      * @param \Illuminate\Contracts\Events\Dispatcher $event
-     * @param \lagbox\settings\Setting $setting
+     * @param \lagbox\Settings\Setting $setting
      */
     public function __construct(Cache $cache, Config $config, Event $event, Setting $setting)
     {
diff --git a/src/SettingsMiddleware.php b/src/SettingsMiddleware.php
index 272ecda..e470b0b 100644
--- a/src/SettingsMiddleware.php
+++ b/src/SettingsMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace lagbox\settings;
+namespace lagbox\Settings;
 
 use Closure;
 
diff --git a/src/SettingsServiceProvider.php b/src/SettingsServiceProvider.php
index 6966f34..5a73c69 100644
--- a/src/SettingsServiceProvider.php
+++ b/src/SettingsServiceProvider.php
@@ -1,13 +1,18 @@
 <?php
 
-namespace lagbox\settings;
+namespace lagbox\Settings;
 
 use Illuminate\Support\ServiceProvider;
-use lagbox\settings\Events\SettingsSaved;
-use lagbox\settings\Listeners\SettingsListener;
+use lagbox\Settings\Events\SettingsSaved;
+use lagbox\Settings\Listeners\SettingsListener;
 
 class SettingsServiceProvider extends ServiceProvider
 {
+    /**
+     * Bootstrap anything needed.
+     *
+     * @return void
+     */
     public function boot()
     {
         $this->publishes();
@@ -19,6 +24,11 @@ public function boot()
         $this->app['events']->listen(SettingsSaved::class, SettingsListener::class);
     }
 
+    /**
+     * Register any bindings with the container.
+     *
+     * @return void
+     */
     public function register()
     {
         $this->app->singleton('settings', function ($app) {
@@ -33,6 +43,11 @@ public function register()
         $this->app->alias('settings', Settings::class);
     }
 
+    /**
+     * Assets to publish.
+     *
+     * @return void
+     */
     protected function publishes()
     {
         $this->publishes([
diff --git a/src/helpers.php b/src/helpers.php
index 7622926..90e963f 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,17 +1,19 @@
 <?php
 
-/**
- * Helper method for getting and setting settings
- *
- * @return mixed
- */
-function settings(...$args)
-{
-    $settings = Illuminate\Support\Facades\App::make('settings');
+if (! function_exists('settings')) {
+    /**
+     * Helper method for getting and setting settings
+     *
+     * @return mixed
+     */
+    function settings(...$args)
+    {
+        $settings = Illuminate\Support\Facades\App::make('settings');
 
-    if (empty($args)) {
-        return $settings;
-    }
+        if (empty($args)) {
+            return $settings;
+        }
 
-    return $settings(...$args);
+        return $settings(...$args);
+    }
 }
diff --git a/src/tests/SettingsTest.php b/tests/SettingsTest.php
similarity index 98%
rename from src/tests/SettingsTest.php
rename to tests/SettingsTest.php
index 82f75e2..3dc61e2 100644
--- a/src/tests/SettingsTest.php
+++ b/tests/SettingsTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace lagbox\settings\tests;
+namespace lagbox\Settings\tests;
 
 use Tests\TestCase;
 use Illuminate\Support\Arr;
-use lagbox\settings\Setting;
+use lagbox\Settings\Setting;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;