diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 177c572ef3..1b3518466c 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php
index 5ba431f88a..9a30caa682 100644
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 7dfcef1aa6..5507097b80 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php
index a249ee1459..69e035e6c8 100644
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CategoryController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php
index 1acc1eaf87..c80f2ba6ae 100644
--- a/app/Http/Controllers/Chart/PiggyBankController.php
+++ b/app/Http/Controllers/Chart/PiggyBankController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php
index d1d62ba9f5..13380c6231 100644
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ReportController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php
index 1b5a7afe0b..8fc42f10b6 100644
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ReportController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Controllers\Popup;
 
 
diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index b54f628668..a8b0ccc636 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * MassController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Controllers\Transaction;
 
 use Auth;
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 57d749e47c..aedbc0589b 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * SplitController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Controllers\Transaction;
 
 
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 483cacaae4..482085bbaf 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Authenticate.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php
index 0c966add4c..a17bed78cb 100644
--- a/app/Http/Middleware/AuthenticateTwoFactor.php
+++ b/app/Http/Middleware/AuthenticateTwoFactor.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AuthenticateTwoFactor.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php
index a7d2c1d278..c4ae645a99 100644
--- a/app/Http/Middleware/Binder.php
+++ b/app/Http/Middleware/Binder.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Binder.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index b13c615701..3c8220180d 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * EncryptCookies.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php
index 918d03b87d..3df960c954 100644
--- a/app/Http/Middleware/IsAdmin.php
+++ b/app/Http/Middleware/IsAdmin.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types = 1);
-
-
 /**
  * IsAdmin.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -10,7 +7,6 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
-
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
diff --git a/app/Http/Middleware/IsConfirmed.php b/app/Http/Middleware/IsConfirmed.php
index 92dd04bfb4..acf23ca13b 100644
--- a/app/Http/Middleware/IsConfirmed.php
+++ b/app/Http/Middleware/IsConfirmed.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * IsConfirmed.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Middleware/IsNotConfirmed.php b/app/Http/Middleware/IsNotConfirmed.php
index 75f14d6264..3aa40091b0 100644
--- a/app/Http/Middleware/IsNotConfirmed.php
+++ b/app/Http/Middleware/IsNotConfirmed.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * IsNotConfirmed.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index d63cbb74d7..9567ee62f1 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -1,6 +1,13 @@
 <?php
-declare(strict_types = 1);
+/**
+ * Range.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
+declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
 
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 63462dea3d..ef0014b45d 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RedirectIfAuthenticated.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Middleware;
diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
index 39b422e23e..df21bc9583 100644
--- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RedirectIfTwoFactorAuthenticated.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 62c21ded02..f338ac0af5 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * VerifyCsrfToken.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Http\Middleware;
 
diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php
index b76a2b60b4..bac9b3244b 100644
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php
index 0f1583869a..39be3474c3 100644
--- a/app/Http/Requests/AttachmentFormRequest.php
+++ b/app/Http/Requests/AttachmentFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AttachmentFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php
index 0c749b3f17..1698dd2d67 100644
--- a/app/Http/Requests/BillFormRequest.php
+++ b/app/Http/Requests/BillFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php
index 0a596e883a..40afc68dc2 100644
--- a/app/Http/Requests/BudgetFormRequest.php
+++ b/app/Http/Requests/BudgetFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php
index d563da0dc5..cff83980d6 100644
--- a/app/Http/Requests/CategoryFormRequest.php
+++ b/app/Http/Requests/CategoryFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CategoryFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php
index 5375ecaded..ccdd04fa38 100644
--- a/app/Http/Requests/CurrencyFormRequest.php
+++ b/app/Http/Requests/CurrencyFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php
index a3620bf1d2..60a4ee9994 100644
--- a/app/Http/Requests/DeleteAccountFormRequest.php
+++ b/app/Http/Requests/DeleteAccountFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * DeleteAccountFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php
index 9b2f52b432..4c0f9e0639 100644
--- a/app/Http/Requests/ExportFormRequest.php
+++ b/app/Http/Requests/ExportFormRequest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ExportFormRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index db26820994..43105e214a 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * JournalFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php
index faa56ee83b..967bd9e031 100644
--- a/app/Http/Requests/MassDeleteJournalRequest.php
+++ b/app/Http/Requests/MassDeleteJournalRequest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * MassDeleteJournalRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php
index 5f3a60706e..fcd9905221 100644
--- a/app/Http/Requests/MassEditJournalRequest.php
+++ b/app/Http/Requests/MassEditJournalRequest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * MassEditJournalRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php
index d707b02caa..8ddc64fa7d 100644
--- a/app/Http/Requests/NewUserFormRequest.php
+++ b/app/Http/Requests/NewUserFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * NewUserFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php
index a00b93d67b..026a4684db 100644
--- a/app/Http/Requests/PiggyBankFormRequest.php
+++ b/app/Http/Requests/PiggyBankFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php
index e4b7064cc6..2017ab61d0 100644
--- a/app/Http/Requests/ProfileFormRequest.php
+++ b/app/Http/Requests/ProfileFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ProfileFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 45ff721553..ad6dca8f33 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Request.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index cc54cdf528..d1c6ef82fc 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RuleFormRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php
index 896aee2ebc..0616a869a9 100644
--- a/app/Http/Requests/RuleGroupFormRequest.php
+++ b/app/Http/Requests/RuleGroupFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleGroupFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 /**
  * RuleGroupFormRequest.php
diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php
index 5b2adc64b3..e6f71a0190 100644
--- a/app/Http/Requests/SelectTransactionsRequest.php
+++ b/app/Http/Requests/SelectTransactionsRequest.php
@@ -1,13 +1,14 @@
 <?php
-declare(strict_types = 1);
 /**
  * SelectTransactionsRequest.php
- * Copyright (C) 2016 Robert Horlings
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php
index c14cd5d121..5213fb182e 100644
--- a/app/Http/Requests/SplitJournalFormRequest.php
+++ b/app/Http/Requests/SplitJournalFormRequest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * SplitJournalFormRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php
index 531770b38f..9719cd6a94 100644
--- a/app/Http/Requests/TagFormRequest.php
+++ b/app/Http/Requests/TagFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Http\Requests;
 
diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php
index 2ff255b199..377b8c55ef 100644
--- a/app/Http/Requests/TestRuleFormRequest.php
+++ b/app/Http/Requests/TestRuleFormRequest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TestRuleFormRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,13 +8,6 @@ declare(strict_types = 1);
  */
 
 declare(strict_types = 1);
-/**
- * TestRuleFormRequest.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
 
 namespace FireflyIII\Http\Requests;
 
diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php
index 6bfacf9737..b971878f1e 100644
--- a/app/Http/Requests/TokenFormRequest.php
+++ b/app/Http/Requests/TokenFormRequest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TokenFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
index 1f6397ce8a..3c791ddeaf 100644
--- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
+++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ExecuteRuleGroupOnExistingTransactions.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Jobs;
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
index 97a3858ccc..65794cc160 100644
--- a/app/Jobs/Job.php
+++ b/app/Jobs/Job.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Job.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Jobs;
diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php
index 5fbb1eb549..fe01e3f2c4 100644
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * MailError.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Jobs;
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 55bcca6340..9070be24e4 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Account.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 3fdd851b99..ccb01e5d73 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountMeta.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index 3c509047bf..2bb17e3400 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountType.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 8252cbf65f..1572959d1b 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Attachment.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 04dce7cff6..93888c5e4f 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Bill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index fb5ad54a2d..4b37b4e7da 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Budget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 16120e6a44..40229622bf 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetLimit.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 08b850180c..db3a8172f4 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Category.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Component.php b/app/Models/Component.php
index 3660452659..720f3a53a9 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Component.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php
index 1145d8e43a..8babcf7036 100644
--- a/app/Models/ExportJob.php
+++ b/app/Models/ExportJob.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ExportJob.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Models;
 
 use Auth;
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 347ecaf0c0..fb0a77ac40 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * LimitRepetition.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index c3dd596d69..78749a8e5e 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 4d0bde7ba1..7a2fe12d75 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankEvent.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 3797040a6e..4919142fa0 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankRepetition.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index a3a17b61b5..33d7e22c33 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Preference.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 7cd850d640..390db24268 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Role.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Models;
 
diff --git a/app/Models/Rule.php b/app/Models/Rule.php
index 393617f6c7..491c7ad1d8 100644
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * Rule.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Models;
 
 use Auth;
diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php
index 16676454e8..720a7ec753 100644
--- a/app/Models/RuleAction.php
+++ b/app/Models/RuleAction.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleAction.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 /**
  * RuleAction.php
diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php
index 9453df6fe4..c02d11ebec 100644
--- a/app/Models/RuleGroup.php
+++ b/app/Models/RuleGroup.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RuleGroup.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Models;
 
 use Auth;
diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php
index 1ec470c1f5..a00f003742 100644
--- a/app/Models/RuleTrigger.php
+++ b/app/Models/RuleTrigger.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RuleTrigger.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index f08a04d520..bfa9e17dee 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tag.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index c738cdbc31..ead152546c 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Transaction.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index c216d95670..69d33955b6 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TransactionCurrency.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
index a1013a83c5..0f17f99caa 100644
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TransactionGroup.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 873d5826d4..15cbf6a7fe 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TransactionJournal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php
index 1ee3118131..801ab0e3df 100644
--- a/app/Models/TransactionJournalMeta.php
+++ b/app/Models/TransactionJournalMeta.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TransactionJournalMeta.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index 9b74f76a14..baf44372c5 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TransactionType.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Models;
diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php
index a09968cc5d..4ac1f3bab1 100644
--- a/app/Providers/AccountServiceProvider.php
+++ b/app/Providers/AccountServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 27b2a18de0..e2ab998575 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AppServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php
index 71c7149894..bee83cf88c 100644
--- a/app/Providers/AttachmentServiceProvider.php
+++ b/app/Providers/AttachmentServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AttachmentServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index db0aa37305..b24e9e542a 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AuthServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php
index b2cce88879..289d712094 100644
--- a/app/Providers/BillServiceProvider.php
+++ b/app/Providers/BillServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php
index 1cb8a68951..afd73a846b 100644
--- a/app/Providers/BudgetServiceProvider.php
+++ b/app/Providers/BudgetServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php
index 68a78a9a8b..5adab5c229 100644
--- a/app/Providers/CategoryServiceProvider.php
+++ b/app/Providers/CategoryServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CategoryServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/CrudServiceProvider.php b/app/Providers/CrudServiceProvider.php
index df8601eac6..0117cf78a5 100644
--- a/app/Providers/CrudServiceProvider.php
+++ b/app/Providers/CrudServiceProvider.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types = 1);
-
-
 /**
  * CrudServiceProvider.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -10,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Providers;
 
 use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index f816a055bc..2b91f62b09 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * EventServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php
index f0e75345d4..380b14a2e9 100644
--- a/app/Providers/ExportJobServiceProvider.php
+++ b/app/Providers/ExportJobServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ExportJobServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index 6fce634483..47ad19c301 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * FireflyServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php
index 9ce095e881..db50c23499 100644
--- a/app/Providers/JournalServiceProvider.php
+++ b/app/Providers/JournalServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * JournalServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php
index 3a70c738c8..14aa3353af 100644
--- a/app/Providers/PiggyBankServiceProvider.php
+++ b/app/Providers/PiggyBankServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 9a500f25e3..e66d1e5c18 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RouteServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php
index dd0a9013ed..7536006145 100644
--- a/app/Providers/RuleGroupServiceProvider.php
+++ b/app/Providers/RuleGroupServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleGroupServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php
index b208ca39b7..2a416fcea0 100644
--- a/app/Providers/RuleServiceProvider.php
+++ b/app/Providers/RuleServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php
index 296e9f50c0..51e4a16e45 100644
--- a/app/Providers/TagServiceProvider.php
+++ b/app/Providers/TagServiceProvider.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 19363a9a81..66ece94755 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 
diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php
index 76f8e718d0..288ae35d96 100644
--- a/app/Repositories/Account/AccountRepositoryInterface.php
+++ b/app/Repositories/Account/AccountRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AccountRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Account;
diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php
index 73dd96444d..aeb518376c 100644
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AttachmentRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Attachment;
diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php
index 2c25be8baa..b95cc969f8 100644
--- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php
+++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * AttachmentRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Attachment;
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 8964cde01d..7a6c99375d 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Bill;
diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php
index 9563c7773c..3305e26d68 100644
--- a/app/Repositories/Bill/BillRepositoryInterface.php
+++ b/app/Repositories/Bill/BillRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Bill;
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index 045636b32a..04d63893a5 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Budget;
diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php
index 10e9adf536..6feeb5336c 100644
--- a/app/Repositories/Budget/BudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Budget;
diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php
index f552aeff8c..00bb36d752 100644
--- a/app/Repositories/Category/CategoryRepository.php
+++ b/app/Repositories/Category/CategoryRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CategoryRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Category;
diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php
index 71f5f42998..3df5717ab9 100644
--- a/app/Repositories/Category/CategoryRepositoryInterface.php
+++ b/app/Repositories/Category/CategoryRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CategoryRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Category;
diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php
index f9d60c9740..f713cc22ad 100644
--- a/app/Repositories/Currency/CurrencyRepository.php
+++ b/app/Repositories/Currency/CurrencyRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Currency;
diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php
index 2aba1b93bc..b6d2a591a2 100644
--- a/app/Repositories/Currency/CurrencyRepositoryInterface.php
+++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Currency;
diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php
index 445ffb0af7..fe4f54f4f3 100644
--- a/app/Repositories/ExportJob/ExportJobRepository.php
+++ b/app/Repositories/ExportJob/ExportJobRepository.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ExportJobRepository.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\ExportJob;
 
 use Carbon\Carbon;
diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
index 43572ed1c2..18ef2827f0 100644
--- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
+++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ExportJobRepositoryInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\ExportJob;
 
 use FireflyIII\Models\ExportJob;
diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index 399c81393a..8eb3e87fe6 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * JournalRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Journal;
diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php
index b55a74f32b..0b452ec64c 100644
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * JournalRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Journal;
diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php
index a2a48803f0..d0e9a90ce3 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\PiggyBank;
diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
index f45d132b2c..54f3dd655f 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBankRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\PiggyBank;
diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php
index e9605021f3..6dcfca8e09 100644
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RuleRepository.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\Rule;
 
 use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php
index 4c98093d20..2acf299b30 100644
--- a/app/Repositories/Rule/RuleRepositoryInterface.php
+++ b/app/Repositories/Rule/RuleRepositoryInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RuleRepositoryInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\Rule;
 
 use FireflyIII\Models\Rule;
diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php
index 2cd7207d49..5cb891732b 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleGroupRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\RuleGroup;
diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
index eb8681a2eb..5faab4fbe3 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * RuleGroupRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\RuleGroup;
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 345f28114c..b2ae35a528 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Tag;
diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php
index ade67fb0af..4f9304c662 100644
--- a/app/Repositories/Tag/TagRepositoryInterface.php
+++ b/app/Repositories/Tag/TagRepositoryInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagRepositoryInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Repositories\Tag;
diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php
index 9a3c9fd267..e2fec6aa11 100644
--- a/app/Repositories/User/UserRepository.php
+++ b/app/Repositories/User/UserRepository.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserRepository.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\User;
 
 
diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php
index ffa30a8948..2d20707cd4 100644
--- a/app/Repositories/User/UserRepositoryInterface.php
+++ b/app/Repositories/User/UserRepositoryInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserRepositoryInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Repositories\User;
 
 
diff --git a/app/Rules/Actions/ActionInterface.php b/app/Rules/Actions/ActionInterface.php
index 42f95b37db..c5fae472d6 100644
--- a/app/Rules/Actions/ActionInterface.php
+++ b/app/Rules/Actions/ActionInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ActionInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 use FireflyIII\Models\RuleAction;
diff --git a/app/Rules/Actions/AddTag.php b/app/Rules/Actions/AddTag.php
index 87d2b8e743..1203ea1765 100644
--- a/app/Rules/Actions/AddTag.php
+++ b/app/Rules/Actions/AddTag.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AddTag.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/AppendDescription.php b/app/Rules/Actions/AppendDescription.php
index 281b1a0857..b9d0e2036b 100644
--- a/app/Rules/Actions/AppendDescription.php
+++ b/app/Rules/Actions/AppendDescription.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AppendDescription.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 use FireflyIII\Models\RuleAction;
diff --git a/app/Rules/Actions/ClearBudget.php b/app/Rules/Actions/ClearBudget.php
index 0cea12a61e..cda1f246dc 100644
--- a/app/Rules/Actions/ClearBudget.php
+++ b/app/Rules/Actions/ClearBudget.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ClearBudget.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/ClearCategory.php b/app/Rules/Actions/ClearCategory.php
index 3a1c5d1d7f..1b01181ac1 100644
--- a/app/Rules/Actions/ClearCategory.php
+++ b/app/Rules/Actions/ClearCategory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ClearCategory.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/PrependDescription.php b/app/Rules/Actions/PrependDescription.php
index 52b4b4f2f0..ce85d7e374 100644
--- a/app/Rules/Actions/PrependDescription.php
+++ b/app/Rules/Actions/PrependDescription.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * PrependDescription.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 use FireflyIII\Models\RuleAction;
diff --git a/app/Rules/Actions/RemoveAllTags.php b/app/Rules/Actions/RemoveAllTags.php
index 3bcd36f8af..005d18b8be 100644
--- a/app/Rules/Actions/RemoveAllTags.php
+++ b/app/Rules/Actions/RemoveAllTags.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RemoveAllTags.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/RemoveTag.php b/app/Rules/Actions/RemoveTag.php
index a6b5c87327..eaab0bb1e9 100644
--- a/app/Rules/Actions/RemoveTag.php
+++ b/app/Rules/Actions/RemoveTag.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * RemoveTag.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php
index a94081bfbc..1be644aa37 100644
--- a/app/Rules/Actions/SetBudget.php
+++ b/app/Rules/Actions/SetBudget.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * SetBudget.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/SetCategory.php b/app/Rules/Actions/SetCategory.php
index 9e3f542dd3..848dec089e 100644
--- a/app/Rules/Actions/SetCategory.php
+++ b/app/Rules/Actions/SetCategory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * SetCategory.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 
diff --git a/app/Rules/Actions/SetDescription.php b/app/Rules/Actions/SetDescription.php
index 47dabc12d6..0cec07ed15 100644
--- a/app/Rules/Actions/SetDescription.php
+++ b/app/Rules/Actions/SetDescription.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * SetDescription.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Actions;
 
 use FireflyIII\Models\RuleAction;
diff --git a/app/Rules/Factory/TriggerFactory.php b/app/Rules/Factory/TriggerFactory.php
index 764a20ecd7..6ada8ca347 100644
--- a/app/Rules/Factory/TriggerFactory.php
+++ b/app/Rules/Factory/TriggerFactory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TriggerFactory.php
  * Copyright (C) 2016 Robert Horlings
diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php
index bf29dcb999..25522aabf8 100644
--- a/app/Rules/Processor.php
+++ b/app/Rules/Processor.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * Processor.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules;
 
 use FireflyIII\Models\Rule;
diff --git a/app/Rules/TransactionMatcher.php b/app/Rules/TransactionMatcher.php
index 8bcda69f4d..7cbef9a970 100644
--- a/app/Rules/TransactionMatcher.php
+++ b/app/Rules/TransactionMatcher.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TransactionMatcher.php
  * Copyright (C) 2016 Robert Horlings
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php
index 9fc2db2ba0..96422a4387 100644
--- a/app/Rules/Triggers/AbstractTrigger.php
+++ b/app/Rules/Triggers/AbstractTrigger.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AbstractTrigger.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\RuleTrigger;
diff --git a/app/Rules/Triggers/AmountExactly.php b/app/Rules/Triggers/AmountExactly.php
index 7a6ca714dd..4adfc63604 100644
--- a/app/Rules/Triggers/AmountExactly.php
+++ b/app/Rules/Triggers/AmountExactly.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AmountExactly.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 
diff --git a/app/Rules/Triggers/AmountLess.php b/app/Rules/Triggers/AmountLess.php
index e6d8cc9c27..d90711c7b6 100644
--- a/app/Rules/Triggers/AmountLess.php
+++ b/app/Rules/Triggers/AmountLess.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AmountLess.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 
diff --git a/app/Rules/Triggers/AmountMore.php b/app/Rules/Triggers/AmountMore.php
index ce8b2c7573..66181e8a98 100644
--- a/app/Rules/Triggers/AmountMore.php
+++ b/app/Rules/Triggers/AmountMore.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AmountMore.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 
diff --git a/app/Rules/Triggers/DescriptionContains.php b/app/Rules/Triggers/DescriptionContains.php
index 6f75479ce4..c841815075 100644
--- a/app/Rules/Triggers/DescriptionContains.php
+++ b/app/Rules/Triggers/DescriptionContains.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * DescriptionContains.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 
diff --git a/app/Rules/Triggers/DescriptionEnds.php b/app/Rules/Triggers/DescriptionEnds.php
index 751645ff85..7bfc9cd891 100644
--- a/app/Rules/Triggers/DescriptionEnds.php
+++ b/app/Rules/Triggers/DescriptionEnds.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * DescriptionEnds.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/DescriptionIs.php b/app/Rules/Triggers/DescriptionIs.php
index 81bfb8ad7c..4184986240 100644
--- a/app/Rules/Triggers/DescriptionIs.php
+++ b/app/Rules/Triggers/DescriptionIs.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * DescriptionIs.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/DescriptionStarts.php b/app/Rules/Triggers/DescriptionStarts.php
index 295333c95b..fb8384f7ed 100644
--- a/app/Rules/Triggers/DescriptionStarts.php
+++ b/app/Rules/Triggers/DescriptionStarts.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * DescriptionStarts.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/Rules/Triggers/FromAccountContains.php
index d07b768ffa..70f2045277 100644
--- a/app/Rules/Triggers/FromAccountContains.php
+++ b/app/Rules/Triggers/FromAccountContains.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FromAccountContains.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/Rules/Triggers/FromAccountEnds.php
index 2311bbffd3..319683e87f 100644
--- a/app/Rules/Triggers/FromAccountEnds.php
+++ b/app/Rules/Triggers/FromAccountEnds.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FromAccountEnds.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/Rules/Triggers/FromAccountIs.php
index 88692ee544..dcd9587556 100644
--- a/app/Rules/Triggers/FromAccountIs.php
+++ b/app/Rules/Triggers/FromAccountIs.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FromAccountIs.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/Rules/Triggers/FromAccountStarts.php
index 3bebd02b2b..71a84e253d 100644
--- a/app/Rules/Triggers/FromAccountStarts.php
+++ b/app/Rules/Triggers/FromAccountStarts.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FromAccountStarts.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/Rules/Triggers/ToAccountContains.php
index 6ba591c13a..150f149b14 100644
--- a/app/Rules/Triggers/ToAccountContains.php
+++ b/app/Rules/Triggers/ToAccountContains.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ToAccountContains.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/Rules/Triggers/ToAccountEnds.php
index f4c08ebd3f..9f4d6e0da7 100644
--- a/app/Rules/Triggers/ToAccountEnds.php
+++ b/app/Rules/Triggers/ToAccountEnds.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ToAccountEnds.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/Rules/Triggers/ToAccountIs.php
index 36682f4c19..613770b97f 100644
--- a/app/Rules/Triggers/ToAccountIs.php
+++ b/app/Rules/Triggers/ToAccountIs.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ToAccountIs.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/Rules/Triggers/ToAccountStarts.php
index ffb3e5471a..3dab74bd09 100644
--- a/app/Rules/Triggers/ToAccountStarts.php
+++ b/app/Rules/Triggers/ToAccountStarts.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ToAccountStarts.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\Account;
diff --git a/app/Rules/Triggers/TransactionType.php b/app/Rules/Triggers/TransactionType.php
index a57d1aa1cc..0abff3d7d5 100644
--- a/app/Rules/Triggers/TransactionType.php
+++ b/app/Rules/Triggers/TransactionType.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TransactionType.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/TriggerInterface.php b/app/Rules/Triggers/TriggerInterface.php
index 2cd5bd2c2c..3f102a2890 100644
--- a/app/Rules/Triggers/TriggerInterface.php
+++ b/app/Rules/Triggers/TriggerInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TriggerInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/UserAction.php b/app/Rules/Triggers/UserAction.php
index 32f9698a91..a0967448cb 100644
--- a/app/Rules/Triggers/UserAction.php
+++ b/app/Rules/Triggers/UserAction.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserAction.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Rules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index 7eaccfd620..d9b5882a22 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Amount.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php
index bf59895c6d..de024c609d 100644
--- a/app/Support/Binder/AccountList.php
+++ b/app/Support/Binder/AccountList.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AccountList.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,7 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
 
 namespace FireflyIII\Support\Binder;
 
diff --git a/app/Support/Binder/BinderInterface.php b/app/Support/Binder/BinderInterface.php
index e48b4bfd5c..85237ac816 100644
--- a/app/Support/Binder/BinderInterface.php
+++ b/app/Support/Binder/BinderInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BinderInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Binder;
 
 /**
diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php
index 18e2877cc3..a168a9d1e4 100644
--- a/app/Support/Binder/BudgetList.php
+++ b/app/Support/Binder/BudgetList.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BudgetList.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Binder;
 
 use Auth;
diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php
index a33309a852..1b60c294d7 100644
--- a/app/Support/Binder/CategoryList.php
+++ b/app/Support/Binder/CategoryList.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * CategoryList.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Binder;
 
 use Auth;
diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php
index d8bbbc3181..a5581de5f2 100644
--- a/app/Support/Binder/Date.php
+++ b/app/Support/Binder/Date.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * Date.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Binder;
 
 use Auth;
diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php
index 4ad7dee7ec..2e1873e289 100644
--- a/app/Support/Binder/JournalList.php
+++ b/app/Support/Binder/JournalList.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types = 1);
-
-
 /**
  * JournalList.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -10,8 +7,9 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace FireflyIII\Support\Binder;
+declare(strict_types = 1);
 
+namespace FireflyIII\Support\Binder;
 
 use Auth;
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Support/Binder/UnfinishedJournal.php b/app/Support/Binder/UnfinishedJournal.php
index b253ebb9ba..52f3d3aa26 100644
--- a/app/Support/Binder/UnfinishedJournal.php
+++ b/app/Support/Binder/UnfinishedJournal.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types = 1);
-
-
 /**
  * UnfinishedJournal.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -11,13 +8,6 @@ declare(strict_types = 1);
  */
 
 declare(strict_types = 1);
-/**
- * Date.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
 
 namespace FireflyIII\Support\Binder;
 
diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php
index 19f6c0f6cc..c571e659ba 100644
--- a/app/Support/CacheProperties.php
+++ b/app/Support/CacheProperties.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * CacheProperties.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Domain.php b/app/Support/Domain.php
index aa9d312e73..ca46acc3a4 100644
--- a/app/Support/Domain.php
+++ b/app/Support/Domain.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * Domain.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support;
 
 /**
diff --git a/app/Support/Events/BillScanner.php b/app/Support/Events/BillScanner.php
index 53b7f5790d..c219972396 100644
--- a/app/Support/Events/BillScanner.php
+++ b/app/Support/Events/BillScanner.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BillScanner.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Events;
 
 
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 642f42ee5e..c93c603ef2 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ExpandedForm.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php
index ea067dcb32..84eadc9dbe 100644
--- a/app/Support/Facades/Amount.php
+++ b/app/Support/Facades/Amount.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Amount.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Facades;
diff --git a/app/Support/Facades/ExpandedForm.php b/app/Support/Facades/ExpandedForm.php
index 50ad979629..6e356aa329 100644
--- a/app/Support/Facades/ExpandedForm.php
+++ b/app/Support/Facades/ExpandedForm.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * ExpandedForm.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Facades;
diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php
index b00578a601..c7e709a603 100644
--- a/app/Support/Facades/Navigation.php
+++ b/app/Support/Facades/Navigation.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Navigation.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Facades;
diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php
index f51347a6e0..5efe07666e 100644
--- a/app/Support/Facades/Preferences.php
+++ b/app/Support/Facades/Preferences.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Preferences.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Facades;
diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php
index 9fa7b179b1..4eb147f6ff 100644
--- a/app/Support/Facades/Steam.php
+++ b/app/Support/Facades/Steam.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Steam.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Facades;
diff --git a/app/Support/Migration/TestData.php b/app/Support/Migration/TestData.php
index b81fc3dd51..d2bd2b42aa 100644
--- a/app/Support/Migration/TestData.php
+++ b/app/Support/Migration/TestData.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TestData.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Support\Migration;
 
@@ -8,14 +16,6 @@ use DB;
 use Navigation;
 use Storage;
 
-/**
- * TestData.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 /**
  * Class TestData
  *
diff --git a/app/Support/Models/TagSupport.php b/app/Support/Models/TagSupport.php
index 8ff15d4cd0..5af0e7c8fc 100644
--- a/app/Support/Models/TagSupport.php
+++ b/app/Support/Models/TagSupport.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagSupport.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Models;
diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php
index f6d2a74b9d..1469715340 100644
--- a/app/Support/Models/TransactionJournalSupport.php
+++ b/app/Support/Models/TransactionJournalSupport.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TransactionJournalSupport.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Support\Models;
 
 
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index de8ee523c3..97144f139a 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Navigation.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php
index 6815fc44d4..8194895de5 100644
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Preferences.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index b356271ccd..cc163b99a9 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Search.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Search;
diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php
index c44c0d8285..f9914d1a50 100644
--- a/app/Support/Search/SearchInterface.php
+++ b/app/Support/Search/SearchInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * SearchInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Search;
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index ab938b7149..d532a43cce 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Steam.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support;
diff --git a/app/Support/Twig/Budget.php b/app/Support/Twig/Budget.php
index 3363f356ac..496b5ae2cc 100644
--- a/app/Support/Twig/Budget.php
+++ b/app/Support/Twig/Budget.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Budget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index 5373708ef6..80315ff5d1 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * General.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php
index daf5d7f5a6..bee9b686e8 100644
--- a/app/Support/Twig/Journal.php
+++ b/app/Support/Twig/Journal.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Journal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php
index 4c101e21fb..e124fc5256 100644
--- a/app/Support/Twig/PiggyBank.php
+++ b/app/Support/Twig/PiggyBank.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * PiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php
index e91f16509e..e5453688bc 100644
--- a/app/Support/Twig/Rule.php
+++ b/app/Support/Twig/Rule.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Rule.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php
index 4af3055432..ced31b189d 100644
--- a/app/Support/Twig/Translation.php
+++ b/app/Support/Twig/Translation.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Translation.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Support\Twig;
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 7e5471269b..2dc9573dc3 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -1,4 +1,12 @@
-<?php
+    <?php
+/**
+ * FireflyValidator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Validation;