diff --git a/.gitignore b/.gitignore
index ba85e71ad..4a264e1e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ test.php
 *.orig
 
 /.idea/
-/app/libraries/*
+/app/Libraries/*
 /app/resources/tmp/*
 /nntmux/config/settings.php
 /nntmux/config/ircscraper_settings.php
diff --git a/Changelog b/Changelog
index 6519b3122..cf4140e0e 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
-2017-17-16 DariusIII
+2017-07-17 DariusIII
+	* Chg: Change folder names in app to upper case first letter
 	* Chg: Replace app with App in classes used
 	* Chg: Update composer.lock
 2017-07-14 DariusIII
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
new file mode 100644
index 000000000..622e774b3
--- /dev/null
+++ b/app/Console/Kernel.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        //
+    ];
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+        // $schedule->command('inspire')
+        //          ->hourly();
+    }
+
+    /**
+     * Register the Closure based commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
new file mode 100644
index 000000000..a747e31b8
--- /dev/null
+++ b/app/Exceptions/Handler.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        \Illuminate\Auth\AuthenticationException::class,
+        \Illuminate\Auth\Access\AuthorizationException::class,
+        \Symfony\Component\HttpKernel\Exception\HttpException::class,
+        \Illuminate\Database\Eloquent\ModelNotFoundException::class,
+        \Illuminate\Session\TokenMismatchException::class,
+        \Illuminate\Validation\ValidationException::class,
+    ];
+
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param  \Exception  $exception
+     * @return void
+     */
+    public function report(Exception $exception)
+    {
+        parent::report($exception);
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Exception  $exception
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $exception)
+    {
+        return parent::render($request, $exception);
+    }
+
+    /**
+     * Convert an authentication exception into an unauthenticated response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['error' => 'Unauthenticated.'], 401);
+        }
+
+        return redirect()->guest(route('login'));
+    }
+}
diff --git a/app/extensions/command/Update.php b/app/Extensions/command/Update.php
similarity index 100%
rename from app/extensions/command/Update.php
rename to app/Extensions/command/Update.php
diff --git a/app/extensions/command/Verify.php b/app/Extensions/command/Verify.php
similarity index 98%
rename from app/extensions/command/Verify.php
rename to app/Extensions/command/Verify.php
index f5d93535c..f4e979cf8 100644
--- a/app/extensions/command/Verify.php
+++ b/app/Extensions/command/Verify.php
@@ -19,7 +19,7 @@
 namespace App\extensions\command;
 
 use App\extensions\console\Command;
-use App\models\Settings;
+use App\Models\Settings;
 
 
 /**
diff --git a/app/extensions/command/Version.php b/app/Extensions/command/Version.php
similarity index 100%
rename from app/extensions/command/Version.php
rename to app/Extensions/command/Version.php
diff --git a/app/extensions/command/empty b/app/Extensions/command/empty
similarity index 100%
rename from app/extensions/command/empty
rename to app/Extensions/command/empty
diff --git a/app/extensions/console/Command.php b/app/Extensions/console/Command.php
similarity index 77%
rename from app/extensions/console/Command.php
rename to app/Extensions/console/Command.php
index 9e99334d3..7fce36e5e 100755
--- a/app/extensions/console/Command.php
+++ b/app/Extensions/console/Command.php
@@ -16,13 +16,15 @@
  *
  * @link <http://www.gnu.org/licenses/>.
  * @author niel
- * @copyright 2014 nZEDb
+ * @edited by DariusIII
+ * @copyright 2014 nZEDb, 2017 NNTmux
  */
 namespace App\extensions\console;
 
 use Symfony\Component\Console\Output\ConsoleOutput;
+use Illuminate\Console\Command as LaravelCommand;
 
-class Command extends \Illuminate\Console\Command
+class Command extends LaravelCommand
 {
 	/**
 	 * Command constructor.
@@ -36,7 +38,11 @@ class Command extends \Illuminate\Console\Command
 		$this->output = new ConsoleOutput();
 	}
 
-	public function info($text, $verbosity = null)
+	/**
+	 * @param string $text
+	 * @param null   $verbosity
+	 */
+	public function info($text, $verbosity = null): void
 	{
 		if ($this->output->isQuiet()) {
 			return;
@@ -44,6 +50,9 @@ class Command extends \Illuminate\Console\Command
 		$this->output->writeln('<info>' . $text . '</info>', $verbosity);
 	}
 
+	/**
+	 * @param $text
+	 */
 	public function primary($text)
 	{
 		if ($this->output->isQuiet()) {
@@ -52,7 +61,11 @@ class Command extends \Illuminate\Console\Command
 		$this->output->writeln('<comment>' . $text . '</comment>');
 	}
 
-	public function error($text, $verbosity = null)
+	/**
+	 * @param string $text
+	 * @param null   $verbosity
+	 */
+	public function error($text, $verbosity = null): void
 	{
 		if ($this->output->isQuiet()) {
 			return;
diff --git a/app/extensions/helper/empty b/app/Extensions/helper/empty
similarity index 100%
rename from app/extensions/helper/empty
rename to app/Extensions/helper/empty
diff --git a/app/extensions/helper/helpers.php b/app/Extensions/helper/helpers.php
similarity index 100%
rename from app/extensions/helper/helpers.php
rename to app/Extensions/helper/helpers.php
diff --git a/app/extensions/util/Git.php b/app/Extensions/util/Git.php
similarity index 100%
rename from app/extensions/util/Git.php
rename to app/Extensions/util/Git.php
diff --git a/app/extensions/util/Versions.php b/app/Extensions/util/Versions.php
similarity index 99%
rename from app/extensions/util/Versions.php
rename to app/Extensions/util/Versions.php
index d6b25c3a3..81ce3b181 100644
--- a/app/extensions/util/Versions.php
+++ b/app/Extensions/util/Versions.php
@@ -18,7 +18,7 @@
  */
 namespace App\extensions\util;
 
-use App\models\Settings;
+use App\Models\Settings;
 use Illuminate\Database\Eloquent\Collection;
 use nntmux\utility\Utility;
 
diff --git a/app/extensions/util/Yenc.php b/app/Extensions/util/Yenc.php
similarity index 100%
rename from app/extensions/util/Yenc.php
rename to app/Extensions/util/Yenc.php
diff --git a/app/extensions/util/yenc/adapter/NzedbYenc.php b/app/Extensions/util/yenc/adapter/NzedbYenc.php
similarity index 100%
rename from app/extensions/util/yenc/adapter/NzedbYenc.php
rename to app/Extensions/util/yenc/adapter/NzedbYenc.php
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
new file mode 100644
index 000000000..6a247fefd
--- /dev/null
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
new file mode 100644
index 000000000..b2ea669a0
--- /dev/null
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+
+class LoginController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest')->except('logout');
+    }
+}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
new file mode 100644
index 000000000..ed8d1b774
--- /dev/null
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\User;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Foundation\Auth\RegistersUsers;
+
+class RegisterController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+
+    /**
+     * Where to redirect users after registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array  $data
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => 'required|string|max:255',
+            'email' => 'required|string|email|max:255|unique:users',
+            'password' => 'required|string|min:6|confirmed',
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array  $data
+     * @return User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => bcrypt($data['password']),
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
new file mode 100644
index 000000000..cf726eecd
--- /dev/null
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
new file mode 100644
index 000000000..03e02a23e
--- /dev/null
+++ b/app/Http/Controllers/Controller.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
new file mode 100644
index 000000000..66d34c3d7
--- /dev/null
+++ b/app/Http/Kernel.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http;
+
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+
+class Kernel extends HttpKernel
+{
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * These middleware are run during every request to your application.
+     *
+     * @var array
+     */
+    protected $middleware = [
+        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        \App\Http\Middleware\TrimStrings::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+    ];
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            // \Illuminate\Session\Middleware\AuthenticateSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
+
+        'api' => [
+            'throttle:60,1',
+            'bindings',
+        ],
+    ];
+
+    /**
+     * The application's route middleware.
+     *
+     * These middleware may be assigned to groups or used individually.
+     *
+     * @var array
+     */
+    protected $routeMiddleware = [
+        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+    ];
+}
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
new file mode 100644
index 000000000..3aa15f8dd
--- /dev/null
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+
+class EncryptCookies extends BaseEncrypter
+{
+    /**
+     * The names of the cookies that should not be encrypted.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
new file mode 100644
index 000000000..e4cec9c8b
--- /dev/null
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class RedirectIfAuthenticated
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->check()) {
+            return redirect('/home');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
new file mode 100644
index 000000000..943e9a4da
--- /dev/null
+++ b/app/Http/Middleware/TrimStrings.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+
+class TrimStrings extends BaseTrimmer
+{
+    /**
+     * The names of the attributes that should not be trimmed.
+     *
+     * @var array
+     */
+    protected $except = [
+        'password',
+        'password_confirmation',
+    ];
+}
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
new file mode 100644
index 000000000..a2c354141
--- /dev/null
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+
+class VerifyCsrfToken extends BaseVerifier
+{
+    /**
+     * The URIs that should be excluded from CSRF verification.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/app/Libraries/autoload.php b/app/Libraries/autoload.php
new file mode 100644
index 000000000..d26056d94
--- /dev/null
+++ b/app/Libraries/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit3981219d70bc76bb0a9347e11fb0f76e::getLoader();
diff --git a/app/Libraries/bin/li3 b/app/Libraries/bin/li3
new file mode 120000
index 000000000..ee199069b
--- /dev/null
+++ b/app/Libraries/bin/li3
@@ -0,0 +1 @@
+../../../libraries/lithium/console/li3
\ No newline at end of file
diff --git a/app/Libraries/bin/phpunit b/app/Libraries/bin/phpunit
new file mode 120000
index 000000000..2c4893031
--- /dev/null
+++ b/app/Libraries/bin/phpunit
@@ -0,0 +1 @@
+../phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/app/models/MultigroupPosters.php b/app/Models/MultigroupPosters.php
similarity index 98%
rename from app/models/MultigroupPosters.php
rename to app/Models/MultigroupPosters.php
index 8f589703a..96268c967 100644
--- a/app/models/MultigroupPosters.php
+++ b/app/Models/MultigroupPosters.php
@@ -16,7 +16,7 @@
  * @author    niel
  * @copyright 2016 nZEDb
  */
-namespace App\models;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/models/ReleaseRegexes.php b/app/Models/ReleaseRegexes.php
similarity index 98%
rename from app/models/ReleaseRegexes.php
rename to app/Models/ReleaseRegexes.php
index 8bdfd6cb4..1795b7ae0 100644
--- a/app/models/ReleaseRegexes.php
+++ b/app/Models/ReleaseRegexes.php
@@ -16,7 +16,7 @@
  * @author    DariusIII
  * @copyright 2017 NNTmux/nZEDb
  */
-namespace App\models;
+namespace App\Models;
 
 
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/models/ReleasesGroups.php b/app/Models/ReleasesGroups.php
similarity index 97%
rename from app/models/ReleasesGroups.php
rename to app/Models/ReleasesGroups.php
index 0d265b648..56c2c861d 100644
--- a/app/models/ReleasesGroups.php
+++ b/app/Models/ReleasesGroups.php
@@ -16,7 +16,7 @@
  * @author    niel
  * @copyright 2016 nZEDb
  */
-namespace App\models;
+namespace App\Models;
 
 
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/models/Settings.php b/app/Models/Settings.php
similarity index 99%
rename from app/models/Settings.php
rename to app/Models/Settings.php
index ec7ac4487..62ff057a3 100644
--- a/app/models/Settings.php
+++ b/app/Models/Settings.php
@@ -17,7 +17,7 @@
  * @copyright 2016 nZEDb
  */
 
-namespace App\models;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use nntmux\utility\Utility;
diff --git a/app/models/SteamApps.php b/app/Models/SteamApps.php
similarity index 98%
rename from app/models/SteamApps.php
rename to app/Models/SteamApps.php
index 42291f7b6..68b2e97ee 100644
--- a/app/models/SteamApps.php
+++ b/app/Models/SteamApps.php
@@ -16,7 +16,7 @@
  * @author    DariusIII
  * @copyright 2016 NNTmux/nZEDb
  */
-namespace App\models;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/models/empty b/app/Models/empty
similarity index 100%
rename from app/models/empty
rename to app/Models/empty
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
new file mode 100644
index 000000000..35471f6ff
--- /dev/null
+++ b/app/Providers/AppServiceProvider.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
new file mode 100644
index 000000000..9784b1a30
--- /dev/null
+++ b/app/Providers/AuthServiceProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+
+class AuthServiceProvider extends ServiceProvider
+{
+    /**
+     * The policy mappings for the application.
+     *
+     * @var array
+     */
+    protected $policies = [
+        'App\Model' => 'App\Policies\ModelPolicy',
+    ];
+
+    /**
+     * Register any authentication / authorization services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->registerPolicies();
+
+        //
+    }
+}
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
new file mode 100644
index 000000000..352cce44a
--- /dev/null
+++ b/app/Providers/BroadcastServiceProvider.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Broadcast;
+
+class BroadcastServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Broadcast::routes();
+
+        require base_path('routes/channels.php');
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
new file mode 100644
index 000000000..fca6152c3
--- /dev/null
+++ b/app/Providers/EventServiceProvider.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Event;
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event listener mappings for the application.
+     *
+     * @var array
+     */
+    protected $listen = [
+        'App\Events\Event' => [
+            'App\Listeners\EventListener',
+        ],
+    ];
+
+    /**
+     * Register any events for your application.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        parent::boot();
+
+        //
+    }
+}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
new file mode 100644
index 000000000..5ea48d39d
--- /dev/null
+++ b/app/Providers/RouteServiceProvider.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * This namespace is applied to your controller routes.
+     *
+     * In addition, it is set as the URL generator's root namespace.
+     *
+     * @var string
+     */
+    protected $namespace = 'App\Http\Controllers';
+
+    /**
+     * Define your route model bindings, pattern filters, etc.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @return void
+     */
+    public function map()
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+
+        //
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::prefix('api')
+             ->middleware('api')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/api.php'));
+    }
+}
diff --git a/artisan b/artisan
new file mode 100755
index 000000000..44dc07b0e
--- /dev/null
+++ b/artisan
@@ -0,0 +1,51 @@
+#!/usr/bin/env php
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Register The Auto Loader
+|--------------------------------------------------------------------------
+|
+| Composer provides a convenient, automatically generated class loader
+| for our application. We just need to utilize it! We'll require it
+| into the script here so that we do not have to worry about the
+| loading of any our classes "manually". Feels great to relax.
+|
+*/
+
+require __DIR__.'/bootstrap/autoload.php';
+
+$app = require_once __DIR__.'/bootstrap/app.php';
+
+/*
+|--------------------------------------------------------------------------
+| Run The Artisan Application
+|--------------------------------------------------------------------------
+|
+| When we run the console application, the current CLI command will be
+| executed in this console and the response sent back to a terminal
+| or another output device for the developers. Here goes nothing!
+|
+*/
+
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+
+$status = $kernel->handle(
+    $input = new Symfony\Component\Console\Input\ArgvInput,
+    new Symfony\Component\Console\Output\ConsoleOutput
+);
+
+/*
+|--------------------------------------------------------------------------
+| Shutdown The Application
+|--------------------------------------------------------------------------
+|
+| Once Artisan has finished running, we will fire off the shutdown events
+| so that any final work may be done by the application before we shut
+| down the process. This is the last thing to happen to the request.
+|
+*/
+
+$kernel->terminate($input, $status);
+
+exit($status);
diff --git a/bootstrap/app.php b/bootstrap/app.php
new file mode 100644
index 000000000..f2801adf6
--- /dev/null
+++ b/bootstrap/app.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Create The Application
+|--------------------------------------------------------------------------
+|
+| The first thing we will do is create a new Laravel application instance
+| which serves as the "glue" for all the components of Laravel, and is
+| the IoC container for the system binding all of the various parts.
+|
+*/
+
+$app = new Illuminate\Foundation\Application(
+    realpath(__DIR__.'/../')
+);
+
+/*
+|--------------------------------------------------------------------------
+| Bind Important Interfaces
+|--------------------------------------------------------------------------
+|
+| Next, we need to bind some important interfaces into the container so
+| we will be able to resolve them when needed. The kernels serve the
+| incoming requests to this application from both the web and CLI.
+|
+*/
+
+$app->singleton(
+    Illuminate\Contracts\Http\Kernel::class,
+    App\Http\Kernel::class
+);
+
+$app->singleton(
+    Illuminate\Contracts\Console\Kernel::class,
+    App\Console\Kernel::class
+);
+
+$app->singleton(
+    Illuminate\Contracts\Debug\ExceptionHandler::class,
+    App\Exceptions\Handler::class
+);
+
+/*
+|--------------------------------------------------------------------------
+| Return The Application
+|--------------------------------------------------------------------------
+|
+| This script returns the application instance. The instance is given to
+| the calling script so we can separate the building of the instances
+| from the actual running of the application and sending responses.
+|
+*/
+
+return $app;
diff --git a/bootstrap/bootstrap.php b/bootstrap/bootstrap.php
index bb15e9d69..ea9def729 100644
--- a/bootstrap/bootstrap.php
+++ b/bootstrap/bootstrap.php
@@ -10,4 +10,4 @@ if (!defined('NN_ROOT')) {
 	define('NN_ROOT', dirname(NN_APP_PATH, 2));
 }
 
-require_once NN_APP_PATH . DS . 'libraries' . DS . 'autoload.php';
+require_once NN_APP_PATH . DS . 'Libraries' . DS . 'autoload.php';
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/bootstrap/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/composer.json b/composer.json
index 1f6f7d2b3..04772a8ef 100755
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
   ],
   "autoload": {
     "files": [
-      "app/libraries/laravel/framework/src/Illuminate/Support/helpers.php",
-      "app/extensions/helper/helpers.php"
+      "app/Libraries/laravel/framework/src/Illuminate/Support/helpers.php",
+      "app/Extensions/helper/helpers.php"
     ],
     "psr-4": {
       "nntmux\\": "nntmux/",
@@ -24,13 +24,15 @@
     "preferred-install": {
       "*": "source"
     },
+    "sort-packages": true,
+    "optimize-autoloader": true,
     "fxp-asset" : {
       "installer-paths": {
         "npm-asset-library": "www/themes/shared/assets",
         "bower-asset-library": "www/themes/shared/assets"
       }
     },
-    "vendor-dir": "app/libraries"
+    "vendor-dir": "app/Libraries"
   },
   "description": "A Usenet Indexer",
   "extra": {
@@ -140,6 +142,12 @@
   },
 
   "scripts": {
+    "post-install-cmd": [
+      "Illuminate\\Foundation\\ComposerScripts::postInstall"
+    ],
+    "post-update-cmd": [
+      "Illuminate\\Foundation\\ComposerScripts::postUpdate"
+    ]
   },
   "suggest": {
     "ext-xdebug": "For developement work",
diff --git a/configuration/database.php b/configuration/database.php
index 31cee1182..577f07802 100644
--- a/configuration/database.php
+++ b/configuration/database.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . 'autoload.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'app/Libraries' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Dotenv\Dotenv;
diff --git a/misc/testing/DB/convert_to_tpg.php b/misc/testing/DB/convert_to_tpg.php
index cacd9ebc8..dcf0a7e8b 100644
--- a/misc/testing/DB/convert_to_tpg.php
+++ b/misc/testing/DB/convert_to_tpg.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\Groups;
 use nntmux\ConsoleTools;
diff --git a/misc/testing/DB/reset_truncate.php b/misc/testing/DB/reset_truncate.php
index 7afcfb6a2..985c9b25d 100644
--- a/misc/testing/DB/reset_truncate.php
+++ b/misc/testing/DB/reset_truncate.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\db\DB;
 
diff --git a/misc/testing/DB/resetdb.php b/misc/testing/DB/resetdb.php
index c01980e4b..d4eb803c4 100644
--- a/misc/testing/DB/resetdb.php
+++ b/misc/testing/DB/resetdb.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
diff --git a/misc/testing/Dev/clean_nzbs.php b/misc/testing/Dev/clean_nzbs.php
index 874dd4acc..2df205ee3 100644
--- a/misc/testing/Dev/clean_nzbs.php
+++ b/misc/testing/Dev/clean_nzbs.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\NZB;
 use nntmux\ReleaseImage;
 use nntmux\Releases;
diff --git a/misc/testing/Releases/fixReleaseNames.php b/misc/testing/Releases/fixReleaseNames.php
index d16e8f81f..1eb203abf 100755
--- a/misc/testing/Releases/fixReleaseNames.php
+++ b/misc/testing/Releases/fixReleaseNames.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\NameFixer;
 use nntmux\NNTP;
diff --git a/misc/testing/Tests/test_amazon_API.php b/misc/testing/Tests/test_amazon_API.php
index 57a62080a..648d29f57 100644
--- a/misc/testing/Tests/test_amazon_API.php
+++ b/misc/testing/Tests/test_amazon_API.php
@@ -4,7 +4,7 @@ require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 use ApaiIO\ApaiIO;
 use ApaiIO\Configuration\GenericConfiguration;
 use ApaiIO\Operations\Search;
-use App\models\Settings;
+use App\Models\Settings;
 
 
 $pubkey = Settings::value('APIs..amazonpubkey');
diff --git a/misc/testing/Tests/test_fanarttv_API.php b/misc/testing/Tests/test_fanarttv_API.php
index 9a6df2e22..5e4e9895c 100644
--- a/misc/testing/Tests/test_fanarttv_API.php
+++ b/misc/testing/Tests/test_fanarttv_API.php
@@ -2,7 +2,7 @@
 
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\libraries\FanartTV;
 use nntmux\ColorCLI;
 
diff --git a/misc/testing/_run_once/tpg_delete_triggers_2015-08-14.php b/misc/testing/_run_once/tpg_delete_triggers_2015-08-14.php
index d411eba4a..cc1bf80ac 100644
--- a/misc/testing/_run_once/tpg_delete_triggers_2015-08-14.php
+++ b/misc/testing/_run_once/tpg_delete_triggers_2015-08-14.php
@@ -20,7 +20,7 @@
  */
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 $pdo = new DB();
diff --git a/misc/testing/_run_once/tpg_fixes.php b/misc/testing/_run_once/tpg_fixes.php
index bd3c45e5a..0a7d953bd 100644
--- a/misc/testing/_run_once/tpg_fixes.php
+++ b/misc/testing/_run_once/tpg_fixes.php
@@ -27,7 +27,7 @@ if (!isset($argv[1]) || !in_array($argv[1], ['1'])) {
 }
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 $pdo = new DB();
diff --git a/misc/testing/_run_once/tpg_update_triggers_2014-09-25.php b/misc/testing/_run_once/tpg_update_triggers_2014-09-25.php
index d3658a2e0..88c1d9aa4 100644
--- a/misc/testing/_run_once/tpg_update_triggers_2014-09-25.php
+++ b/misc/testing/_run_once/tpg_update_triggers_2014-09-25.php
@@ -20,7 +20,7 @@
  */
 require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 $pdo = new DB();
diff --git a/misc/testing/fix_filesize.php b/misc/testing/fix_filesize.php
index 36e73f73f..4b8cab00c 100644
--- a/misc/testing/fix_filesize.php
+++ b/misc/testing/fix_filesize.php
@@ -8,7 +8,7 @@ Author: lordgnu <lordgnu@me.com>
 
 require_once dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\NZB;
 
diff --git a/misc/update/nix/multiprocessing/.do_not_run/switch.php b/misc/update/nix/multiprocessing/.do_not_run/switch.php
index f7020ef54..81d0cdcfc 100644
--- a/misc/update/nix/multiprocessing/.do_not_run/switch.php
+++ b/misc/update/nix/multiprocessing/.do_not_run/switch.php
@@ -6,7 +6,7 @@ if (!isset($argv[1])) {
 
 require_once dirname(__DIR__, 5) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use \nntmux\db\DB;
 use \nntmux\processing\PostProcess;
 use \nntmux\processing\ProcessReleases;
diff --git a/misc/update/nix/tmux/bin/groupfixrelnames.php b/misc/update/nix/tmux/bin/groupfixrelnames.php
index 247776c3d..77228bef3 100644
--- a/misc/update/nix/tmux/bin/groupfixrelnames.php
+++ b/misc/update/nix/tmux/bin/groupfixrelnames.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 5) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\ColorCLI;
 use nntmux\MiscSorter;
diff --git a/misc/update/nix/tmux/monitor.php b/misc/update/nix/tmux/monitor.php
index 1f72cbc39..3cad6a972 100644
--- a/misc/update/nix/tmux/monitor.php
+++ b/misc/update/nix/tmux/monitor.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 4) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\Tmux;
 use nntmux\TmuxOutput;
diff --git a/misc/update/nix/tmux/run.php b/misc/update/nix/tmux/run.php
index a985aeb30..070d65eab 100644
--- a/misc/update/nix/tmux/run.php
+++ b/misc/update/nix/tmux/run.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 4) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 use nntmux\Tmux;
diff --git a/misc/update/postprocess.php b/misc/update/postprocess.php
index cd4e69b2d..f9d0f31f3 100644
--- a/misc/update/postprocess.php
+++ b/misc/update/postprocess.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\processing\PostProcess;
 use nntmux\NNTP;
diff --git a/misc/update/update_binaries.php b/misc/update/update_binaries.php
index 63d4b8bdb..00f81e92c 100644
--- a/misc/update/update_binaries.php
+++ b/misc/update/update_binaries.php
@@ -1,7 +1,7 @@
 <?php
 require_once dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\ColorCLI;
 use nntmux\NNTP;
diff --git a/nntmux/Backfill.php b/nntmux/Backfill.php
index b12c9908c..7fc276bae 100755
--- a/nntmux/Backfill.php
+++ b/nntmux/Backfill.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 class Backfill
diff --git a/nntmux/Binaries.php b/nntmux/Binaries.php
index 2692cc9be..b1347acf3 100755
--- a/nntmux/Binaries.php
+++ b/nntmux/Binaries.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\db\DB;
 use nntmux\processing\ProcessReleasesMultiGroup;
diff --git a/nntmux/Books.php b/nntmux/Books.php
index 68da7d2e0..8f162dac1 100755
--- a/nntmux/Books.php
+++ b/nntmux/Books.php
@@ -3,7 +3,7 @@ namespace nntmux;
 
 use ApaiIO\Request\GuzzleRequest;
 use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
-use App\models\Settings;
+use App\Models\Settings;
 use GuzzleHttp\Client;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
diff --git a/nntmux/Categorize.php b/nntmux/Categorize.php
index 09b7326ef..61628cafb 100755
--- a/nntmux/Categorize.php
+++ b/nntmux/Categorize.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 
 /**
  * Categorizing of releases by name/group.
diff --git a/nntmux/Console.php b/nntmux/Console.php
index bb9ca15f0..4df3a3c99 100755
--- a/nntmux/Console.php
+++ b/nntmux/Console.php
@@ -3,7 +3,7 @@ namespace nntmux;
 
 use ApaiIO\Request\GuzzleRequest;
 use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
-use App\models\Settings;
+use App\Models\Settings;
 use GuzzleHttp\Client;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
diff --git a/nntmux/Games.php b/nntmux/Games.php
index 58cb3897e..e464377d6 100755
--- a/nntmux/Games.php
+++ b/nntmux/Games.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use DBorsatto\GiantBomb\Config;
 use DBorsatto\GiantBomb\Client;
 use nntmux\db\DB;
diff --git a/nntmux/Logging.php b/nntmux/Logging.php
index 2791767df..70d4b644f 100755
--- a/nntmux/Logging.php
+++ b/nntmux/Logging.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 /**
diff --git a/nntmux/MiscSorter.php b/nntmux/MiscSorter.php
index 598a3206f..2dbe3bfb5 100755
--- a/nntmux/MiscSorter.php
+++ b/nntmux/MiscSorter.php
@@ -2,7 +2,7 @@
 namespace nntmux;
 
 use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
 use ApaiIO\ApaiIO;
diff --git a/nntmux/Movie.php b/nntmux/Movie.php
index d5acebc87..ec996e4b7 100755
--- a/nntmux/Movie.php
+++ b/nntmux/Movie.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use aharen\OMDbAPI;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
diff --git a/nntmux/Music.php b/nntmux/Music.php
index 02c57803a..af64051eb 100755
--- a/nntmux/Music.php
+++ b/nntmux/Music.php
@@ -3,7 +3,7 @@ namespace nntmux;
 
 use ApaiIO\Request\GuzzleRequest;
 use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
-use App\models\Settings;
+use App\Models\Settings;
 use GuzzleHttp\Client;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
diff --git a/nntmux/NNTP.php b/nntmux/NNTP.php
index 41b759015..9e8b23b82 100755
--- a/nntmux/NNTP.php
+++ b/nntmux/NNTP.php
@@ -2,7 +2,7 @@
 namespace nntmux;
 
 use App\extensions\util\Yenc;
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/NZB.php b/nntmux/NZB.php
index 9b919a1aa..686bf3589 100755
--- a/nntmux/NZB.php
+++ b/nntmux/NZB.php
@@ -2,7 +2,7 @@
 namespace nntmux;
 
 use App\extensions\util\Versions as li3Versions;
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/NZBContents.php b/nntmux/NZBContents.php
index 592147451..5edea7989 100755
--- a/nntmux/NZBContents.php
+++ b/nntmux/NZBContents.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\processing\PostProcess;
 use nntmux\utility\Utility;
diff --git a/nntmux/NZBImport.php b/nntmux/NZBImport.php
index be174578e..6c3d00c2e 100755
--- a/nntmux/NZBImport.php
+++ b/nntmux/NZBImport.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/Nfo.php b/nntmux/Nfo.php
index 50c731d7c..a1bcd1b72 100755
--- a/nntmux/Nfo.php
+++ b/nntmux/Nfo.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use dariusiii\rarinfo\Par2Info;
 use dariusiii\rarinfo\SfvInfo;
 use nntmux\db\DB;
diff --git a/nntmux/ReleaseComments.php b/nntmux/ReleaseComments.php
index f7bc5c214..c8b716900 100755
--- a/nntmux/ReleaseComments.php
+++ b/nntmux/ReleaseComments.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 
diff --git a/nntmux/Releases.php b/nntmux/Releases.php
index 4428bad5b..e867bead3 100755
--- a/nntmux/Releases.php
+++ b/nntmux/Releases.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/RequestIDWeb.php b/nntmux/RequestIDWeb.php
index 7aa406dbe..fd4792d9a 100755
--- a/nntmux/RequestIDWeb.php
+++ b/nntmux/RequestIDWeb.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use GuzzleHttp\Exception\RequestException;
 
 /**
diff --git a/nntmux/SABnzbd.php b/nntmux/SABnzbd.php
index d7e34f3f6..9fcab1649 100755
--- a/nntmux/SABnzbd.php
+++ b/nntmux/SABnzbd.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use GuzzleHttp\Client;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/Steam.php b/nntmux/Steam.php
index 5e1dcc30f..6d8663d6d 100755
--- a/nntmux/Steam.php
+++ b/nntmux/Steam.php
@@ -1,8 +1,8 @@
 <?php
 namespace nntmux;
 
-use App\models\SteamApps;
-use App\models\Settings;
+use App\Models\SteamApps;
+use App\Models\Settings;
 use b3rs3rk\steamfront\Main;
 use nntmux\db\DB;
 
diff --git a/nntmux/TmuxRun.php b/nntmux/TmuxRun.php
index 3c00f7e97..c5bc2733b 100755
--- a/nntmux/TmuxRun.php
+++ b/nntmux/TmuxRun.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 
 /**
diff --git a/nntmux/Users.php b/nntmux/Users.php
index 8d13e6796..025f9f165 100755
--- a/nntmux/Users.php
+++ b/nntmux/Users.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/XXX.php b/nntmux/XXX.php
index f1d1f7b97..8657e36b3 100755
--- a/nntmux/XXX.php
+++ b/nntmux/XXX.php
@@ -2,7 +2,7 @@
 
 namespace nntmux;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\processing\adult\AEBN;
 use nntmux\processing\adult\ADM;
diff --git a/nntmux/bootstrap.php b/nntmux/bootstrap.php
index a01a103f2..f5a4f68c5 100755
--- a/nntmux/bootstrap.php
+++ b/nntmux/bootstrap.php
@@ -18,7 +18,7 @@
  * @author    niel
  * @copyright 2016 nZEDb
  */
-require_once NN_ROOT . 'app/libraries/autoload.php';
+require_once NN_ROOT . 'app/Libraries/autoload.php';
 
 use nntmux\config\Configure;
 use nntmux\utility\Utility;
diff --git a/nntmux/db/DB.php b/nntmux/db/DB.php
index 92f33a4e3..e24e3b3d1 100755
--- a/nntmux/db/DB.php
+++ b/nntmux/db/DB.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\db;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\ConsoleTools;
 use nntmux\Logger;
diff --git a/nntmux/db/DbUpdate.php b/nntmux/db/DbUpdate.php
index 469b117c3..efd4fb9cc 100755
--- a/nntmux/db/DbUpdate.php
+++ b/nntmux/db/DbUpdate.php
@@ -20,7 +20,7 @@
  */
 namespace nntmux\db;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\db\DB;
 use nntmux\utility\Git;
diff --git a/nntmux/db/populate/AniDB.php b/nntmux/db/populate/AniDB.php
index d13192db1..dc566f57c 100755
--- a/nntmux/db/populate/AniDB.php
+++ b/nntmux/db/populate/AniDB.php
@@ -2,7 +2,7 @@
 
 namespace nntmux\db\populate;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\ReleaseImage;
 use nntmux\db\DB;
diff --git a/nntmux/http/Capabilities.php b/nntmux/http/Capabilities.php
index a34e7fe0d..d1a0417cb 100755
--- a/nntmux/http/Capabilities.php
+++ b/nntmux/http/Capabilities.php
@@ -21,7 +21,7 @@
 namespace nntmux\http;
 
 use App\extensions\util\Versions;
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\db\DB;
 use nntmux\utility\Utility;
diff --git a/nntmux/libraries/Forking.php b/nntmux/libraries/Forking.php
index 4c5ab5aa5..f653929f7 100755
--- a/nntmux/libraries/Forking.php
+++ b/nntmux/libraries/Forking.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\libraries;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\ColorCLI;
 use nntmux\MiscSorter;
diff --git a/nntmux/processing/PostProcess.php b/nntmux/processing/PostProcess.php
index d63ae8ce5..2486963a3 100755
--- a/nntmux/processing/PostProcess.php
+++ b/nntmux/processing/PostProcess.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\processing;
 
-use App\models\Settings;
+use App\Models\Settings;
 use dariusiii\rarinfo\Par2Info;
 use nntmux\ADE;
 use nntmux\ADM;
diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php
index 201fd8837..119c10513 100755
--- a/nntmux/processing/ProcessReleases.php
+++ b/nntmux/processing/ProcessReleases.php
@@ -1,10 +1,10 @@
 <?php
 namespace nntmux\processing;
 
-use App\models\MultigroupPosters;
-use App\models\ReleasesGroups;
-use App\models\ReleaseRegexes;
-use App\models\Settings;
+use App\Models\MultigroupPosters;
+use App\Models\ReleasesGroups;
+use App\Models\ReleaseRegexes;
+use App\Models\Settings;
 use nntmux\Categorize;
 use nntmux\Category;
 use nntmux\ColorCLI;
diff --git a/nntmux/processing/ProcessReleasesMultiGroup.php b/nntmux/processing/ProcessReleasesMultiGroup.php
index 255e17648..29fc86910 100644
--- a/nntmux/processing/ProcessReleasesMultiGroup.php
+++ b/nntmux/processing/ProcessReleasesMultiGroup.php
@@ -2,7 +2,7 @@
 
 namespace nntmux\processing;
 
-use App\models\MultigroupPosters;
+use App\Models\MultigroupPosters;
 use nntmux\NZBMultiGroup;
 use nntmux\utility\Utility;
 
diff --git a/nntmux/processing/post/AniDB.php b/nntmux/processing/post/AniDB.php
index 654a2a4ed..49b55fe66 100755
--- a/nntmux/processing/post/AniDB.php
+++ b/nntmux/processing/post/AniDB.php
@@ -2,7 +2,7 @@
 
 namespace nntmux\processing\post;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\ColorCLI;
 use nntmux\NZB;
diff --git a/nntmux/processing/post/ProcessAdditional.php b/nntmux/processing/post/ProcessAdditional.php
index fe5ebd638..ab82a945d 100755
--- a/nntmux/processing/post/ProcessAdditional.php
+++ b/nntmux/processing/post/ProcessAdditional.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\processing\post;
 
-use App\models\Settings;
+use App\Models\Settings;
 use dariusiii\rarinfo\ArchiveInfo;
 use dariusiii\rarinfo\Par2Info;
 use nntmux\Categorize;
diff --git a/nntmux/processing/tv/TMDB.php b/nntmux/processing/tv/TMDB.php
index 3b3a04a9a..0cbf6f11c 100755
--- a/nntmux/processing/tv/TMDB.php
+++ b/nntmux/processing/tv/TMDB.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\processing\tv;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ColorCLI;
 use nntmux\ReleaseImage;
 use Tmdb\ApiToken;
diff --git a/nntmux/processing/tv/TV.php b/nntmux/processing/tv/TV.php
index d51e18746..62d22855b 100755
--- a/nntmux/processing/tv/TV.php
+++ b/nntmux/processing/tv/TV.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\processing\tv;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\processing\Videos;
 use nntmux\utility\Country;
 use nntmux\utility\Utility;
diff --git a/nntmux/processing/tv/TraktTv.php b/nntmux/processing/tv/TraktTv.php
index bb9fdb85e..8a0fb7cef 100755
--- a/nntmux/processing/tv/TraktTv.php
+++ b/nntmux/processing/tv/TraktTv.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\processing\tv;
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\libraries\TraktAPI;
 use nntmux\ColorCLI;
 use nntmux\ReleaseImage;
diff --git a/nntmux/utility/Utility.php b/nntmux/utility/Utility.php
index e212465b9..7aa7e70fd 100755
--- a/nntmux/utility/Utility.php
+++ b/nntmux/utility/Utility.php
@@ -1,7 +1,7 @@
 <?php
 namespace nntmux\utility;
 
-use App\models\Settings;
+use App\Models\Settings;
 use App\extensions\util\Versions;
 use nntmux\db\DB;
 use nntmux\ColorCLI;
diff --git a/www/admin/poster-delete.php b/www/admin/poster-delete.php
index 4f9dc5b86..28b93dddd 100644
--- a/www/admin/poster-delete.php
+++ b/www/admin/poster-delete.php
@@ -2,7 +2,7 @@
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'smarty.php';
 
 
-use App\models\MultigroupPosters;
+use App\Models\MultigroupPosters;
 
 $page = new AdminPage();
 
diff --git a/www/admin/posters-edit.php b/www/admin/posters-edit.php
index 4f7d3f35d..f2d45f672 100644
--- a/www/admin/posters-edit.php
+++ b/www/admin/posters-edit.php
@@ -2,7 +2,7 @@
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'smarty.php';
 
 
-use App\models\MultigroupPosters;
+use App\Models\MultigroupPosters;
 use nntmux\processing\ProcessReleasesMultiGroup;
 
 $page = new AdminPage();
diff --git a/www/admin/posters-list.php b/www/admin/posters-list.php
index c7cd51dbe..5c78d391d 100644
--- a/www/admin/posters-list.php
+++ b/www/admin/posters-list.php
@@ -2,7 +2,7 @@
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'smarty.php';
 
 
-use App\models\MultigroupPosters;
+use App\Models\MultigroupPosters;
 
 $page   = new AdminPage();
 
diff --git a/www/admin/site-edit.php b/www/admin/site-edit.php
index 31b0f98ea..74adfa5f9 100644
--- a/www/admin/site-edit.php
+++ b/www/admin/site-edit.php
@@ -2,7 +2,7 @@
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'smarty.php';
 
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\SABnzbd;
 use nntmux\Sites;
diff --git a/www/index.php b/www/index.php
index e34beb4fa..8dfffcb8b 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,7 +1,7 @@
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'smarty.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 
 $page = new Page;
 
diff --git a/www/pages/BasePage.php b/www/pages/BasePage.php
index 4fd3021d5..5e89aba7a 100644
--- a/www/pages/BasePage.php
+++ b/www/pages/BasePage.php
@@ -2,7 +2,7 @@
 
 require_once NN_LIB . 'utility' . DS . 'SmartyUtils.php';
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\db\DB;
 use nntmux\Users;
 use nntmux\SABnzbd;
diff --git a/www/pages/Page.php b/www/pages/Page.php
index e5f16a260..da65cc8bf 100644
--- a/www/pages/Page.php
+++ b/www/pages/Page.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Users;
 use nntmux\Contents;
 use nntmux\Forum;
diff --git a/www/pages/ajax_profile.php b/www/pages/ajax_profile.php
index 0fc0533a3..0bc27b00b 100644
--- a/www/pages/ajax_profile.php
+++ b/www/pages/ajax_profile.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 
 if (!$page->users->isLoggedIn())
 	$page->show403();
diff --git a/www/pages/api.php b/www/pages/api.php
index a04947904..463366f2e 100644
--- a/www/pages/api.php
+++ b/www/pages/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Releases;
 use nntmux\http\API;
 use nntmux\utility\Utility;
diff --git a/www/pages/contact-us.php b/www/pages/contact-us.php
index dbcb459d8..a40726158 100644
--- a/www/pages/contact-us.php
+++ b/www/pages/contact-us.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\utility\Utility;
 use nntmux\Captcha;
 
diff --git a/www/pages/details.php b/www/pages/details.php
index a4eaeaa9c..0ea38efe8 100644
--- a/www/pages/details.php
+++ b/www/pages/details.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\models\ReleaseRegexes;
-use App\models\Settings;
+use App\Models\ReleaseRegexes;
+use App\Models\Settings;
 use nntmux\Console;
 use nntmux\ReleaseComments;
 use nntmux\ReleaseExtra;
diff --git a/www/pages/failed.php b/www/pages/failed.php
index 813609ecf..1b722550e 100644
--- a/www/pages/failed.php
+++ b/www/pages/failed.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\DnzbFailures;
 
 // Page is accessible only by the rss token, or logged in users.
diff --git a/www/pages/forgottenpassword.php b/www/pages/forgottenpassword.php
index abc2e1234..181eb3014 100644
--- a/www/pages/forgottenpassword.php
+++ b/www/pages/forgottenpassword.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\utility\Utility;
 use nntmux\Captcha;
 
diff --git a/www/pages/forum.php b/www/pages/forum.php
index 1eefb8941..d4ba32dff 100644
--- a/www/pages/forum.php
+++ b/www/pages/forum.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Forum;
 
 $forum = new Forum;
diff --git a/www/pages/forumpost.php b/www/pages/forumpost.php
index e74ba33d0..22c3c86f8 100644
--- a/www/pages/forumpost.php
+++ b/www/pages/forumpost.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Forum;
 
 if (!$page->users->isLoggedIn()) {
diff --git a/www/pages/getnzb.php b/www/pages/getnzb.php
index 3bfd90b21..1480ee9af 100644
--- a/www/pages/getnzb.php
+++ b/www/pages/getnzb.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Releases;
 use nntmux\NZB;
 use nntmux\utility\Utility;
diff --git a/www/pages/mymovies.php b/www/pages/mymovies.php
index 99d47d182..964aec2a9 100755
--- a/www/pages/mymovies.php
+++ b/www/pages/mymovies.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\Releases;
 use nntmux\UserMovies;
diff --git a/www/pages/myshows.php b/www/pages/myshows.php
index d8de57bf2..2f709169e 100755
--- a/www/pages/myshows.php
+++ b/www/pages/myshows.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\Releases;
 use nntmux\UserSeries;
diff --git a/www/pages/profile.php b/www/pages/profile.php
index b6c220ef3..fdc4bddb6 100644
--- a/www/pages/profile.php
+++ b/www/pages/profile.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\ReleaseComments;
 use nntmux\SABnzbd;
 use nntmux\NZBGet;
diff --git a/www/pages/profileedit.php b/www/pages/profileedit.php
index 504275c88..4bc7089f6 100644
--- a/www/pages/profileedit.php
+++ b/www/pages/profileedit.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\utility\Utility;
 use nntmux\Category;
 use nntmux\SABnzbd;
diff --git a/www/pages/queue.php b/www/pages/queue.php
index 0c98380d9..e6dee9e43 100644
--- a/www/pages/queue.php
+++ b/www/pages/queue.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\SABnzbd;
 use nntmux\NZBGet;
 
diff --git a/www/pages/register.php b/www/pages/register.php
index 5920f1fe8..149f8b2a5 100644
--- a/www/pages/register.php
+++ b/www/pages/register.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Captcha;
 use nntmux\Users;
 use nntmux\utility\Utility;
diff --git a/www/pages/rss.php b/www/pages/rss.php
index ca536714b..a19adfa11 100755
--- a/www/pages/rss.php
+++ b/www/pages/rss.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Category;
 use nntmux\http\RSS;
 use nntmux\utility\Utility;
diff --git a/www/pages/sitemap.php b/www/pages/sitemap.php
index ac414d1fd..06e639f5c 100644
--- a/www/pages/sitemap.php
+++ b/www/pages/sitemap.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 use nntmux\Contents;
 use nntmux\Sitemap;
 
diff --git a/www/pages/terms-and-conditions.php b/www/pages/terms-and-conditions.php
index 841a560d8..f996b6992 100644
--- a/www/pages/terms-and-conditions.php
+++ b/www/pages/terms-and-conditions.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\models\Settings;
+use App\Models\Settings;
 
 $page->title = "Terms and Conditions";
 $page->meta_title = Settings::value('site.main.title')." - Terms and conditions";