diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index a3a3d84697..b0f99940ef 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -1,6 +1,6 @@
 <?php
 
-use FireflyIII\Database\Account as AccountRepository;
+use FireflyIII\Database\Account\Account as AccountRepository;
 use FireflyIII\Exception\FireflyException;
 
 /**
@@ -101,7 +101,7 @@ class AccountController extends BaseController
 
         Session::flash('success', 'The ' . $typeName . ' account "' . e($name) . '" was deleted.');
 
-        return Redirect::route('accounts.index', $type);
+        return Redirect::route('accounts.index', $typeName);
     }
 
     /**
@@ -210,6 +210,7 @@ class AccountController extends BaseController
         $data         = Input::except('_token');
         $data['what'] = $this->_shortNamesByFullName[$account->accountType->type];
 
+
         // always validate:
         $messages = $this->_repository->validate($data);
 
diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php
index b004435e7a..a71c53c842 100644
--- a/app/controllers/BudgetController.php
+++ b/app/controllers/BudgetController.php
@@ -1,7 +1,7 @@
 <?php
 
 use Carbon\Carbon;
-use FireflyIII\Database\Budget as BudgetRepository;
+use FireflyIII\Database\Budget\Budget as BudgetRepository;
 use FireflyIII\Shared\Preferences\PreferencesInterface as Pref;
 
 /**
@@ -148,13 +148,13 @@ class BudgetController extends BaseController
      */
     public function show(Budget $budget, LimitRepetition $repetition = null)
     {
-        if (!is_null($repetition) && $repetition->budgetlimit->budget->id != $budget->id) {
+        if (!is_null($repetition) && $repetition->budgetLimit->budget->id != $budget->id) {
             App::abort(500);
         }
 
         $hideBudget = true; // used in transaction list.
         $journals   = $this->_repository->getJournals($budget, $repetition);
-        $limits     = $repetition ? [$repetition->limit] : $budget->budgetlimits()->orderBy('startdate', 'DESC')->get();
+        $limits     = $repetition ? [$repetition->budgetLimit] : $budget->budgetLimits()->orderBy('startdate', 'DESC')->get();
         $subTitle   = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
 
         return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));
diff --git a/app/controllers/CategoryController.php b/app/controllers/CategoryController.php
index a00e2d7421..80913165b4 100644
--- a/app/controllers/CategoryController.php
+++ b/app/controllers/CategoryController.php
@@ -1,5 +1,5 @@
 <?php
-use FireflyIII\Database\Category as CategoryRepository;
+use FireflyIII\Database\Category\Category as CategoryRepository;
 use FireflyIII\Exception\FireflyException;
 
 /**
diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php
index c61be7cc12..812fc11e13 100644
--- a/app/controllers/GoogleChartController.php
+++ b/app/controllers/GoogleChartController.php
@@ -75,8 +75,8 @@ class GoogleChartController extends BaseController
         $preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
         $pref        = $preferences->get('frontpageAccounts', []);
 
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
         if (count($pref->data) > 0) {
             $accounts = $acct->getByIds($pref->data);
         } else {
@@ -124,8 +124,8 @@ class GoogleChartController extends BaseController
         $this->_chart->addColumn('Budgeted', 'number');
         $this->_chart->addColumn('Spent', 'number');
 
-        /** @var \FireflyIII\Database\Budget $bdt */
-        $bdt     = App::make('FireflyIII\Database\Budget');
+        /** @var \FireflyIII\Database\Budget\Budget $bdt */
+        $bdt     = App::make('FireflyIII\Database\Budget\Budget');
         $budgets = $bdt->get();
 
         /*
@@ -194,8 +194,8 @@ class GoogleChartController extends BaseController
         $chart->addColumn('Category', 'string');
         $chart->addColumn('Spent', 'number');
 
-        /** @var \FireflyIII\Database\TransactionJournal $tj */
-        $tj = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
+        $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         /*
          * Get the journals:
@@ -279,8 +279,8 @@ class GoogleChartController extends BaseController
         /** @var \Grumpydictator\Gchart\GChart $chart */
         $chart = App::make('gchart');
 
-        /** @var \FireflyIII\Database\Budget $bdt */
-        $bdt     = App::make('FireflyIII\Database\Budget');
+        /** @var \FireflyIII\Database\Budget\Budget $bdt */
+        $bdt     = App::make('FireflyIII\Database\Budget\Budget');
         $budgets = $bdt->get();
 
         $chart->addColumn('Month', 'date');
@@ -335,11 +335,11 @@ class GoogleChartController extends BaseController
         }
 
         if ($component->class == 'Budget') {
-            /** @var \FireflyIII\Database\Budget $repos */
-            $repos = App::make('FireflyIII\Database\Budget');
+            /** @var \FireflyIII\Database\Budget\Budget $repos */
+            $repos = App::make('FireflyIII\Database\Budget\Budget');
         } else {
-            /** @var \FireflyIII\Database\Category $repos */
-            $repos = App::make('FireflyIII\Database\Category');
+            /** @var \FireflyIII\Database\Category\Category $repos */
+            $repos = App::make('FireflyIII\Database\Category\Category');
         }
 
         /** @var \Grumpydictator\Gchart\GChart $chart */
@@ -457,8 +457,8 @@ class GoogleChartController extends BaseController
         $chart->addColumn('Name', 'string');
         $chart->addColumn('Amount', 'number');
 
-        /** @var \FireflyIII\Database\Recurring $rcr */
-        $rcr = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $rcr */
+        $rcr = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
 
         $recurring = $rcr->get();
 
@@ -537,8 +537,8 @@ class GoogleChartController extends BaseController
         $chart->addColumn('Income', 'number');
         $chart->addColumn('Expenses', 'number');
 
-        /** @var \FireflyIII\Database\TransactionJournal $tj */
-        $tj = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
+        $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $end = clone $start;
         $end->endOfYear();
@@ -577,8 +577,8 @@ class GoogleChartController extends BaseController
         $chart->addColumn('Income', 'number');
         $chart->addColumn('Expenses', 'number');
 
-        /** @var \FireflyIII\Database\TransactionJournal $tj */
-        $tj = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
+        $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $end = clone $start;
         $end->endOfYear();
diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
index 217068e007..1dd8d28644 100644
--- a/app/controllers/HomeController.php
+++ b/app/controllers/HomeController.php
@@ -23,11 +23,11 @@ class HomeController extends BaseController
     public function index()
     {
         // count, maybe Firefly needs some introducing text to show:
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
 
-        /** @var \FireflyIII\Database\TransactionJournal $jrnls */
-        $jrnls = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $jrnls */
+        $jrnls = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */
         $preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface');
diff --git a/app/controllers/JsonController.php b/app/controllers/JsonController.php
index 9f0512572a..094a3fc040 100644
--- a/app/controllers/JsonController.php
+++ b/app/controllers/JsonController.php
@@ -14,8 +14,8 @@ class JsonController extends BaseController
      */
     public function categories()
     {
-        /** @var \FireflyIII\Database\Category $categories */
-        $categories = App::make('FireflyIII\Database\Category');
+        /** @var \FireflyIII\Database\Category\Category $categories */
+        $categories = App::make('FireflyIII\Database\Category\Category');
         $list       = $categories->get();
         $return     = [];
         foreach ($list as $entry) {
@@ -34,8 +34,8 @@ class JsonController extends BaseController
      */
     public function expenseAccounts()
     {
-        /** @var \FireflyIII\Database\Account $accounts */
-        $accounts = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accounts */
+        $accounts = App::make('FireflyIII\Database\Account\Account');
         $list     = $accounts->getExpenseAccounts();
         $return   = [];
         foreach ($list as $entry) {
@@ -51,8 +51,8 @@ class JsonController extends BaseController
      */
     public function revenueAccounts()
     {
-        /** @var \FireflyIII\Database\Account $accounts */
-        $accounts = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accounts */
+        $accounts = App::make('FireflyIII\Database\Account\Account');
         $list     = $accounts->getRevenueAccounts();
         $return   = [];
         foreach ($list as $entry) {
diff --git a/app/controllers/PiggybankController.php b/app/controllers/PiggybankController.php
index eb933934af..178b79d0a9 100644
--- a/app/controllers/PiggybankController.php
+++ b/app/controllers/PiggybankController.php
@@ -27,8 +27,8 @@ class PiggybankController extends BaseController
      */
     public function add(Piggybank $piggybank)
     {
-        /** @var \FireflyIII\Database\Piggybank $repos */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
         $leftOnAccount = $repos->leftOnAccount($piggybank->account);
         $savedSoFar    = $piggybank->currentRelevantRep()->currentamount;
@@ -45,8 +45,8 @@ class PiggybankController extends BaseController
     public function create()
     {
 
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
 
         $periods = Config::get('firefly.piggybank_periods');
 
@@ -77,8 +77,8 @@ class PiggybankController extends BaseController
      */
     public function destroy(Piggybank $piggyBank)
     {
-        /** @var \FireflyIII\Database\Piggybank $acct */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
         $repos->destroy($piggyBank);
         Session::flash('success', 'Piggy bank deleted.');
 
@@ -93,8 +93,8 @@ class PiggybankController extends BaseController
     public function edit(Piggybank $piggybank)
     {
 
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
 
         $periods = Config::get('firefly.piggybank_periods');
 
@@ -122,8 +122,8 @@ class PiggybankController extends BaseController
      */
     public function index()
     {
-        /** @var \FireflyIII\Database\Piggybank $repos */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
         /** @var Collection $piggybanks */
         $piggybanks = $repos->get();
@@ -164,8 +164,8 @@ class PiggybankController extends BaseController
     {
         $amount = round(floatval(Input::get('amount')), 2);
 
-        /** @var \FireflyIII\Database\Piggybank $acct */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
         $leftOnAccount = $repos->leftOnAccount($piggybank->account);
         $savedSoFar    = $piggybank->currentRelevantRep()->currentamount;
@@ -261,8 +261,8 @@ class PiggybankController extends BaseController
     {
         $data            = Input::all();
         $data['repeats'] = 0;
-        /** @var \FireflyIII\Database\Piggybank $repos */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
         switch ($data['post_submit_action']) {
             default:
@@ -315,8 +315,8 @@ class PiggybankController extends BaseController
     public function update(Piggybank $piggyBank)
     {
 
-        /** @var \FireflyIII\Database\Piggybank $repos */
-        $repos = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
+        $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
         $data  = Input::except('_token');
 
         switch (Input::get('post_submit_action')) {
diff --git a/app/controllers/PreferencesController.php b/app/controllers/PreferencesController.php
index 0d6a373843..ecd536f6c7 100644
--- a/app/controllers/PreferencesController.php
+++ b/app/controllers/PreferencesController.php
@@ -21,8 +21,8 @@ class PreferencesController extends BaseController
      */
     public function index()
     {
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
 
         /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
         $preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
diff --git a/app/controllers/RecurringController.php b/app/controllers/RecurringController.php
index bd3a7faed6..b38ab25fae 100644
--- a/app/controllers/RecurringController.php
+++ b/app/controllers/RecurringController.php
@@ -49,8 +49,8 @@ class RecurringController extends BaseController
     {
         //Event::fire('recurring.destroy', [$recurringTransaction]);
 
-        /** @var \FireflyIII\Database\Recurring $repository */
-        $repository = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
+        $repository = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
 
         $result = $repository->destroy($recurringTransaction);
         if ($result === true) {
@@ -82,8 +82,8 @@ class RecurringController extends BaseController
      */
     public function index()
     {
-        /** @var \FireflyIII\Database\Recurring $repos */
-        $repos = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
+        $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
 
         $recurring = $repos->get();
 
@@ -103,8 +103,8 @@ class RecurringController extends BaseController
             return Redirect::back();
         }
 
-        /** @var \FireflyIII\Database\Recurring $repos */
-        $repos = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
+        $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
         $repos->scanEverything($recurringTransaction);
 
         Session::flash('success', 'Rescanned everything.');
@@ -135,8 +135,8 @@ class RecurringController extends BaseController
     public function store()
     {
         $data = Input::except('_token');
-        /** @var \FireflyIII\Database\Recurring $repos */
-        $repos = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
+        $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
 
         switch ($data['post_submit_action']) {
             default:
@@ -183,8 +183,8 @@ class RecurringController extends BaseController
      */
     public function update(RecurringTransaction $recurringTransaction)
     {
-        /** @var \FireflyIII\Database\Recurring $repos */
-        $repos = App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
+        $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
         $data  = Input::except('_token');
 
         switch (Input::get('post_submit_action')) {
diff --git a/app/controllers/RepeatedExpenseController.php b/app/controllers/RepeatedExpenseController.php
index b3bdd762e0..f1b5210945 100644
--- a/app/controllers/RepeatedExpenseController.php
+++ b/app/controllers/RepeatedExpenseController.php
@@ -23,8 +23,8 @@ class RepeatedExpenseController extends BaseController
      */
     public function create()
     {
-        /** @var \FireflyIII\Database\Account $acct */
-        $acct = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $acct */
+        $acct = App::make('FireflyIII\Database\Account\Account');
 
         $periods = Config::get('firefly.piggybank_periods');
 
@@ -44,8 +44,8 @@ class RepeatedExpenseController extends BaseController
 
         $subTitle = 'Overview';
 
-        /** @var \FireflyIII\Database\RepeatedExpense $repository */
-        $repository = App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
+        $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         $expenses = $repository->get();
         $expenses->each(
@@ -67,8 +67,8 @@ class RepeatedExpenseController extends BaseController
         $subTitle = $piggyBank->name;
         $today    = Carbon::now();
 
-        /** @var \FireflyIII\Database\RepeatedExpense $repository */
-        $repository = App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
+        $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         $repetitions = $piggyBank->piggybankrepetitions()->get();
         $repetitions->each(
@@ -88,8 +88,8 @@ class RepeatedExpenseController extends BaseController
     {
         $data            = Input::all();
         $data['repeats'] = 1;
-        /** @var \FireflyIII\Database\RepeatedExpense $repository */
-        $repository = App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
+        $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         switch ($data['post_submit_action']) {
             default:
diff --git a/app/controllers/ReportController.php b/app/controllers/ReportController.php
index 04eef366f8..df2a28b30d 100644
--- a/app/controllers/ReportController.php
+++ b/app/controllers/ReportController.php
@@ -1,9 +1,8 @@
 <?php
 use Carbon\Carbon;
-use FireflyIII\Database\Account as AccountRepository;
-use FireflyIII\Database\Report as ReportRepository;
-use FireflyIII\Database\TransactionJournal as TransactionJournalRepository;
-use FireflyIII\Report\ReportInterface as ReportHelper;
+use FireflyIII\Database\Account\Account as AccountRepository;
+use FireflyIII\Database\TransactionJournal\TransactionJournal as TransactionJournalRepository;
+use FireflyIII\Report\ReportInterface as Report;
 
 /**
  * @SuppressWarnings("CamelCase")
@@ -18,23 +17,18 @@ class ReportController extends BaseController
     /** @var TransactionJournalRepository */
     protected $_journals;
 
-    /** @var ReportHelper */
-    protected $_reports;
-
-    /** @var ReportRepository */
+    /** @var Report */
     protected $_repository;
 
     /**
      * @param AccountRepository            $accounts
      * @param TransactionJournalRepository $journals
-     * @param ReportHelper                 $reports
-     * @param ReportRepository             $repository
+     * @param Report                       $repository
      */
-    public function __construct(AccountRepository $accounts, TransactionJournalRepository $journals, ReportHelper $reports, ReportRepository $repository)
+    public function __construct(AccountRepository $accounts, TransactionJournalRepository $journals, Report $repository)
     {
         $this->_accounts   = $accounts;
         $this->_journals   = $journals;
-        $this->_reports    = $reports;
         $this->_repository = $repository;
 
     }
@@ -62,11 +56,11 @@ class ReportController extends BaseController
 
 
         // get a list of all budgets and expenses.
-        /** @var \FireflyIII\Database\Budget $budgetRepository */
-        $budgetRepository = App::make('FireflyIII\Database\Budget');
+        /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
+        $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
 
-        /** @var \FireflyIII\Database\Account $accountRepository */
-        $accountRepository = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accountRepository */
+        $accountRepository = App::make('FireflyIII\Database\Account\Account');
 
 
         $budgets = $budgetRepository->get();
@@ -76,8 +70,8 @@ class ReportController extends BaseController
             function (Budget $budget) use ($start, $end, $budgetRepository) {
                 $limitRepetitions = $budget->limitrepetitions()->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d'))->where(
                     'enddate', '<=', $end->format(
-                        'Y-m-d'
-                    )
+                    'Y-m-d'
+                )
                 )->get();
                 $repInfo          = [];
                 /** @var LimitRepetition $repetition */
@@ -94,7 +88,7 @@ class ReportController extends BaseController
                     }
                     $pctDisplay = $spent / floatval($repetition->amount) * 100;
                     $repInfo[]  = [
-                        'date'        => DateKit::periodShow($repetition->startdate, $repetition->limit->repeat_freq),
+                        'date'        => DateKit::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq),
                         'spent'       => $spent,
                         'budgeted'    => floatval($repetition->amount),
                         'left'        => floatval($repetition->amount) - $spent,
@@ -148,8 +142,8 @@ class ReportController extends BaseController
     public function index()
     {
         $start         = $this->_journals->firstDate();
-        $months        = $this->_reports->listOfMonths(clone $start);
-        $years         = $this->_reports->listOfYears(clone $start);
+        $months        = $this->_repository->listOfMonths(clone $start);
+        $years         = $this->_repository->listOfYears(clone $start);
         $title         = 'Reports';
         $mainTitleIcon = 'fa-line-chart';
 
@@ -177,8 +171,8 @@ class ReportController extends BaseController
         $subTitleIcon  = 'fa-bar-chart';
         $end->endOfMonth();
 
-        /** @var \FireflyIII\Database\TransactionJournal $journalRepository */
-        $journalRepository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journalRepository */
+        $journalRepository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         /*
          * Get all journals from this month:
@@ -255,9 +249,9 @@ class ReportController extends BaseController
         $subTitleIcon  = 'fa-bar-chart';
         $mainTitleIcon = 'fa-line-chart';
 
-        $balances        = $this->_reports->yearBalanceReport($date);
-        $groupedIncomes  = $this->_reports->revenueGroupedByAccount($date, $end, 15);
-        $groupedExpenses = $this->_reports->expensesGroupedByAccount($date, $end, 15);
+        $balances        = $this->_repository->yearBalanceReport($date);
+        $groupedIncomes  = $this->_repository->revenueGroupedByAccount($date, $end, 15);
+        $groupedExpenses = $this->_repository->expensesGroupedByAccount($date, $end, 15);
 
         return View::make(
             'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
diff --git a/app/controllers/TransactionController.php b/app/controllers/TransactionController.php
index cce380bad4..cb3c19735e 100644
--- a/app/controllers/TransactionController.php
+++ b/app/controllers/TransactionController.php
@@ -47,8 +47,8 @@ class TransactionController extends BaseController
         $unique = array_unique($ids);
         if (count($unique) > 0) {
 
-            /** @var \FireflyIII\Database\TransactionJournal $repository */
-            $repository = App::make('FireflyIII\Database\TransactionJournal');
+            /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+            $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
             $set        = $repository->getByIds($unique);
             $set->each(
                 function (TransactionJournal $journal) {
@@ -75,17 +75,17 @@ class TransactionController extends BaseController
          * The repositories we need:
          */
 
-        /** @var \FireflyIII\Database\Account $accountRepository */
-        $accountRepository = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accountRepository */
+        $accountRepository = App::make('FireflyIII\Database\Account\Account');
 
-        /** @var \FireflyIII\Database\Budget $budgetRepository */
-        $budgetRepository = App::make('FireflyIII\Database\Budget');
+        /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
+        $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
 
-        /** @var \FireflyIII\Database\Piggybank $piggyRepository */
-        $piggyRepository = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $piggyRepository */
+        $piggyRepository = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
-        /** @var \FireflyIII\Database\RepeatedExpense $repRepository */
-        $repRepository = App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repRepository */
+        $repRepository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         // get asset accounts with names and id's .
         $assetAccounts = FFForm::makeSelectList($accountRepository->getAssetAccounts());
@@ -143,8 +143,8 @@ class TransactionController extends BaseController
     {
         $type = $transactionJournal->transactionType->type;
 
-        /** @var \FireflyIII\Database\TransactionJournal $repository */
-        $repository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+        $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
         $repository->destroy($transactionJournal);
 
         $return = 'withdrawal';
@@ -172,8 +172,8 @@ class TransactionController extends BaseController
         $id     = intval(Input::get('id'));
         $sister = intval(Input::get('relateTo'));
 
-        /** @var \FireflyIII\Database\TransactionJournal $repository */
-        $repository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+        $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $journal = $repository->find($id);
         $sis     = $repository->find($sister);
@@ -207,14 +207,14 @@ class TransactionController extends BaseController
          * All the repositories we need:
          */
 
-        /** @var \FireflyIII\Database\Account $accountRepository */
-        $accountRepository = App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accountRepository */
+        $accountRepository = App::make('FireflyIII\Database\Account\Account');
 
-        /** @var \FireflyIII\Database\Budget $budgetRepository */
-        $budgetRepository = App::make('FireflyIII\Database\Budget');
+        /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
+        $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
 
-        /** @var \FireflyIII\Database\Piggybank $piggyRepository */
-        $piggyRepository = App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $piggyRepository */
+        $piggyRepository = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
 
         // type is useful for display:
@@ -335,8 +335,8 @@ class TransactionController extends BaseController
     public function index($what)
     {
 
-        /** @var \FireflyIII\Database\TransactionJournal $repository */
-        $repository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+        $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         switch ($what) {
             case 'expenses':
@@ -396,8 +396,8 @@ class TransactionController extends BaseController
     {
         $search = e(trim(Input::get('searchValue')));
 
-        /** @var \FireflyIII\Database\TransactionJournal $repository */
-        $repository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+        $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $result = $repository->searchRelated($search, $journal);
         $result->each(
@@ -456,8 +456,8 @@ class TransactionController extends BaseController
         $data['what']     = $what;
         $data['currency'] = 'EUR';
 
-        /** @var \FireflyIII\Database\TransactionJournal $repository */
-        $repository = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
+        $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         switch ($data['post_submit_action']) {
             default:
@@ -549,8 +549,8 @@ class TransactionController extends BaseController
      */
     public function update(TransactionJournal $journal)
     {
-        /** @var \FireflyIII\Database\TransactionJournal $repos */
-        $repos = App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repos */
+        $repos = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $data             = Input::except('_token');
         $data['currency'] = 'EUR';
diff --git a/app/lib/FireflyIII/Database/Account/Account.php b/app/lib/FireflyIII/Database/Account/Account.php
index 0e1f08df2f..abd0dc2eae 100644
--- a/app/lib/FireflyIII/Database/Account/Account.php
+++ b/app/lib/FireflyIII/Database/Account/Account.php
@@ -495,8 +495,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
      */
     public function firstExpenseAccountOrCreate($name)
     {
-        /** @var \FireflyIII\Database\AccountType $accountTypeRepos */
-        $accountTypeRepos = \App::make('FireflyIII\Database\AccountType');
+        /** @var \FireflyIII\Database\AccountType\AccountType $accountTypeRepos */
+        $accountTypeRepos = \App::make('FireflyIII\Database\AccountType\AccountType');
 
         $accountType = $accountTypeRepos->findByWhat('expense');
 
@@ -524,8 +524,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
      */
     public function firstRevenueAccountOrCreate($name)
     {
-        /** @var \FireflyIII\Database\AccountType $accountTypeRepos */
-        $accountTypeRepos = \App::make('FireflyIII\Database\AccountType');
+        /** @var \FireflyIII\Database\AccountType\AccountType $accountTypeRepos */
+        $accountTypeRepos = \App::make('FireflyIII\Database\AccountType\AccountType');
 
         $accountType = $accountTypeRepos->findByWhat('revenue');
 
diff --git a/app/lib/FireflyIII/Database/Budget/Budget.php b/app/lib/FireflyIII/Database/Budget/Budget.php
index bd0717fd54..2dc2bbed74 100644
--- a/app/lib/FireflyIII/Database/Budget/Budget.php
+++ b/app/lib/FireflyIII/Database/Budget/Budget.php
@@ -330,7 +330,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
         $limit = $this->limitOnStartingOnDate($budget, $date);
         if (!$limit) {
             // create one!
-            $limit = new \Limit;
+            $limit = new \BudgetLimit;
             $limit->budget()->associate($budget);
             $limit->startdate   = $date;
             $limit->amount      = $amount;
@@ -367,6 +367,6 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
      */
     public function limitOnStartingOnDate(\Budget $budget, Carbon $date)
     {
-        return $budget->limits()->where('startdate', $date->format('Y-m-d'))->first();
+        return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d'))->first();
     }
 }
\ No newline at end of file
diff --git a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
index ef515750bc..5358ef19b5 100644
--- a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
+++ b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
@@ -321,8 +321,8 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
         // get all journals that (may) be relevant.
         // this is usually almost all of them.
 
-        /** @var \FireflyIII\Database\TransactionJournal $journalRepository */
-        $journalRepository = \App::make('FireflyIII\Database\TransactionJournal');
+        /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journalRepository */
+        $journalRepository = \App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
 
         $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $recurring->amount_min)->where('amount', '<=', $recurring->amount_max)
                   ->get(['transaction_journal_id']);
diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
index ea7cb4516c..eeef536d43 100644
--- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
+++ b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
@@ -62,17 +62,17 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
      */
     public function store(array $data)
     {
-        /** @var \FireflyIII\Database\TransactionType $typeRepository */
-        $typeRepository = \App::make('FireflyIII\Database\TransactionType');
+        /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
+        $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
 
-        /** @var \FireflyIII\Database\Account $accountRepository */
-        $accountRepository = \App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accountRepository */
+        $accountRepository = \App::make('FireflyIII\Database\Account\Account');
 
-        /** @var \FireflyIII\Database\TransactionCurrency $currencyRepository */
-        $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency');
+        /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
+        $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
 
-        /** @var \FireflyIII\Database\Transaction $transactionRepository */
-        $transactionRepository = \App::make('FireflyIII\Database\Transaction');
+        /** @var \FireflyIII\Database\Transaction\Transaction $transactionRepository */
+        $transactionRepository = \App::make('FireflyIII\Database\Transaction\Transaction');
 
         $journalType = $typeRepository->findByWhat($data['what']);
         $currency    = $currencyRepository->findByCode($data['currency']);
@@ -143,16 +143,16 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
          * Store the budget.
          */
         if (isset($data['budget_id']) && intval($data['budget_id']) > 0) {
-            /** @var \FireflyIII\Database\Budget $budgetRepository */
-            $budgetRepository = \App::make('FireflyIII\Database\Budget');
+            /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
+            $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
             $budget           = $budgetRepository->find(intval($data['budget_id']));
             if ($budget) {
                 $journal->budgets()->save($budget);
             }
         }
         if (isset($data['category']) && strlen($data['category']) > 0) {
-            /** @var \FireflyIII\Database\Category $categoryRepository */
-            $categoryRepository = \App::make('FireflyIII\Database\Category');
+            /** @var \FireflyIII\Database\Category\Category $categoryRepository */
+            $categoryRepository = \App::make('FireflyIII\Database\Category\Category');
             $category           = $categoryRepository->firstOrCreate($data['category']);
             if ($category) {
                 $journal->categories()->save($category);
@@ -179,14 +179,14 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
      */
     public function update(\Eloquent $model, array $data)
     {
-        /** @var \FireflyIII\Database\TransactionType $typeRepository */
-        $typeRepository = \App::make('FireflyIII\Database\TransactionType');
+        /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
+        $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
 
-        /** @var \FireflyIII\Database\Account $accountRepository */
-        $accountRepository = \App::make('FireflyIII\Database\Account');
+        /** @var \FireflyIII\Database\Account\Account $accountRepository */
+        $accountRepository = \App::make('FireflyIII\Database\Account\Account');
 
-        /** @var \FireflyIII\Database\TransactionCurrency $currencyRepository */
-        $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency');
+        /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
+        $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
 
         $journalType = $typeRepository->findByWhat($data['what']);
         $currency    = $currencyRepository->findByCode($data['currency']);
@@ -236,16 +236,16 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
          */
         $components = [];
         if (isset($data['budget_id']) && intval($data['budget_id']) > 0) {
-            /** @var \FireflyIII\Database\Budget $budgetRepository */
-            $budgetRepository = \App::make('FireflyIII\Database\Budget');
+            /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
+            $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
             $budget           = $budgetRepository->find(intval($data['budget_id']));
             if ($budget) {
                 $components[] = $budget->id;
             }
         }
         if (strlen($data['category']) > 0) {
-            /** @var \FireflyIII\Database\Category $categoryRepository */
-            $categoryRepository = \App::make('FireflyIII\Database\Category');
+            /** @var \FireflyIII\Database\Category\Category $categoryRepository */
+            $categoryRepository = \App::make('FireflyIII\Database\Category\Category');
             $category           = $categoryRepository->firstOrCreate($data['category']);
             if ($category) {
                 $components[] = $category->id;
diff --git a/app/lib/FireflyIII/Event/Piggybank.php b/app/lib/FireflyIII/Event/Piggybank.php
index 206c165988..c24110cf98 100644
--- a/app/lib/FireflyIII/Event/Piggybank.php
+++ b/app/lib/FireflyIII/Event/Piggybank.php
@@ -43,8 +43,8 @@ class Piggybank
     {
         if ($journal->piggybankevents()->count() > 0) {
 
-            /** @var \FireflyIII\Database\Piggybank $repository */
-            $repository = \App::make('FireflyIII\Database\Piggybank');
+            /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
+            $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
             /** @var \Piggybank $piggyBank */
             $piggyBank = $journal->piggybankevents()->first()->piggybank()->first();
@@ -127,8 +127,8 @@ class Piggybank
         if ($piggybankId == 0 || is_null($piggybankId)) {
             return;
         }
-        /** @var \FireflyIII\Database\Piggybank $repository */
-        $repository = \App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
+        $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
         /** @var \Piggybank $piggyBank */
         $piggyBank = $repository->find($piggybankId);
@@ -222,8 +222,8 @@ class Piggybank
         if(!\Auth::check()) {
             return;
         }
-        /** @var \FireflyIII\Database\RepeatedExpense $repository */
-        $repository = \App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
+        $repository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         $list  = $repository->get();
         $today = Carbon::now();
@@ -290,8 +290,8 @@ class Piggybank
             $event    = $journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->first();
             $eventSum = floatval($journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->sum('amount'));
 
-            /** @var \FireflyIII\Database\Piggybank $repository */
-            $repository = \App::make('FireflyIII\Database\Piggybank');
+            /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
+            $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
             /** @var \Piggybank $piggyBank */
             $piggyBank = $journal->piggybankevents()->first()->piggybank()->first();
diff --git a/app/lib/FireflyIII/Event/TransactionJournal.php b/app/lib/FireflyIII/Event/TransactionJournal.php
index 88353e34ee..72755edef8 100644
--- a/app/lib/FireflyIII/Event/TransactionJournal.php
+++ b/app/lib/FireflyIII/Event/TransactionJournal.php
@@ -18,8 +18,8 @@ class TransactionJournal
      */
     public function store(\TransactionJournal $journal)
     {
-        /** @var \FireflyIII\Database\Recurring $repository */
-        $repository = \App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
+        $repository = \App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
         $set        = $repository->get();
 
 
@@ -44,8 +44,8 @@ class TransactionJournal
      */
     public function update(\TransactionJournal $journal)
     {
-        /** @var \FireflyIII\Database\Recurring $repository */
-        $repository = \App::make('FireflyIII\Database\Recurring');
+        /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
+        $repository = \App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
         $set        = $repository->get();
         $journal->recurring_transaction_id = null;
         $journal->save();
diff --git a/app/lib/FireflyIII/Form/Form.php b/app/lib/FireflyIII/Form/Form.php
index 4f8bda184d..0435415cd0 100644
--- a/app/lib/FireflyIII/Form/Form.php
+++ b/app/lib/FireflyIII/Form/Form.php
@@ -297,7 +297,7 @@ class Form
             case 'update':
                 $store = '<div class="form-group"><label for="' . $name . 'update" class="col-sm-4 control-label">Store</label>';
                 $store .= '<div class="col-sm-8"><div class="radio"><label>';
-                $store .= \Form::radio('post_submit_action', 'update', $previousValue == 'update', ['id' => $name . '_update']);
+                $store .= \Form::radio('post_submit_action', 'update', $previousValue == 'update' || $previousValue == 'store', ['id' => $name . '_update']);
                 $store .= 'Update ' . $name . '</label></div></div></div>';
                 break;
             default:
diff --git a/app/lib/FireflyIII/Report/Report.php b/app/lib/FireflyIII/Report/Report.php
index 6eedb3e607..2da18db2e0 100644
--- a/app/lib/FireflyIII/Report/Report.php
+++ b/app/lib/FireflyIII/Report/Report.php
@@ -4,6 +4,7 @@ namespace FireflyIII\Report;
 
 use Carbon\Carbon;
 use FireflyIII\Database\Account\Account as AccountRepository;
+use FireflyIII\Database\SwitchUser;
 use Illuminate\Support\Collection;
 
 // todo add methods to itnerface
@@ -17,6 +18,9 @@ use Illuminate\Support\Collection;
  */
 class Report implements ReportInterface
 {
+
+    use SwitchUser;
+
     /** @var AccountRepository */
     protected $_accounts;
 
@@ -198,7 +202,6 @@ class Report implements ReportInterface
         return $report;
     }
 
-    use SwitchUser;
 
 
     /**
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Reminders.php b/app/lib/FireflyIII/Shared/Toolkit/Reminders.php
index ce330b1d42..bb82a19afc 100644
--- a/app/lib/FireflyIII/Shared/Toolkit/Reminders.php
+++ b/app/lib/FireflyIII/Shared/Toolkit/Reminders.php
@@ -68,11 +68,11 @@ class Reminders
         /*
          * Reminder capable objects are (so far) only piggy banks.
          */
-        /** @var \FireflyIII\Database\Piggybank $repository */
-        $repository = \App::make('FireflyIII\Database\Piggybank');
+        /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
+        $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
 
-        /** @var \FireflyIII\Database\Piggybank $repeatedRepository */
-        $repeatedRepository = \App::make('FireflyIII\Database\RepeatedExpense');
+        /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repeatedRepository */
+        $repeatedRepository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
 
         /** @var Collection $piggybanks */
         $piggybanks = $repository->get()->merge($repeatedRepository->get());
diff --git a/app/models/LimitRepetition.php b/app/models/LimitRepetition.php
index 43b49c00aa..17754d4e34 100644
--- a/app/models/LimitRepetition.php
+++ b/app/models/LimitRepetition.php
@@ -11,7 +11,7 @@ class LimitRepetition extends Eloquent
     use ValidatingTrait;
     public static $rules
         = [
-            'budgetlimit_id' => 'required|exists:budgetlimits,id',
+            'budget_limit_id' => 'required|exists:budgetlimits,id',
             'startdate'      => 'required|date',
             'enddate'        => 'required|date',
             'amount'         => 'numeric|required|min:0.01',
@@ -54,8 +54,8 @@ class LimitRepetition extends Eloquent
         $sum = \DB::table('transactions')->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->leftJoin(
             'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
         )->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')->leftJoin(
-            'budgetlimits', 'budgetlimits.component_id', '=', 'components.id'
-        )->leftJoin('limit_repetitions', 'limit_repetitions.limit_id', '=', 'budgetlimits.id')->where(
+            'budget_limits', 'budget_limits.component_id', '=', 'components.id'
+        )->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')->where(
             'transaction_journals.date', '>=', $this->startdate->format('Y-m-d')
         )->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))->where('transactions.amount', '>', 0)->where(
             'limit_repetitions.id', '=', $this->id
diff --git a/app/routes.php b/app/routes.php
index 31f89af7cc..df84e9663e 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -99,8 +99,8 @@ Route::bind(
     'limitrepetition', function ($value, $route) {
         if (Auth::check()) {
             return LimitRepetition::
-            where('limit_repetitions.id', $value)->leftjoin('budgetlimits', 'budgetlimits.id', '=', 'limit_repetitions.limit_id')->leftJoin(
-                'components', 'components.id', '=', 'budgetlimits.component_id'
+            where('limit_repetitions.id', $value)->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')->leftJoin(
+                'components', 'components.id', '=', 'budget_limits.component_id'
             )->where('components.class', 'Budget')->where('components.user_id', Auth::user()->id)->first(['limit_repetitions.*']);
         }