From c502dd445b3f93e4adfc8b4a3f829f59d473ab67 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 6 Feb 2015 04:52:16 +0100
Subject: [PATCH] New and old code.

---
 .env                                             | 11 +++++++++++
 app/Commands/Command.php                         |  2 +-
 app/Console/Commands/Inspire.php                 |  2 +-
 app/Console/Kernel.php                           |  4 ++--
 app/Events/Event.php                             |  2 +-
 app/Exceptions/Handler.php                       |  2 +-
 app/Http/Controllers/Auth/AuthController.php     |  4 ++--
 app/Http/Controllers/Auth/PasswordController.php |  4 ++--
 app/Http/Controllers/Controller.php              |  2 +-
 app/Http/Controllers/HomeController.php          |  2 +-
 app/Http/Controllers/WelcomeController.php       |  2 +-
 app/Http/Kernel.php                              |  8 ++++----
 app/Http/Middleware/Authenticate.php             |  2 +-
 app/Http/Middleware/RedirectIfAuthenticated.php  |  2 +-
 app/Http/Middleware/VerifyCsrfToken.php          |  2 +-
 app/Http/Requests/Request.php                    |  2 +-
 app/Models/Account.php                           | 14 ++++++++++++++
 app/Models/AccountMeta.php                       |  9 +++++++++
 app/Models/AccountType.php                       |  9 +++++++++
 app/Models/Bill.php                              |  9 +++++++++
 app/Models/Budget.php                            |  9 +++++++++
 app/Models/BudgetLimit.php                       |  9 +++++++++
 app/Models/Category.php                          |  9 +++++++++
 app/Models/Component.php                         |  9 +++++++++
 app/Models/LimitRepetition.php                   |  9 +++++++++
 app/Models/PiggyBank.php                         |  9 +++++++++
 app/Models/PiggyBankEvent.php                    |  9 +++++++++
 app/Models/PiggyBankRepetition.php               |  9 +++++++++
 app/Models/Preference.php                        |  9 +++++++++
 app/Models/Reminder.php                          |  9 +++++++++
 app/Models/Transaction.php                       |  9 +++++++++
 app/Models/TransactionCurrency.php               |  9 +++++++++
 app/Models/TransactionGroup.php                  |  9 +++++++++
 app/Models/TransactionJournal.php                |  9 +++++++++
 app/Models/TransactionRelation.php               |  9 +++++++++
 app/Models/TransactionType.php                   |  9 +++++++++
 app/{ => Models}/User.php                        |  2 +-
 app/Providers/AppServiceProvider.php             |  4 ++--
 app/Providers/BusServiceProvider.php             |  4 ++--
 app/Providers/ConfigServiceProvider.php          |  2 +-
 app/Providers/EventServiceProvider.php           |  2 +-
 app/Providers/RouteServiceProvider.php           |  4 ++--
 app/Services/Registrar.php                       |  4 ++--
 bootstrap/app.php                                |  6 +++---
 composer.json                                    |  2 +-
 config/app.php                                   | 10 +++++-----
 config/auth.php                                  |  2 +-
 phpspec.yml                                      |  4 ++--
 48 files changed, 240 insertions(+), 44 deletions(-)
 create mode 100644 .env
 create mode 100644 app/Models/Account.php
 create mode 100644 app/Models/AccountMeta.php
 create mode 100644 app/Models/AccountType.php
 create mode 100644 app/Models/Bill.php
 create mode 100644 app/Models/Budget.php
 create mode 100644 app/Models/BudgetLimit.php
 create mode 100644 app/Models/Category.php
 create mode 100644 app/Models/Component.php
 create mode 100644 app/Models/LimitRepetition.php
 create mode 100644 app/Models/PiggyBank.php
 create mode 100644 app/Models/PiggyBankEvent.php
 create mode 100644 app/Models/PiggyBankRepetition.php
 create mode 100644 app/Models/Preference.php
 create mode 100644 app/Models/Reminder.php
 create mode 100644 app/Models/Transaction.php
 create mode 100644 app/Models/TransactionCurrency.php
 create mode 100644 app/Models/TransactionGroup.php
 create mode 100644 app/Models/TransactionJournal.php
 create mode 100644 app/Models/TransactionRelation.php
 create mode 100644 app/Models/TransactionType.php
 rename app/{ => Models}/User.php (95%)

diff --git a/.env b/.env
new file mode 100644
index 0000000000..10cba06398
--- /dev/null
+++ b/.env
@@ -0,0 +1,11 @@
+APP_ENV=homestead
+APP_DEBUG=true
+APP_KEY=SomeRandomString
+
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
diff --git a/app/Commands/Command.php b/app/Commands/Command.php
index 018bc21924..6e5ff04d10 100644
--- a/app/Commands/Command.php
+++ b/app/Commands/Command.php
@@ -1,4 +1,4 @@
-<?php namespace App\Commands;
+<?php namespace FireflyIII\Commands;
 
 abstract class Command {
 
diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
index abb255d140..79a2722de2 100644
--- a/app/Console/Commands/Inspire.php
+++ b/app/Console/Commands/Inspire.php
@@ -1,4 +1,4 @@
-<?php namespace App\Console\Commands;
+<?php namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 0c088c8938..81e5194f67 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,4 +1,4 @@
-<?php namespace App\Console;
+<?php namespace FireflyIII\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -11,7 +11,7 @@ class Kernel extends ConsoleKernel {
 	 * @var array
 	 */
 	protected $commands = [
-		'App\Console\Commands\Inspire',
+		'FireflyIII\Console\Commands\Inspire',
 	];
 
 	/**
diff --git a/app/Events/Event.php b/app/Events/Event.php
index d59f7690f8..2a3fbc3fe8 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -1,4 +1,4 @@
-<?php namespace App\Events;
+<?php namespace FireflyIII\Events;
 
 abstract class Event {
 
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index ca5215b369..8c61cf51d1 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,4 +1,4 @@
-<?php namespace App\Exceptions;
+<?php namespace FireflyIII\Exceptions;
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 4ad5c58a1a..e5c6f11823 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -1,6 +1,6 @@
-<?php namespace App\Http\Controllers\Auth;
+<?php namespace FireflyIII\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 3106193591..9d3327a9c5 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -1,6 +1,6 @@
-<?php namespace App\Http\Controllers\Auth;
+<?php namespace FireflyIII\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Foundation\Auth\ResetsPasswords;
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 27b3f45272..847a5e9741 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace FireflyIII\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesCommands;
 use Illuminate\Routing\Controller as BaseController;
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c7ca983fa7..0b05851a88 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace FireflyIII\Http\Controllers;
 
 class HomeController extends Controller {
 
diff --git a/app/Http/Controllers/WelcomeController.php b/app/Http/Controllers/WelcomeController.php
index 8a5ac6dba5..1964455bbc 100644
--- a/app/Http/Controllers/WelcomeController.php
+++ b/app/Http/Controllers/WelcomeController.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace FireflyIII\Http\Controllers;
 
 class WelcomeController extends Controller {
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 0a2addcacb..79d94aa578 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http;
+<?php namespace FireflyIII\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -15,7 +15,7 @@ class Kernel extends HttpKernel {
 		'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
 		'Illuminate\Session\Middleware\StartSession',
 		'Illuminate\View\Middleware\ShareErrorsFromSession',
-		'App\Http\Middleware\VerifyCsrfToken',
+		'FireflyIII\Http\Middleware\VerifyCsrfToken',
 	];
 
 	/**
@@ -24,9 +24,9 @@ class Kernel extends HttpKernel {
 	 * @var array
 	 */
 	protected $routeMiddleware = [
-		'auth' => 'App\Http\Middleware\Authenticate',
+		'auth' => 'FireflyIII\Http\Middleware\Authenticate',
 		'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-		'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
+		'guest' => 'FireflyIII\Http\Middleware\RedirectIfAuthenticated',
 	];
 
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 72a7613af6..80c81b876a 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index dd5a86727b..b60bd5268f 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 750a39b187..76107c584d 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 4516ab2bb5..772d06464f 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Requests;
+<?php namespace FireflyIII\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Models/Account.php b/app/Models/Account.php
new file mode 100644
index 0000000000..ee46be8716
--- /dev/null
+++ b/app/Models/Account.php
@@ -0,0 +1,14 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class Account
+ *
+ * @package FireflyIII\Models
+ */
+class Account extends Model {
+
+	//
+
+}
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
new file mode 100644
index 0000000000..85943ced0e
--- /dev/null
+++ b/app/Models/AccountMeta.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AccountMeta extends Model {
+
+	//
+
+}
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
new file mode 100644
index 0000000000..097744c746
--- /dev/null
+++ b/app/Models/AccountType.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AccountType extends Model {
+
+	//
+
+}
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
new file mode 100644
index 0000000000..a47a812d16
--- /dev/null
+++ b/app/Models/Bill.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Bill extends Model {
+
+	//
+
+}
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
new file mode 100644
index 0000000000..ad118e33b8
--- /dev/null
+++ b/app/Models/Budget.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Budget extends Model {
+
+	//
+
+}
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
new file mode 100644
index 0000000000..60f4df6b9f
--- /dev/null
+++ b/app/Models/BudgetLimit.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BudgetLimit extends Model {
+
+	//
+
+}
diff --git a/app/Models/Category.php b/app/Models/Category.php
new file mode 100644
index 0000000000..5fc640abac
--- /dev/null
+++ b/app/Models/Category.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Category extends Model {
+
+	//
+
+}
diff --git a/app/Models/Component.php b/app/Models/Component.php
new file mode 100644
index 0000000000..db9bbfd65f
--- /dev/null
+++ b/app/Models/Component.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Component extends Model {
+
+	//
+
+}
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
new file mode 100644
index 0000000000..17804aad91
--- /dev/null
+++ b/app/Models/LimitRepetition.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LimitRepetition extends Model {
+
+	//
+
+}
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
new file mode 100644
index 0000000000..80a570fd46
--- /dev/null
+++ b/app/Models/PiggyBank.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PiggyBank extends Model {
+
+	//
+
+}
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
new file mode 100644
index 0000000000..b15c5ac181
--- /dev/null
+++ b/app/Models/PiggyBankEvent.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PiggyBankEvent extends Model {
+
+	//
+
+}
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
new file mode 100644
index 0000000000..6a39ce1392
--- /dev/null
+++ b/app/Models/PiggyBankRepetition.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PiggyBankRepetition extends Model {
+
+	//
+
+}
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
new file mode 100644
index 0000000000..e8e6bd94dc
--- /dev/null
+++ b/app/Models/Preference.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Preference extends Model {
+
+	//
+
+}
diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php
new file mode 100644
index 0000000000..094d22fbbf
--- /dev/null
+++ b/app/Models/Reminder.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Reminder extends Model {
+
+	//
+
+}
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
new file mode 100644
index 0000000000..eee92e4bbb
--- /dev/null
+++ b/app/Models/Transaction.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Transaction extends Model {
+
+	//
+
+}
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
new file mode 100644
index 0000000000..caa9901933
--- /dev/null
+++ b/app/Models/TransactionCurrency.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionCurrency extends Model {
+
+	//
+
+}
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
new file mode 100644
index 0000000000..a6ad7f7580
--- /dev/null
+++ b/app/Models/TransactionGroup.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionGroup extends Model {
+
+	//
+
+}
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
new file mode 100644
index 0000000000..3f986d0fa0
--- /dev/null
+++ b/app/Models/TransactionJournal.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionJournal extends Model {
+
+	//
+
+}
diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php
new file mode 100644
index 0000000000..04d835dcc6
--- /dev/null
+++ b/app/Models/TransactionRelation.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionRelation extends Model {
+
+	//
+
+}
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
new file mode 100644
index 0000000000..9168cb3491
--- /dev/null
+++ b/app/Models/TransactionType.php
@@ -0,0 +1,9 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionType extends Model {
+
+	//
+
+}
diff --git a/app/User.php b/app/Models/User.php
similarity index 95%
rename from app/User.php
rename to app/Models/User.php
index 2dae84799d..598eb898ce 100644
--- a/app/User.php
+++ b/app/Models/User.php
@@ -1,4 +1,4 @@
-<?php namespace App;
+<?php namespace FireflyIII\Models;
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ff9d6f68fb..1b0dd3e094 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace FireflyIII\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -27,7 +27,7 @@ class AppServiceProvider extends ServiceProvider {
 	{
 		$this->app->bind(
 			'Illuminate\Contracts\Auth\Registrar',
-			'App\Services\Registrar'
+			'FireflyIII\Services\Registrar'
 		);
 	}
 
diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
index f0d9be6fe2..0978b5e862 100644
--- a/app/Providers/BusServiceProvider.php
+++ b/app/Providers/BusServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace FireflyIII\Providers;
 
 use Illuminate\Bus\Dispatcher;
 use Illuminate\Support\ServiceProvider;
@@ -16,7 +16,7 @@ class BusServiceProvider extends ServiceProvider {
 		$dispatcher->mapUsing(function($command)
 		{
 			return Dispatcher::simpleMapping(
-				$command, 'App\Commands', 'App\Handlers\Commands'
+				$command, 'FireflyIII\Commands', 'FireflyIII\Handlers\Commands'
 			);
 		});
 	}
diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
index 06e5799239..577b2520ea 100644
--- a/app/Providers/ConfigServiceProvider.php
+++ b/app/Providers/ConfigServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace FireflyIII\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 1cece99932..2f1f21df67 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace FireflyIII\Providers;
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index afa34c83dc..0a8c96c315 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace FireflyIII\Providers;
 
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -12,7 +12,7 @@ class RouteServiceProvider extends ServiceProvider {
 	 *
 	 * @var string
 	 */
-	protected $namespace = 'App\Http\Controllers';
+	protected $namespace = 'FireflyIII\Http\Controllers';
 
 	/**
 	 * Define your route model bindings, pattern filters, etc.
diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
index 1035468140..434b46e4db 100644
--- a/app/Services/Registrar.php
+++ b/app/Services/Registrar.php
@@ -1,6 +1,6 @@
-<?php namespace App\Services;
+<?php namespace FireflyIII\Services;
 
-use App\User;
+use FireflyIII\User;
 use Validator;
 use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
 
diff --git a/bootstrap/app.php b/bootstrap/app.php
index f50a3f7206..ebe5d21ae4 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -28,17 +28,17 @@ $app = new Illuminate\Foundation\Application(
 
 $app->singleton(
 	'Illuminate\Contracts\Http\Kernel',
-	'App\Http\Kernel'
+	'FireflyIII\Http\Kernel'
 );
 
 $app->singleton(
 	'Illuminate\Contracts\Console\Kernel',
-	'App\Console\Kernel'
+	'FireflyIII\Console\Kernel'
 );
 
 $app->singleton(
 	'Illuminate\Contracts\Debug\ExceptionHandler',
-	'App\Exceptions\Handler'
+	'FireflyIII\Exceptions\Handler'
 );
 
 /*
diff --git a/composer.json b/composer.json
index 9dd31064af..7ebe11da20 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
             "database"
         ],
         "psr-4": {
-            "App\\": "app/"
+            "FireflyIII\\": "app/"
         }
     },
     "autoload-dev": {
diff --git a/config/app.php b/config/app.php
index d97f4884c1..ce728e5ec0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -139,11 +139,11 @@ return [
 		/*
 		 * Application Service Providers...
 		 */
-		'App\Providers\AppServiceProvider',
-		'App\Providers\BusServiceProvider',
-		'App\Providers\ConfigServiceProvider',
-		'App\Providers\EventServiceProvider',
-		'App\Providers\RouteServiceProvider',
+		'FireflyIII\Providers\AppServiceProvider',
+		'FireflyIII\Providers\BusServiceProvider',
+		'FireflyIII\Providers\ConfigServiceProvider',
+		'FireflyIII\Providers\EventServiceProvider',
+		'FireflyIII\Providers\RouteServiceProvider',
 
 	],
 
diff --git a/config/auth.php b/config/auth.php
index 5b436aa4f9..e4eb512d63 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -28,7 +28,7 @@ return [
 	|
 	*/
 
-	'model' => 'App\User',
+	'model' => 'FireflyIII\User',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/phpspec.yml b/phpspec.yml
index eb57939e57..a028599425 100644
--- a/phpspec.yml
+++ b/phpspec.yml
@@ -1,5 +1,5 @@
 suites:
     main:
-        namespace: App
-        psr4_prefix: App
+        namespace: FireflyIII
+        psr4_prefix: FireflyIII
         src_path: app
\ No newline at end of file