diff --git a/app/lib/Firefly/Helper/Controllers/Json.php b/app/lib/Firefly/Helper/Controllers/Json.php
index 80b87286f7..34e4f1f11f 100644
--- a/app/lib/Firefly/Helper/Controllers/Json.php
+++ b/app/lib/Firefly/Helper/Controllers/Json.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 27/09/14
- * Time: 07:39
- */
-
 namespace Firefly\Helper\Controllers;
 
 use LaravelBook\Ardent\Builder;
diff --git a/app/lib/FireflyIII/Database/Account.php b/app/lib/FireflyIII/Database/Account.php
index 09bfa73dc0..3f42aaecfb 100644
--- a/app/lib/FireflyIII/Database/Account.php
+++ b/app/lib/FireflyIII/Database/Account.php
@@ -3,6 +3,9 @@
 namespace FireflyIII\Database;
 
 use Carbon\Carbon;
+use FireflyIII\Database\Ifaces\AccountInterface;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
 use Illuminate\Support\Collection;
diff --git a/app/lib/FireflyIII/Database/AccountType.php b/app/lib/FireflyIII/Database/AccountType.php
index 4417bb4efd..7597174d4f 100644
--- a/app/lib/FireflyIII/Database/AccountType.php
+++ b/app/lib/FireflyIII/Database/AccountType.php
@@ -1,16 +1,14 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 23/10/14
- * Time: 13:40
- */
 
 namespace FireflyIII\Database;
 
 use Firefly\Exception\FireflyException;
 use Illuminate\Support\Collection;
 use LaravelBook\Ardent\Ardent;
+use FireflyIII\Database\Ifaces\AccountTypeInterface;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\AccountTypeInterface;
 
 /**
  * Class AccountType
@@ -117,4 +115,14 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls
     {
         // TODO: Implement get() method.
     }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
 }
\ No newline at end of file
diff --git a/app/lib/FireflyIII/Database/Budget.php b/app/lib/FireflyIII/Database/Budget.php
index aa7ef4c94c..f3a9f62d2d 100644
--- a/app/lib/FireflyIII/Database/Budget.php
+++ b/app/lib/FireflyIII/Database/Budget.php
@@ -5,7 +5,9 @@ use Carbon\Carbon;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
 use Illuminate\Support\Collection;
-
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\BudgetInterface;
 /**
  * Class Budget
  *
diff --git a/app/lib/FireflyIII/Database/Category.php b/app/lib/FireflyIII/Database/Category.php
index 55031c4662..7ab7112268 100644
--- a/app/lib/FireflyIII/Database/Category.php
+++ b/app/lib/FireflyIII/Database/Category.php
@@ -5,6 +5,9 @@ use Carbon\Carbon;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
 use Illuminate\Support\Collection;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\CategoryInterface;
 
 /**
  * Class Category
diff --git a/app/lib/FireflyIII/Database/AccountInterface.php b/app/lib/FireflyIII/Database/Ifaces/AccountInterface.php
similarity index 98%
rename from app/lib/FireflyIII/Database/AccountInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/AccountInterface.php
index 0fcdebdcb1..a24fa07421 100644
--- a/app/lib/FireflyIII/Database/AccountInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/AccountInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 use Illuminate\Support\Collection;
 
diff --git a/app/lib/FireflyIII/Database/AccountTypeInterface.php b/app/lib/FireflyIII/Database/Ifaces/AccountTypeInterface.php
similarity index 50%
rename from app/lib/FireflyIII/Database/AccountTypeInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/AccountTypeInterface.php
index 9de34619c4..d06621d702 100644
--- a/app/lib/FireflyIII/Database/AccountTypeInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/AccountTypeInterface.php
@@ -1,12 +1,5 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 23/10/14
- * Time: 13:40
- */
-
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 /**
  * Interface AccountTypeInterface
diff --git a/app/lib/FireflyIII/Database/BudgetInterface.php b/app/lib/FireflyIII/Database/Ifaces/BudgetInterface.php
similarity index 93%
rename from app/lib/FireflyIII/Database/BudgetInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/BudgetInterface.php
index ac38f77e7b..17fd25dbe9 100644
--- a/app/lib/FireflyIII/Database/BudgetInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/BudgetInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
diff --git a/app/lib/FireflyIII/Database/CUD.php b/app/lib/FireflyIII/Database/Ifaces/CUD.php
similarity index 95%
rename from app/lib/FireflyIII/Database/CUD.php
rename to app/lib/FireflyIII/Database/Ifaces/CUD.php
index f555a4f121..b193394134 100644
--- a/app/lib/FireflyIII/Database/CUD.php
+++ b/app/lib/FireflyIII/Database/Ifaces/CUD.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
 
diff --git a/app/lib/FireflyIII/Database/CategoryInterface.php b/app/lib/FireflyIII/Database/Ifaces/CategoryInterface.php
similarity index 80%
rename from app/lib/FireflyIII/Database/CategoryInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/CategoryInterface.php
index 79dfcf343e..4c8dd0d3b0 100644
--- a/app/lib/FireflyIII/Database/CategoryInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/CategoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
diff --git a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php b/app/lib/FireflyIII/Database/Ifaces/CommonDatabaseCalls.php
similarity index 87%
rename from app/lib/FireflyIII/Database/CommonDatabaseCalls.php
rename to app/lib/FireflyIII/Database/Ifaces/CommonDatabaseCalls.php
index 3ed907493b..fb3ba77adc 100644
--- a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php
+++ b/app/lib/FireflyIII/Database/Ifaces/CommonDatabaseCalls.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 14/10/14
- * Time: 09:31
- */
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 use Illuminate\Support\Collection;
 use LaravelBook\Ardent\Ardent;
diff --git a/app/lib/FireflyIII/Database/RecurringInterface.php b/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php
similarity index 91%
rename from app/lib/FireflyIII/Database/RecurringInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php
index ed728ac9a0..98619d7799 100644
--- a/app/lib/FireflyIII/Database/RecurringInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 use Carbon\Carbon;
 
 /**
diff --git a/app/lib/FireflyIII/Database/TransactionCurrencyInterface.php b/app/lib/FireflyIII/Database/Ifaces/TransactionCurrencyInterface.php
similarity index 69%
rename from app/lib/FireflyIII/Database/TransactionCurrencyInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/TransactionCurrencyInterface.php
index 5e10785088..1f87b9266c 100644
--- a/app/lib/FireflyIII/Database/TransactionCurrencyInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/TransactionCurrencyInterface.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 10:28
- */
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 
 /**
diff --git a/app/lib/FireflyIII/Database/TransactionInterface.php b/app/lib/FireflyIII/Database/Ifaces/TransactionInterface.php
similarity index 51%
rename from app/lib/FireflyIII/Database/TransactionInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/TransactionInterface.php
index bd84e011af..768d4d58ae 100644
--- a/app/lib/FireflyIII/Database/TransactionInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/TransactionInterface.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 13:34
- */
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 
 /**
diff --git a/app/lib/FireflyIII/Database/TransactionJournalInterface.php b/app/lib/FireflyIII/Database/Ifaces/TransactionJournalInterface.php
similarity index 75%
rename from app/lib/FireflyIII/Database/TransactionJournalInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/TransactionJournalInterface.php
index f08ed11891..8aebf540a0 100644
--- a/app/lib/FireflyIII/Database/TransactionJournalInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/TransactionJournalInterface.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 07:17
- */
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
diff --git a/app/lib/FireflyIII/Database/TransactionTypeInterface.php b/app/lib/FireflyIII/Database/Ifaces/TransactionTypeInterface.php
similarity index 52%
rename from app/lib/FireflyIII/Database/TransactionTypeInterface.php
rename to app/lib/FireflyIII/Database/Ifaces/TransactionTypeInterface.php
index a1c4096f41..4d0c7c2c11 100644
--- a/app/lib/FireflyIII/Database/TransactionTypeInterface.php
+++ b/app/lib/FireflyIII/Database/Ifaces/TransactionTypeInterface.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 10:28
- */
 
-namespace FireflyIII\Database;
+namespace FireflyIII\Database\Ifaces;
 
 
 /**
diff --git a/app/lib/FireflyIII/Database/Recurring.php b/app/lib/FireflyIII/Database/Recurring.php
index a87b094ba4..d60b75c222 100644
--- a/app/lib/FireflyIII/Database/Recurring.php
+++ b/app/lib/FireflyIII/Database/Recurring.php
@@ -6,6 +6,9 @@ namespace FireflyIII\Database;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use LaravelBook\Ardent\Ardent;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\RecurringInterface;
 
 /**
  * Class Recurring
diff --git a/app/lib/FireflyIII/Database/SwitchUser.php b/app/lib/FireflyIII/Database/SwitchUser.php
index a6ce72fe70..3fa27d3f84 100644
--- a/app/lib/FireflyIII/Database/SwitchUser.php
+++ b/app/lib/FireflyIII/Database/SwitchUser.php
@@ -1,13 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 14/10/14
- * Time: 09:45
- */
 
 namespace FireflyIII\Database;
 
+
 /**
  * Class SwitchUser
  *
diff --git a/app/lib/FireflyIII/Database/Transaction.php b/app/lib/FireflyIII/Database/Transaction.php
index bb10a91b4c..5a64debea1 100644
--- a/app/lib/FireflyIII/Database/Transaction.php
+++ b/app/lib/FireflyIII/Database/Transaction.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 11:00
- */
 
 namespace FireflyIII\Database;
 
@@ -13,7 +7,9 @@ use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
-
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\TransactionInterface;
 /**
  * Class Transaction
  *
diff --git a/app/lib/FireflyIII/Database/TransactionCurrency.php b/app/lib/FireflyIII/Database/TransactionCurrency.php
index 2aeb26af50..912b26a07c 100644
--- a/app/lib/FireflyIII/Database/TransactionCurrency.php
+++ b/app/lib/FireflyIII/Database/TransactionCurrency.php
@@ -1,16 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 10:27
- */
 
 namespace FireflyIII\Database;
 
 
 use Illuminate\Support\Collection;
 use LaravelBook\Ardent\Ardent;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\TransactionCurrencyInterface;
 
 /**
  * Class TransactionType
@@ -109,4 +106,14 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa
     {
         return \TransactionCurrency::whereCode($code)->first();
     }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
 }
\ No newline at end of file
diff --git a/app/lib/FireflyIII/Database/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal.php
index 690ddf5697..a0dcacff8c 100644
--- a/app/lib/FireflyIII/Database/TransactionJournal.php
+++ b/app/lib/FireflyIII/Database/TransactionJournal.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 07:16
- */
 
 namespace FireflyIII\Database;
 
@@ -15,7 +9,9 @@ use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use LaravelBook\Ardent\Ardent;
-
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\TransactionJournalInterface;
 /**
  * Class TransactionJournal
  *
diff --git a/app/lib/FireflyIII/Database/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType.php
index a69b75df58..54c56831b9 100644
--- a/app/lib/FireflyIII/Database/TransactionType.php
+++ b/app/lib/FireflyIII/Database/TransactionType.php
@@ -1,16 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 10:27
- */
 
 namespace FireflyIII\Database;
 
 
 use Illuminate\Support\Collection;
 use LaravelBook\Ardent\Ardent;
+use FireflyIII\Database\Ifaces\CommonDatabaseCalls;
+use FireflyIII\Database\Ifaces\CUD;
+use FireflyIII\Database\Ifaces\TransactionTypeInterface;
 
 /**
  * Class TransactionType
@@ -108,4 +105,14 @@ class TransactionType implements TransactionTypeInterface, CUD, CommonDatabaseCa
         }
         return null;
     }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
 }
\ No newline at end of file
diff --git a/app/lib/FireflyIII/Exception/NotImplementedException.php b/app/lib/FireflyIII/Exception/NotImplementedException.php
index 328ad052ff..208566204f 100644
--- a/app/lib/FireflyIII/Exception/NotImplementedException.php
+++ b/app/lib/FireflyIII/Exception/NotImplementedException.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 24/10/14
- * Time: 08:14
- */
-
 namespace FireflyIII\Exception;
 
 
diff --git a/app/lib/FireflyIII/Shared/Json/Account.php b/app/lib/FireflyIII/Shared/Json/Account.php
index 6fbb1569be..120ed6fad8 100644
--- a/app/lib/FireflyIII/Shared/Json/Account.php
+++ b/app/lib/FireflyIII/Shared/Json/Account.php
@@ -1,14 +1,12 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 27/10/14
- * Time: 09:04
- */
 
 namespace FireflyIII\Shared\Json;
 
-
+/**
+ * Class Account
+ *
+ * @package FireflyIII\Shared\Json
+ */
 class Account {
 
 } 
\ No newline at end of file