diff --git a/app/Abstracts/Reports/Listener.php b/app/Abstracts/Listeners/Report.php
similarity index 98%
rename from app/Abstracts/Reports/Listener.php
rename to app/Abstracts/Listeners/Report.php
index 7db7fe65d..85ba4ad0a 100644
--- a/app/Abstracts/Reports/Listener.php
+++ b/app/Abstracts/Listeners/Report.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Abstracts\Reports;
+namespace App\Abstracts\Listeners;
 
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
@@ -12,7 +12,7 @@ use App\Models\Setting\Category;
 use App\Traits\Contacts;
 use Date;
 
-abstract class Listener
+abstract class Report
 {
     use Contacts;
 
diff --git a/app/Listeners/Update/Listener.php b/app/Abstracts/Listeners/Update.php
similarity index 50%
rename from app/Listeners/Update/Listener.php
rename to app/Abstracts/Listeners/Update.php
index 05a033556..15da794dc 100644
--- a/app/Listeners/Update/Listener.php
+++ b/app/Abstracts/Listeners/Update.php
@@ -1,31 +1,39 @@
 <?php
 
-namespace App\Listeners\Update;
+namespace App\Abstracts\Listeners;
 
-class Listener
+abstract class Update
 {
     const ALIAS = '';
 
     const VERSION = '';
 
     /**
-     * Check if should listen.
+     * Check the fired update based on alias and version.
      *
      * @param  $event
      * @return boolean
      */
-    protected function check($event)
+    public function skipThisUpdate($event)
     {
         // Apply only to the specified alias
         if ($event->alias != static::ALIAS) {
-            return false;
+            return true;
         }
 
         // Do not apply to the same or newer versions
         if (version_compare($event->old, static::VERSION, '>=')) {
-            return false;
+            return true;
         }
 
-        return true;
+        return false;
+    }
+
+    /**
+     * @deprecated since 2.0
+     */
+    public function check($event)
+    {
+        return !$this->skipThisUpdate($event);
     }
 }
diff --git a/app/Abstracts/Reports/Report.php b/app/Abstracts/Report.php
similarity index 99%
rename from app/Abstracts/Reports/Report.php
rename to app/Abstracts/Report.php
index c72e0ad4d..ebb362e55 100644
--- a/app/Abstracts/Reports/Report.php
+++ b/app/Abstracts/Report.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Abstracts\Reports;
+namespace App\Abstracts;
 
 use App\Exports\Common\Reports as Export;
 use App\Models\Common\Report as Model;
diff --git a/app/Listeners/Common/ExpenseSummaryReport.php b/app/Listeners/Common/ExpenseSummaryReport.php
index f77d45bc6..e3aca2d38 100644
--- a/app/Listeners/Common/ExpenseSummaryReport.php
+++ b/app/Listeners/Common/ExpenseSummaryReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;
diff --git a/app/Listeners/Common/IncomeExpenseSummaryReport.php b/app/Listeners/Common/IncomeExpenseSummaryReport.php
index 73bbd29e5..9f6c709e2 100644
--- a/app/Listeners/Common/IncomeExpenseSummaryReport.php
+++ b/app/Listeners/Common/IncomeExpenseSummaryReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;
diff --git a/app/Listeners/Common/IncomeSummaryReport.php b/app/Listeners/Common/IncomeSummaryReport.php
index 6983757f1..c5f11c4a7 100644
--- a/app/Listeners/Common/IncomeSummaryReport.php
+++ b/app/Listeners/Common/IncomeSummaryReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;
diff --git a/app/Listeners/Common/ProfitLossReport.php b/app/Listeners/Common/ProfitLossReport.php
index b1999a21f..4675e9efc 100644
--- a/app/Listeners/Common/ProfitLossReport.php
+++ b/app/Listeners/Common/ProfitLossReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 
 class ProfitLossReport extends Listener
 {
diff --git a/app/Listeners/Common/TaxSummaryReport.php b/app/Listeners/Common/TaxSummaryReport.php
index 7414659ac..a02c500e7 100644
--- a/app/Listeners/Common/TaxSummaryReport.php
+++ b/app/Listeners/Common/TaxSummaryReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 
 class TaxSummaryReport extends Listener
 {
diff --git a/app/Listeners/Update/V10/Version106.php b/app/Listeners/Update/V10/Version106.php
index 2db871be6..de29ebccf 100644
--- a/app/Listeners/Update/V10/Version106.php
+++ b/app/Listeners/Update/V10/Version106.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use File;
 
 class Version106 extends Listener
diff --git a/app/Listeners/Update/V10/Version107.php b/app/Listeners/Update/V10/Version107.php
index 95bc12785..d137620e4 100644
--- a/app/Listeners/Update/V10/Version107.php
+++ b/app/Listeners/Update/V10/Version107.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use DB;
 
 class Version107 extends Listener
diff --git a/app/Listeners/Update/V10/Version108.php b/app/Listeners/Update/V10/Version108.php
index 0da1d08dd..97ad74f60 100644
--- a/app/Listeners/Update/V10/Version108.php
+++ b/app/Listeners/Update/V10/Version108.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Models\Expense\Bill;
 use App\Models\Expense\BillStatus;
diff --git a/app/Listeners/Update/V10/Version109.php b/app/Listeners/Update/V10/Version109.php
index 537da8b12..e1f66eb54 100644
--- a/app/Listeners/Update/V10/Version109.php
+++ b/app/Listeners/Update/V10/Version109.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use Artisan;
 
diff --git a/app/Listeners/Update/V11/Version110.php b/app/Listeners/Update/V11/Version110.php
index 84b7fe410..becbfe745 100644
--- a/app/Listeners/Update/V11/Version110.php
+++ b/app/Listeners/Update/V11/Version110.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 
diff --git a/app/Listeners/Update/V11/Version112.php b/app/Listeners/Update/V11/Version112.php
index 955b9fe46..b1c416d20 100644
--- a/app/Listeners/Update/V11/Version112.php
+++ b/app/Listeners/Update/V11/Version112.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Installer;
 
diff --git a/app/Listeners/Update/V11/Version113.php b/app/Listeners/Update/V11/Version113.php
index 1ac03516d..9f1c254dd 100644
--- a/app/Listeners/Update/V11/Version113.php
+++ b/app/Listeners/Update/V11/Version113.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Setting\Currency;
 use Artisan;
 
diff --git a/app/Listeners/Update/V11/Version119.php b/app/Listeners/Update/V11/Version119.php
index 087b1c291..a289ccf06 100644
--- a/app/Listeners/Update/V11/Version119.php
+++ b/app/Listeners/Update/V11/Version119.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Illuminate\Support\Facades\Schema;
diff --git a/app/Listeners/Update/V12/Version120.php b/app/Listeners/Update/V12/Version120.php
index 91f50db7a..a03b2c478 100644
--- a/app/Listeners/Update/V12/Version120.php
+++ b/app/Listeners/Update/V12/Version120.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use App\Models\Common\Company;
diff --git a/app/Listeners/Update/V12/Version1210.php b/app/Listeners/Update/V12/Version1210.php
index e1d9c911b..a36d6d03c 100644
--- a/app/Listeners/Update/V12/Version1210.php
+++ b/app/Listeners/Update/V12/Version1210.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version1210 extends Listener
diff --git a/app/Listeners/Update/V12/Version1211.php b/app/Listeners/Update/V12/Version1211.php
index 47a27e7be..0afb3a7ff 100644
--- a/app/Listeners/Update/V12/Version1211.php
+++ b/app/Listeners/Update/V12/Version1211.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version1211 extends Listener
diff --git a/app/Listeners/Update/V12/Version126.php b/app/Listeners/Update/V12/Version126.php
index 667029aba..3f96470ac 100644
--- a/app/Listeners/Update/V12/Version126.php
+++ b/app/Listeners/Update/V12/Version126.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 
diff --git a/app/Listeners/Update/V12/Version127.php b/app/Listeners/Update/V12/Version127.php
index 3a04dcf0b..f96ea31f7 100644
--- a/app/Listeners/Update/V12/Version127.php
+++ b/app/Listeners/Update/V12/Version127.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Permission;
 use File;
 use Illuminate\Support\Str;
diff --git a/app/Listeners/Update/V12/Version129.php b/app/Listeners/Update/V12/Version129.php
index 336f84130..042f2dc9f 100644
--- a/app/Listeners/Update/V12/Version129.php
+++ b/app/Listeners/Update/V12/Version129.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version129 extends Listener
diff --git a/app/Listeners/Update/V13/Version130.php b/app/Listeners/Update/V13/Version130.php
index cc0e241b0..ca43cd8bd 100644
--- a/app/Listeners/Update/V13/Version130.php
+++ b/app/Listeners/Update/V13/Version130.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;
diff --git a/app/Listeners/Update/V13/Version1311.php b/app/Listeners/Update/V13/Version1311.php
index 5be781721..dd92b7ed4 100644
--- a/app/Listeners/Update/V13/Version1311.php
+++ b/app/Listeners/Update/V13/Version1311.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;
diff --git a/app/Listeners/Update/V13/Version1313.php b/app/Listeners/Update/V13/Version1313.php
index 901577514..33d281685 100644
--- a/app/Listeners/Update/V13/Version1313.php
+++ b/app/Listeners/Update/V13/Version1313.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Installer;
 use Artisan;
diff --git a/app/Listeners/Update/V13/Version1316.php b/app/Listeners/Update/V13/Version1316.php
index 18b684c21..f36059eee 100644
--- a/app/Listeners/Update/V13/Version1316.php
+++ b/app/Listeners/Update/V13/Version1316.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Overrider;
 use App\Models\Banking\Account;
diff --git a/app/Listeners/Update/V13/Version132.php b/app/Listeners/Update/V13/Version132.php
index c73c4669d..0dba6cd8c 100644
--- a/app/Listeners/Update/V13/Version132.php
+++ b/app/Listeners/Update/V13/Version132.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;
diff --git a/app/Listeners/Update/V13/Version135.php b/app/Listeners/Update/V13/Version135.php
index 756c15ff1..fc41af850 100644
--- a/app/Listeners/Update/V13/Version135.php
+++ b/app/Listeners/Update/V13/Version135.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Date;
 
 class Version135 extends Listener
diff --git a/app/Listeners/Update/V13/Version138.php b/app/Listeners/Update/V13/Version138.php
index e97bffc4b..e2ec0ee58 100644
--- a/app/Listeners/Update/V13/Version138.php
+++ b/app/Listeners/Update/V13/Version138.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Date;
 
 class Version138 extends Listener
diff --git a/app/Listeners/Update/V13/Version139.php b/app/Listeners/Update/V13/Version139.php
index 77ae721b4..60fb1e75b 100644
--- a/app/Listeners/Update/V13/Version139.php
+++ b/app/Listeners/Update/V13/Version139.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Income\InvoiceItem;
 use App\Models\Income\InvoiceItemTax;
 use App\Models\Setting\Tax;
diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php
index 6071fb09f..22c3d2bc4 100644
--- a/app/Listeners/Update/V20/Version200.php
+++ b/app/Listeners/Update/V20/Version200.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V20;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\User;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
@@ -32,8 +32,7 @@ class Version200 extends Listener
      */
     public function handle(Event $event)
     {
-        // Check if should listen
-        if (!$this->check($event)) {
+        if ($this->skipThisUpdate($event)) {
             return;
         }
 
diff --git a/app/Listeners/Update/V20/Version201.php b/app/Listeners/Update/V20/Version201.php
index fc26a226e..58cd191f0 100644
--- a/app/Listeners/Update/V20/Version201.php
+++ b/app/Listeners/Update/V20/Version201.php
@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version201 extends Listener
@@ -20,8 +20,7 @@ class Version201 extends Listener
      */
     public function handle(Event $event)
     {
-        // Check if should listen
-        if (!$this->check($event)) {
+        if ($this->skipThisUpdate($event)) {
             return;
         }
 
diff --git a/app/Reports/ExpenseSummary.php b/app/Reports/ExpenseSummary.php
index 2514bca55..a99cd5023 100644
--- a/app/Reports/ExpenseSummary.php
+++ b/app/Reports/ExpenseSummary.php
@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Utilities\Recurring;
diff --git a/app/Reports/IncomeExpenseSummary.php b/app/Reports/IncomeExpenseSummary.php
index e07aa90af..b581a72eb 100644
--- a/app/Reports/IncomeExpenseSummary.php
+++ b/app/Reports/IncomeExpenseSummary.php
@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;
diff --git a/app/Reports/IncomeSummary.php b/app/Reports/IncomeSummary.php
index b6196c372..fd0c5cc00 100644
--- a/app/Reports/IncomeSummary.php
+++ b/app/Reports/IncomeSummary.php
@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Income\Invoice;
 use App\Utilities\Recurring;
diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php
index e2a938b7f..9640ce8f0 100644
--- a/app/Reports/ProfitLoss.php
+++ b/app/Reports/ProfitLoss.php
@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;
diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php
index c5051f785..c2f00c0e0 100644
--- a/app/Reports/TaxSummary.php
+++ b/app/Reports/TaxSummary.php
@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;