diff --git a/app/Abstracts/Http/PaymentController.php b/app/Abstracts/Http/PaymentController.php
index 5a6a8ad43..b2f72614c 100644
--- a/app/Abstracts/Http/PaymentController.php
+++ b/app/Abstracts/Http/PaymentController.php
@@ -2,9 +2,9 @@
 
 namespace App\Abstracts\Http;
 
-use App\Events\Income\PaymentReceived;
+use App\Events\Sale\PaymentReceived;
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\URL;
 use Monolog\Logger;
diff --git a/app/Abstracts/Widget.php b/app/Abstracts/Widget.php
index 99a332e4e..7b692f80f 100644
--- a/app/Abstracts/Widget.php
+++ b/app/Abstracts/Widget.php
@@ -2,7 +2,7 @@
 
 namespace App\Abstracts;
 
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Traits\Charts;
 use Date;
 
diff --git a/app/BulkActions/Expenses/Bills.php b/app/BulkActions/Purchases/Bills.php
similarity index 86%
rename from app/BulkActions/Expenses/Bills.php
rename to app/BulkActions/Purchases/Bills.php
index c9153fd2f..37e0a0a5f 100644
--- a/app/BulkActions/Expenses/Bills.php
+++ b/app/BulkActions/Purchases/Bills.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Bills as Export;
-use App\Jobs\Expense\CreateBillHistory;
-use App\Jobs\Expense\DeleteBill;
-use App\Models\Expense\Bill;
+use App\Exports\Purchases\Bills as Export;
+use App\Jobs\Purchase\CreateBillHistory;
+use App\Jobs\Purchase\DeleteBill;
+use App\Models\Purchase\Bill;
 
 class Bills extends BulkAction
 {
@@ -16,12 +16,12 @@ class Bills extends BulkAction
         'received' => [
             'name' => 'bills.mark_received',
             'message' => 'bulk_actions.message.received',
-            'permission' => 'update-expenses-bills',
+            'permission' => 'update-purchases-bills',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-bills',
+            'permission' => 'delete-purchases-bills',
         ],
         'export' => [
             'name' => 'general.export',
diff --git a/app/BulkActions/Expenses/Payments.php b/app/BulkActions/Purchases/Payments.php
similarity index 84%
rename from app/BulkActions/Expenses/Payments.php
rename to app/BulkActions/Purchases/Payments.php
index 094c4c1de..61d6b7b6b 100644
--- a/app/BulkActions/Expenses/Payments.php
+++ b/app/BulkActions/Purchases/Payments.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Payments as Export;
+use App\Exports\Purchases\Payments as Export;
 use App\Models\Banking\Transaction;
 
 class Payments extends BulkAction
@@ -18,7 +18,7 @@ class Payments extends BulkAction
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-payments',
+            'permission' => 'delete-purchases-payments',
         ],
     ];
 
diff --git a/app/BulkActions/Expenses/Vendors.php b/app/BulkActions/Purchases/Vendors.php
similarity index 81%
rename from app/BulkActions/Expenses/Vendors.php
rename to app/BulkActions/Purchases/Vendors.php
index 39ce02340..6d6418f5d 100644
--- a/app/BulkActions/Expenses/Vendors.php
+++ b/app/BulkActions/Purchases/Vendors.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Vendors as Export;
+use App\Exports\Purchases\Vendors as Export;
 use App\Models\Common\Contact;
 
 class Vendors extends BulkAction
@@ -14,17 +14,17 @@ class Vendors extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-expenses-vendors',
+            'permission' => 'update-purchases-vendors',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-expenses-vendors',
+            'permission' => 'update-purchases-vendors',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-vendors',
+            'permission' => 'delete-purchases-vendors',
         ],
         'export' => [
             'name' => 'general.export',
diff --git a/app/BulkActions/Incomes/Customers.php b/app/BulkActions/Sales/Customers.php
similarity index 81%
rename from app/BulkActions/Incomes/Customers.php
rename to app/BulkActions/Sales/Customers.php
index 3a06bef96..f4bb8fa5b 100644
--- a/app/BulkActions/Incomes/Customers.php
+++ b/app/BulkActions/Sales/Customers.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Incomes\Customers as Export;
+use App\Exports\Sales\Customers as Export;
 use App\Models\Common\Contact;
 
 class Customers extends BulkAction
@@ -14,17 +14,17 @@ class Customers extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-incomes-customers',
+            'permission' => 'update-sales-customers',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-incomes-customers',
+            'permission' => 'update-sales-customers',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-customers',
+            'permission' => 'delete-sales-customers',
         ],
         'export' => [
             'name' => 'general.export',
diff --git a/app/BulkActions/Incomes/Invoices.php b/app/BulkActions/Sales/Invoices.php
similarity index 82%
rename from app/BulkActions/Incomes/Invoices.php
rename to app/BulkActions/Sales/Invoices.php
index ef2f7242e..693ceadfd 100644
--- a/app/BulkActions/Incomes/Invoices.php
+++ b/app/BulkActions/Sales/Invoices.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Events\Income\InvoiceCreated;
-use App\Events\Income\InvoiceSent;
-use App\Events\Income\PaymentReceived;
-use App\Exports\Incomes\Invoices as Export;
-use App\Jobs\Income\DeleteInvoice;
-use App\Models\Income\Invoice;
+use App\Events\Sale\InvoiceCreated;
+use App\Events\Sale\InvoiceSent;
+use App\Events\Sale\PaymentReceived;
+use App\Exports\Sales\Invoices as Export;
+use App\Jobs\Sale\DeleteInvoice;
+use App\Models\Sale\Invoice;
 
 class Invoices extends BulkAction
 {
@@ -18,17 +18,17 @@ class Invoices extends BulkAction
         'paid' => [
             'name' => 'invoices.mark_paid',
             'message' => 'bulk_actions.message.paid',
-            'permission' => 'update-incomes-invoices',
+            'permission' => 'update-sales-invoices',
         ],
         'sent' => [
             'name' => 'invoice.mark_sent',
             'message' => 'bulk_actions.message.sent',
-            'permission' => 'update-incomes-invoices',
+            'permission' => 'update-sales-invoices',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-invoices',
+            'permission' => 'delete-sales-invoices',
         ],
         'export' => [
             'name' => 'general.export',
diff --git a/app/BulkActions/Incomes/Revenues.php b/app/BulkActions/Sales/Revenues.php
similarity index 84%
rename from app/BulkActions/Incomes/Revenues.php
rename to app/BulkActions/Sales/Revenues.php
index de1bd627e..5aaae82d7 100644
--- a/app/BulkActions/Incomes/Revenues.php
+++ b/app/BulkActions/Sales/Revenues.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Incomes\Revenues as Export;
+use App\Exports\Sales\Revenues as Export;
 use App\Models\Banking\Transaction;
 
 class Revenues extends BulkAction
@@ -14,7 +14,7 @@ class Revenues extends BulkAction
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-revenues',
+            'permission' => 'delete-sales-revenues',
         ],
         'export' => [
             'name' => 'general.export',
diff --git a/app/Console/Commands/BillReminder.php b/app/Console/Commands/BillReminder.php
index 4e7008052..c0d14b9ec 100644
--- a/app/Console/Commands/BillReminder.php
+++ b/app/Console/Commands/BillReminder.php
@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\Common\Company;
-use App\Models\Expense\Bill;
-use App\Notifications\Expense\Bill as Notification;
+use App\Models\Purchase\Bill;
+use App\Notifications\Purchase\Bill as Notification;
 use App\Utilities\Overrider;
 use Date;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/InvoiceReminder.php b/app/Console/Commands/InvoiceReminder.php
index dfcfd8e85..b03216960 100644
--- a/app/Console/Commands/InvoiceReminder.php
+++ b/app/Console/Commands/InvoiceReminder.php
@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\Common\Company;
-use App\Models\Income\Invoice;
-use App\Notifications\Income\Invoice as Notification;
+use App\Models\Sale\Invoice;
+use App\Notifications\Sale\Invoice as Notification;
 use App\Utilities\Overrider;
 use Date;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php
index 8496fd282..2200e78b7 100644
--- a/app/Console/Commands/RecurringCheck.php
+++ b/app/Console/Commands/RecurringCheck.php
@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Events\Expense\BillCreated;
-use App\Events\Expense\BillRecurring;
-use App\Events\Income\InvoiceCreated;
-use App\Events\Income\InvoiceRecurring;
+use App\Events\Purchase\BillCreated;
+use App\Events\Purchase\BillRecurring;
+use App\Events\Sale\InvoiceCreated;
+use App\Events\Sale\InvoiceRecurring;
 use App\Models\Common\Company;
 use App\Traits\Incomes;
 use App\Utilities\Overrider;
@@ -93,7 +93,7 @@ class RecurringCheck extends Command
         }
 
         switch ($recurring->recurable_type) {
-            case 'App\Models\Expense\Bill':
+            case 'App\Models\Purchase\Bill':
                 if (!$clone = $this->getDocumentClone($model, 'billed_at')) {
                     break;
                 }
@@ -103,7 +103,7 @@ class RecurringCheck extends Command
                 event(new BillRecurring($clone));
 
                 break;
-            case 'App\Models\Income\Invoice':
+            case 'App\Models\Sale\Invoice':
                 if (!$clone = $this->getDocumentClone($model, 'invoiced_at')) {
                     break;
                 }
diff --git a/app/Events/Expense/BillCreated.php b/app/Events/Purchase/BillCreated.php
similarity index 89%
rename from app/Events/Expense/BillCreated.php
rename to app/Events/Purchase/BillCreated.php
index 2cb42b984..69900b48a 100644
--- a/app/Events/Expense/BillCreated.php
+++ b/app/Events/Purchase/BillCreated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Expense/BillCreating.php b/app/Events/Purchase/BillCreating.php
similarity index 90%
rename from app/Events/Expense/BillCreating.php
rename to app/Events/Purchase/BillCreating.php
index 7eaef525d..53b40e1cc 100644
--- a/app/Events/Expense/BillCreating.php
+++ b/app/Events/Purchase/BillCreating.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Expense/BillRecurring.php b/app/Events/Purchase/BillRecurring.php
similarity index 89%
rename from app/Events/Expense/BillRecurring.php
rename to app/Events/Purchase/BillRecurring.php
index 948395000..52e09662d 100644
--- a/app/Events/Expense/BillRecurring.php
+++ b/app/Events/Purchase/BillRecurring.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Expense/BillUpdated.php b/app/Events/Purchase/BillUpdated.php
similarity index 89%
rename from app/Events/Expense/BillUpdated.php
rename to app/Events/Purchase/BillUpdated.php
index 0dd3bb867..9cf3a00d3 100644
--- a/app/Events/Expense/BillUpdated.php
+++ b/app/Events/Purchase/BillUpdated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Expense/BillUpdating.php b/app/Events/Purchase/BillUpdating.php
similarity index 92%
rename from app/Events/Expense/BillUpdating.php
rename to app/Events/Purchase/BillUpdating.php
index e296ca695..c6ec4fec9 100644
--- a/app/Events/Expense/BillUpdating.php
+++ b/app/Events/Purchase/BillUpdating.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceCreated.php b/app/Events/Sale/InvoiceCreated.php
similarity index 90%
rename from app/Events/Income/InvoiceCreated.php
rename to app/Events/Sale/InvoiceCreated.php
index ce28063f8..d6f4f9d71 100644
--- a/app/Events/Income/InvoiceCreated.php
+++ b/app/Events/Sale/InvoiceCreated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceCreating.php b/app/Events/Sale/InvoiceCreating.php
similarity index 91%
rename from app/Events/Income/InvoiceCreating.php
rename to app/Events/Sale/InvoiceCreating.php
index ea9c5e807..ddd6aa7cb 100644
--- a/app/Events/Income/InvoiceCreating.php
+++ b/app/Events/Sale/InvoiceCreating.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoicePrinting.php b/app/Events/Sale/InvoicePrinting.php
similarity index 91%
rename from app/Events/Income/InvoicePrinting.php
rename to app/Events/Sale/InvoicePrinting.php
index 2f4ed9692..0c390d5aa 100644
--- a/app/Events/Income/InvoicePrinting.php
+++ b/app/Events/Sale/InvoicePrinting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceRecurring.php b/app/Events/Sale/InvoiceRecurring.php
similarity index 91%
rename from app/Events/Income/InvoiceRecurring.php
rename to app/Events/Sale/InvoiceRecurring.php
index ca6a4b3f0..31eb4cdc4 100644
--- a/app/Events/Income/InvoiceRecurring.php
+++ b/app/Events/Sale/InvoiceRecurring.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceSent.php b/app/Events/Sale/InvoiceSent.php
similarity index 90%
rename from app/Events/Income/InvoiceSent.php
rename to app/Events/Sale/InvoiceSent.php
index c53dacdea..93471d518 100644
--- a/app/Events/Income/InvoiceSent.php
+++ b/app/Events/Sale/InvoiceSent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceUpdated.php b/app/Events/Sale/InvoiceUpdated.php
similarity index 92%
rename from app/Events/Income/InvoiceUpdated.php
rename to app/Events/Sale/InvoiceUpdated.php
index cb9db7579..22c832d22 100644
--- a/app/Events/Income/InvoiceUpdated.php
+++ b/app/Events/Sale/InvoiceUpdated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceUpdating.php b/app/Events/Sale/InvoiceUpdating.php
similarity index 92%
rename from app/Events/Income/InvoiceUpdating.php
rename to app/Events/Sale/InvoiceUpdating.php
index 5bca00b39..c73ffbe7f 100644
--- a/app/Events/Income/InvoiceUpdating.php
+++ b/app/Events/Sale/InvoiceUpdating.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/InvoiceViewed.php b/app/Events/Sale/InvoiceViewed.php
similarity index 90%
rename from app/Events/Income/InvoiceViewed.php
rename to app/Events/Sale/InvoiceViewed.php
index 5d398127a..43fa6473b 100644
--- a/app/Events/Income/InvoiceViewed.php
+++ b/app/Events/Sale/InvoiceViewed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/Income/PaymentReceived.php b/app/Events/Sale/PaymentReceived.php
similarity index 92%
rename from app/Events/Income/PaymentReceived.php
rename to app/Events/Sale/PaymentReceived.php
index 52576fba8..fb124ce79 100644
--- a/app/Events/Income/PaymentReceived.php
+++ b/app/Events/Sale/PaymentReceived.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Exports/Expenses/Bills.php b/app/Exports/Purchases/Bills.php
similarity index 66%
rename from app/Exports/Expenses/Bills.php
rename to app/Exports/Purchases/Bills.php
index 035547e81..554969f9a 100644
--- a/app/Exports/Expenses/Bills.php
+++ b/app/Exports/Purchases/Bills.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
-use App\Exports\Expenses\Sheets\Bills as Base;
-use App\Exports\Expenses\Sheets\BillItems;
-use App\Exports\Expenses\Sheets\BillItemTaxes;
-use App\Exports\Expenses\Sheets\BillHistories;
-use App\Exports\Expenses\Sheets\BillPayments;
-use App\Exports\Expenses\Sheets\BillTotals;
+use App\Exports\Purchases\Sheets\Bills as Base;
+use App\Exports\Purchases\Sheets\BillItems;
+use App\Exports\Purchases\Sheets\BillItemTaxes;
+use App\Exports\Purchases\Sheets\BillHistories;
+use App\Exports\Purchases\Sheets\BillPayments;
+use App\Exports\Purchases\Sheets\BillTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Bills implements WithMultipleSheets
diff --git a/app/Exports/Expenses/Payments.php b/app/Exports/Purchases/Payments.php
similarity index 97%
rename from app/Exports/Expenses/Payments.php
rename to app/Exports/Purchases/Payments.php
index 070bf7314..b416d2a2f 100644
--- a/app/Exports/Expenses/Payments.php
+++ b/app/Exports/Purchases/Payments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Expenses/Sheets/BillHistories.php b/app/Exports/Purchases/Sheets/BillHistories.php
similarity index 93%
rename from app/Exports/Expenses/Sheets/BillHistories.php
rename to app/Exports/Purchases/Sheets/BillHistories.php
index c8991dc65..bdc6021b6 100644
--- a/app/Exports/Expenses/Sheets/BillHistories.php
+++ b/app/Exports/Purchases/Sheets/BillHistories.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillHistory as Model;
+use App\Models\Purchase\BillHistory as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Expenses/Sheets/BillItemTaxes.php b/app/Exports/Purchases/Sheets/BillItemTaxes.php
similarity index 93%
rename from app/Exports/Expenses/Sheets/BillItemTaxes.php
rename to app/Exports/Purchases/Sheets/BillItemTaxes.php
index e7b8809eb..dc383c3c2 100644
--- a/app/Exports/Expenses/Sheets/BillItemTaxes.php
+++ b/app/Exports/Purchases/Sheets/BillItemTaxes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillItemTax as Model;
+use App\Models\Purchase\BillItemTax as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Expenses/Sheets/BillItems.php b/app/Exports/Purchases/Sheets/BillItems.php
similarity index 93%
rename from app/Exports/Expenses/Sheets/BillItems.php
rename to app/Exports/Purchases/Sheets/BillItems.php
index 17cd1e872..d7d2756e6 100644
--- a/app/Exports/Expenses/Sheets/BillItems.php
+++ b/app/Exports/Purchases/Sheets/BillItems.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillItem as Model;
+use App\Models\Purchase\BillItem as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Expenses/Sheets/BillPayments.php b/app/Exports/Purchases/Sheets/BillPayments.php
similarity index 97%
rename from app/Exports/Expenses/Sheets/BillPayments.php
rename to app/Exports/Purchases/Sheets/BillPayments.php
index df9e5a080..2bbe078d7 100644
--- a/app/Exports/Expenses/Sheets/BillPayments.php
+++ b/app/Exports/Purchases/Sheets/BillPayments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Expenses/Sheets/BillTotals.php b/app/Exports/Purchases/Sheets/BillTotals.php
similarity index 93%
rename from app/Exports/Expenses/Sheets/BillTotals.php
rename to app/Exports/Purchases/Sheets/BillTotals.php
index 758a9f3bb..1ec7ef7f6 100644
--- a/app/Exports/Expenses/Sheets/BillTotals.php
+++ b/app/Exports/Purchases/Sheets/BillTotals.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillTotal as Model;
+use App\Models\Purchase\BillTotal as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Expenses/Sheets/Bills.php b/app/Exports/Purchases/Sheets/Bills.php
similarity index 96%
rename from app/Exports/Expenses/Sheets/Bills.php
rename to app/Exports/Purchases/Sheets/Bills.php
index 1c9332361..f10792c4c 100644
--- a/app/Exports/Expenses/Sheets/Bills.php
+++ b/app/Exports/Purchases/Sheets/Bills.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\Bill as Model;
+use App\Models\Purchase\Bill as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Expenses/Vendors.php b/app/Exports/Purchases/Vendors.php
similarity index 97%
rename from app/Exports/Expenses/Vendors.php
rename to app/Exports/Purchases/Vendors.php
index 0ad499d34..c037d4fc7 100644
--- a/app/Exports/Expenses/Vendors.php
+++ b/app/Exports/Purchases/Vendors.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
 use App\Models\Common\Contact as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Incomes/Customers.php b/app/Exports/Sales/Customers.php
similarity index 97%
rename from app/Exports/Incomes/Customers.php
rename to app/Exports/Sales/Customers.php
index 62d04326d..5a8992947 100644
--- a/app/Exports/Incomes/Customers.php
+++ b/app/Exports/Sales/Customers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
 use App\Models\Common\Contact as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Incomes/Invoices.php b/app/Exports/Sales/Invoices.php
similarity index 67%
rename from app/Exports/Incomes/Invoices.php
rename to app/Exports/Sales/Invoices.php
index 68a9bd206..4a2f99c19 100644
--- a/app/Exports/Incomes/Invoices.php
+++ b/app/Exports/Sales/Invoices.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
-use App\Exports\Incomes\Sheets\Invoices as Base;
-use App\Exports\Incomes\Sheets\InvoiceItems;
-use App\Exports\Incomes\Sheets\InvoiceItemTaxes;
-use App\Exports\Incomes\Sheets\InvoiceHistories;
-use App\Exports\Incomes\Sheets\InvoicePayments;
-use App\Exports\Incomes\Sheets\InvoiceTotals;
+use App\Exports\Sales\Sheets\Invoices as Base;
+use App\Exports\Sales\Sheets\InvoiceItems;
+use App\Exports\Sales\Sheets\InvoiceItemTaxes;
+use App\Exports\Sales\Sheets\InvoiceHistories;
+use App\Exports\Sales\Sheets\InvoicePayments;
+use App\Exports\Sales\Sheets\InvoiceTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Invoices implements WithMultipleSheets
diff --git a/app/Exports/Incomes/Revenues.php b/app/Exports/Sales/Revenues.php
similarity index 97%
rename from app/Exports/Incomes/Revenues.php
rename to app/Exports/Sales/Revenues.php
index 204d99d7e..d6db39d32 100644
--- a/app/Exports/Incomes/Revenues.php
+++ b/app/Exports/Sales/Revenues.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Incomes/Sheets/InvoiceHistories.php b/app/Exports/Sales/Sheets/InvoiceHistories.php
similarity index 93%
rename from app/Exports/Incomes/Sheets/InvoiceHistories.php
rename to app/Exports/Sales/Sheets/InvoiceHistories.php
index 496c821e1..618453e8f 100644
--- a/app/Exports/Incomes/Sheets/InvoiceHistories.php
+++ b/app/Exports/Sales/Sheets/InvoiceHistories.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceHistory as Model;
+use App\Models\Sale\InvoiceHistory as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Incomes/Sheets/InvoiceItemTaxes.php b/app/Exports/Sales/Sheets/InvoiceItemTaxes.php
similarity index 93%
rename from app/Exports/Incomes/Sheets/InvoiceItemTaxes.php
rename to app/Exports/Sales/Sheets/InvoiceItemTaxes.php
index e3ddefd46..b0f447d82 100644
--- a/app/Exports/Incomes/Sheets/InvoiceItemTaxes.php
+++ b/app/Exports/Sales/Sheets/InvoiceItemTaxes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItemTax as Model;
+use App\Models\Sale\InvoiceItemTax as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Incomes/Sheets/InvoiceItems.php b/app/Exports/Sales/Sheets/InvoiceItems.php
similarity index 93%
rename from app/Exports/Incomes/Sheets/InvoiceItems.php
rename to app/Exports/Sales/Sheets/InvoiceItems.php
index f06f9413a..0cbb13135 100644
--- a/app/Exports/Incomes/Sheets/InvoiceItems.php
+++ b/app/Exports/Sales/Sheets/InvoiceItems.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItem as Model;
+use App\Models\Sale\InvoiceItem as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Incomes/Sheets/InvoicePayments.php b/app/Exports/Sales/Sheets/InvoicePayments.php
similarity index 97%
rename from app/Exports/Incomes/Sheets/InvoicePayments.php
rename to app/Exports/Sales/Sheets/InvoicePayments.php
index 807e6048b..c22472d32 100644
--- a/app/Exports/Incomes/Sheets/InvoicePayments.php
+++ b/app/Exports/Sales/Sheets/InvoicePayments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
diff --git a/app/Exports/Incomes/Sheets/InvoiceTotals.php b/app/Exports/Sales/Sheets/InvoiceTotals.php
similarity index 93%
rename from app/Exports/Incomes/Sheets/InvoiceTotals.php
rename to app/Exports/Sales/Sheets/InvoiceTotals.php
index 84e6f37c7..36d9caa09 100644
--- a/app/Exports/Incomes/Sheets/InvoiceTotals.php
+++ b/app/Exports/Sales/Sheets/InvoiceTotals.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceTotal as Model;
+use App\Models\Sale\InvoiceTotal as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Exports/Incomes/Sheets/Invoices.php b/app/Exports/Sales/Sheets/Invoices.php
similarity index 96%
rename from app/Exports/Incomes/Sheets/Invoices.php
rename to app/Exports/Sales/Sheets/Invoices.php
index e23fc1dec..a4a2bad9c 100644
--- a/app/Exports/Incomes/Sheets/Invoices.php
+++ b/app/Exports/Sales/Sheets/Invoices.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\Invoice as Model;
+use App\Models\Sale\Invoice as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;
diff --git a/app/Http/Controllers/Api/Common/Contacts.php b/app/Http/Controllers/Api/Common/Contacts.php
index 23e743d28..9d92d40d4 100644
--- a/app/Http/Controllers/Api/Common/Contacts.php
+++ b/app/Http/Controllers/Api/Common/Contacts.php
@@ -21,10 +21,10 @@ class Contacts extends ApiController
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-customers')->only('destroy');
+        $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-sales-customers')->only('destroy');
     }
 
     /**
diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Purchases/Bills.php
similarity index 86%
rename from app/Http/Controllers/Api/Expenses/Bills.php
rename to app/Http/Controllers/Api/Purchases/Bills.php
index fbba5d902..f35f5333f 100644
--- a/app/Http/Controllers/Api/Expenses/Bills.php
+++ b/app/Http/Controllers/Api/Purchases/Bills.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Expenses;
+namespace App\Http\Controllers\Api\Purchases;
 
 use App\Abstracts\Http\ApiController;
-use App\Http\Requests\Expense\Bill as Request;
-use App\Jobs\Expense\CreateBill;
-use App\Jobs\Expense\DeleteBill;
-use App\Jobs\Expense\UpdateBill;
-use App\Models\Expense\Bill;
-use App\Transformers\Expense\Bill as Transformer;
+use App\Http\Requests\Purchase\Bill as Request;
+use App\Jobs\Purchase\CreateBill;
+use App\Jobs\Purchase\DeleteBill;
+use App\Jobs\Purchase\UpdateBill;
+use App\Models\Purchase\Bill;
+use App\Transformers\Purchase\Bill as Transformer;
 
 class Bills extends ApiController
 {
diff --git a/app/Http/Controllers/Api/Incomes/InvoiceTransactions.php b/app/Http/Controllers/Api/Sales/InvoiceTransactions.php
similarity index 96%
rename from app/Http/Controllers/Api/Incomes/InvoiceTransactions.php
rename to app/Http/Controllers/Api/Sales/InvoiceTransactions.php
index 42329c7c2..f0c8bc166 100644
--- a/app/Http/Controllers/Api/Incomes/InvoiceTransactions.php
+++ b/app/Http/Controllers/Api/Sales/InvoiceTransactions.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Api\Incomes;
+namespace App\Http\Controllers\Api\Sales;
 
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Jobs\Banking\CreateDocumentTransaction;
 use App\Jobs\Banking\DeleteTransaction;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Transformers\Banking\Transaction as Transformer;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Foundation\Bus\DispatchesJobs;
diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Sales/Invoices.php
similarity index 87%
rename from app/Http/Controllers/Api/Incomes/Invoices.php
rename to app/Http/Controllers/Api/Sales/Invoices.php
index 1369c6545..a59e17780 100644
--- a/app/Http/Controllers/Api/Incomes/Invoices.php
+++ b/app/Http/Controllers/Api/Sales/Invoices.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Incomes;
+namespace App\Http\Controllers\Api\Sales;
 
 use App\Abstracts\Http\ApiController;
-use App\Http\Requests\Income\Invoice as Request;
-use App\Jobs\Income\CreateInvoice;
-use App\Jobs\Income\DeleteInvoice;
-use App\Jobs\Income\UpdateInvoice;
-use App\Models\Income\Invoice;
-use App\Transformers\Income\Invoice as Transformer;
+use App\Http\Requests\Sale\Invoice as Request;
+use App\Jobs\Sale\CreateInvoice;
+use App\Jobs\Sale\DeleteInvoice;
+use App\Jobs\Sale\UpdateInvoice;
+use App\Models\Sale\Invoice;
+use App\Transformers\Sale\Invoice as Transformer;
 
 class Invoices extends ApiController
 {
diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
index 28d9ad549..1c809f49a 100644
--- a/app/Http/Controllers/Auth/Users.php
+++ b/app/Http/Controllers/Auth/Users.php
@@ -201,7 +201,7 @@ class Users extends Controller
         // Mark bill notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not a bill notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Expense\Bill') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Purchase\Bill') {
                 continue;
             }
 
@@ -223,7 +223,7 @@ class Users extends Controller
         // Mark invoice notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not an invoice notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
                 continue;
             }
 
diff --git a/app/Http/Controllers/Common/Search.php b/app/Http/Controllers/Common/Search.php
index 30ac8e40f..e0a745cdf 100644
--- a/app/Http/Controllers/Common/Search.php
+++ b/app/Http/Controllers/Common/Search.php
@@ -6,8 +6,8 @@ use App\Abstracts\Http\Controller;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Purchase\Bill;
+use App\Models\Sale\Invoice;
 use App\Models\Common\Item;
 use App\Traits\Contacts;
 
@@ -63,7 +63,7 @@ class Search extends Controller
                     'name'  => $invoice->invoice_number . ' - ' . $invoice->contact_name,
                     'type'  => trans_choice('general.invoices', 1),
                     'color' => '#6da252',
-                    'href'  => url('incomes/invoices/' . $invoice->id),
+                    'href'  => url('sales/invoices/' . $invoice->id),
                 ];
             }
         }/*
@@ -77,7 +77,7 @@ class Search extends Controller
                     'name'  => $transaction->contact_name,
                     'type'  => trans_choice('general.revenues', 1),
                     'color' => '#00c0ef',
-                    'href'  => url('incomes/revenues/' . $transaction->id),
+                    'href'  => url('sales/revenues/' . $transaction->id),
                 ];
             }
         }*/
@@ -91,7 +91,7 @@ class Search extends Controller
                     'name'  => $customer->name,
                     'type'  => trans_choice('general.customers', 1),
                     'color' => '#328aef',
-                    'href'  => url('incomes/customers/' . $customer->id),
+                    'href'  => url('sales/customers/' . $customer->id),
                 ];
             }
         }
@@ -105,7 +105,7 @@ class Search extends Controller
                     'name'  => $bill->bill_number . ' - ' . $bill->contact_name,
                     'type'  => trans_choice('general.bills', 1),
                     'color' => '#ef3232',
-                    'href'  => url('expenses/bills/' . $bill->id),
+                    'href'  => url('purchases/bills/' . $bill->id),
                 ];
             }
         }
@@ -119,7 +119,7 @@ class Search extends Controller
                     'name'  => $revenue->contact_name,
                     'type'  => trans_choice('general.revenues', 1),
                     'color' => '#00c0ef',
-                    'href'  => url('incomes/revenues/' . $revenue->id),
+                    'href'  => url('sales/revenues/' . $revenue->id),
                 ];
             }
         }*/
@@ -133,7 +133,7 @@ class Search extends Controller
                     'name'  => $vendor->name,
                     'type'  => trans_choice('general.vendors', 1),
                     'color' => '#efef32',
-                    'href'  => url('expenses/vendors/' . $vendor->id),
+                    'href'  => url('purchases/vendors/' . $vendor->id),
                 ];
             }
         }
diff --git a/app/Http/Controllers/Modals/BillTransactions.php b/app/Http/Controllers/Modals/BillTransactions.php
index dd5cc4e60..e227c49b9 100644
--- a/app/Http/Controllers/Modals/BillTransactions.php
+++ b/app/Http/Controllers/Modals/BillTransactions.php
@@ -7,7 +7,7 @@ use App\Http\Requests\Banking\Transaction as Request;
 use App\Jobs\Banking\CreateDocumentTransaction;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 use App\Models\Setting\Currency;
 use App\Utilities\Modules;
 use App\Traits\Uploads;
@@ -22,10 +22,10 @@ class BillTransactions extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-expenses-bills')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-expenses-bills')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-expenses-bills')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-expenses-bills')->only('destroy');
+        $this->middleware('permission:create-purchases-bills')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-purchases-bills')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-purchases-bills')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-purchases-bills')->only('destroy');
     }
 
     /**
diff --git a/app/Http/Controllers/Modals/Customers.php b/app/Http/Controllers/Modals/Customers.php
index 3aace6475..36f148cb7 100644
--- a/app/Http/Controllers/Modals/Customers.php
+++ b/app/Http/Controllers/Modals/Customers.php
@@ -15,10 +15,10 @@ class Customers extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-customers')->only('destroy');
+        $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-sales-customers')->only('destroy');
     }
 
     /**
diff --git a/app/Http/Controllers/Modals/InvoiceTransactions.php b/app/Http/Controllers/Modals/InvoiceTransactions.php
index 38d8407fe..cbf99cf46 100644
--- a/app/Http/Controllers/Modals/InvoiceTransactions.php
+++ b/app/Http/Controllers/Modals/InvoiceTransactions.php
@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Modals;
 
 use App\Abstracts\Http\Controller;
-use App\Events\Income\PaymentReceived;
+use App\Events\Sale\PaymentReceived;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use App\Utilities\Modules;
 use App\Traits\Uploads;
@@ -22,10 +22,10 @@ class InvoiceTransactions extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-invoices')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-invoices')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-invoices')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-invoices')->only('destroy');
+        $this->middleware('permission:create-sales-invoices')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-sales-invoices')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-sales-invoices')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-sales-invoices')->only('destroy');
     }
 
     /**
diff --git a/app/Http/Controllers/Modals/Vendors.php b/app/Http/Controllers/Modals/Vendors.php
index cf69d8761..47f5b8569 100644
--- a/app/Http/Controllers/Modals/Vendors.php
+++ b/app/Http/Controllers/Modals/Vendors.php
@@ -15,10 +15,10 @@ class Vendors extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-expenses-vendors')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-expenses-vendors')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-expenses-vendors')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-expenses-vendors')->only('destroy');
+        $this->middleware('permission:create-purchases-vendors')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-purchases-vendors')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-purchases-vendors')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-purchases-vendors')->only('destroy');
     }
 
     /**
diff --git a/app/Http/Controllers/Portal/Dashboard.php b/app/Http/Controllers/Portal/Dashboard.php
index 29dfdb1ab..7a768b367 100644
--- a/app/Http/Controllers/Portal/Dashboard.php
+++ b/app/Http/Controllers/Portal/Dashboard.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Portal;
 
 use App\Abstracts\Http\Controller;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Utilities\Chartjs;
 use Date;
 
diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php
index 8a8ba369e..87a49f2d6 100644
--- a/app/Http/Controllers/Portal/Invoices.php
+++ b/app/Http/Controllers/Portal/Invoices.php
@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Portal;
 use App\Abstracts\Http\Controller;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
-use App\Models\Income\Invoice;
-use App\Models\Income\InvoiceStatus;
+use App\Models\Sale\Invoice;
+use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Traits\Currencies;
@@ -61,7 +61,7 @@ class Invoices extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        event(new \App\Events\Income\InvoiceViewed($invoice));
+        event(new \App\Events\Sale\InvoiceViewed($invoice));
 
         return view('portal.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
     }
@@ -124,9 +124,9 @@ class Invoices extends Controller
 
         $invoice->paid = $paid;
 
-        $invoice->template_path = 'incomes.invoices.print';
+        $invoice->template_path = 'sales.invoices.print';
 
-        event(new \App\Events\Income\InvoicePrinting($invoice));
+        event(new \App\Events\Sale\InvoicePrinting($invoice));
 
         return $invoice;
     }
@@ -178,7 +178,7 @@ class Invoices extends Controller
         $print_action = URL::signedRoute('signed.invoices.print', [$invoice->id, 'company_id' => session('company_id')]);
         $pdf_action = URL::signedRoute('signed.invoices.pdf', [$invoice->id, 'company_id' => session('company_id')]);
 
-        event(new \App\Events\Income\InvoiceViewed($invoice));
+        event(new \App\Events\Sale\InvoiceViewed($invoice));
 
         return view('portal.invoices.signed', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'payment_actions', 'print_action', 'pdf_action'));
     }
diff --git a/app/Http/Controllers/Portal/Profile.php b/app/Http/Controllers/Portal/Profile.php
index 5e221137e..4228a55d7 100644
--- a/app/Http/Controllers/Portal/Profile.php
+++ b/app/Http/Controllers/Portal/Profile.php
@@ -82,7 +82,7 @@ class Profile extends Controller
         // Mark invoice notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not an invoice notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
                 continue;
             }
 
diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Purchases/Bills.php
similarity index 89%
rename from app/Http/Controllers/Expenses/Bills.php
rename to app/Http/Controllers/Purchases/Bills.php
index 6d2e5bfda..f87c7414b 100644
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Purchases/Bills.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Bills as Export;
+use App\Exports\Purchases\Bills as Export;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Http\Requests\Expense\Bill as Request;
-use App\Http\Requests\Expense\BillAddItem as ItemRequest;
-use App\Imports\Expenses\Bills as Import;
-use App\Jobs\Expense\CreateBill;
-use App\Jobs\Expense\DeleteBill;
-use App\Jobs\Expense\DuplicateBill;
-use App\Jobs\Expense\UpdateBill;
+use App\Http\Requests\Purchase\Bill as Request;
+use App\Http\Requests\Purchase\BillAddItem as ItemRequest;
+use App\Imports\Purchases\Bills as Import;
+use App\Jobs\Purchase\CreateBill;
+use App\Jobs\Purchase\DeleteBill;
+use App\Jobs\Purchase\DuplicateBill;
+use App\Jobs\Purchase\UpdateBill;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
-use App\Models\Expense\BillStatus;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\BillStatus;
+use App\Models\Purchase\Bill;
+use App\Models\Purchase\BillHistory;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
@@ -49,7 +49,7 @@ class Bills extends Controller
             return $item;
         })->pluck('name', 'code'));
 
-        return view('expenses.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
+        return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
     }
 
     /**
@@ -77,7 +77,7 @@ class Bills extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
+        return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**
@@ -99,7 +99,7 @@ class Bills extends Controller
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('expenses.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('purchases.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -193,7 +193,7 @@ class Bills extends Controller
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -347,7 +347,7 @@ class Bills extends Controller
             $currency->precision = (int) $currency->precision;
         }
 
-        $html = view('expenses.bills.item', compact('item_row', 'taxes', 'currency'))->render();
+        $html = view('purchases.bills.item', compact('item_row', 'taxes', 'currency'))->render();
 
         return response()->json([
             'success' => true,
@@ -378,7 +378,7 @@ class Bills extends Controller
 
         $bill->paid = $paid;
 
-        $bill->template_path = 'expenses.bills.print';
+        $bill->template_path = 'purchases.bills.print';
 
         return $bill;
     }
diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Purchases/Payments.php
similarity index 91%
rename from app/Http/Controllers/Expenses/Payments.php
rename to app/Http/Controllers/Purchases/Payments.php
index cb4078368..06b6d0e76 100644
--- a/app/Http/Controllers/Expenses/Payments.php
+++ b/app/Http/Controllers/Purchases/Payments.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Payments as Export;
+use App\Exports\Purchases\Payments as Export;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Expenses\Payments as Import;
+use App\Imports\Purchases\Payments as Import;
 use App\Jobs\Banking\CreateTransaction;
 use App\Jobs\Banking\DeleteTransaction;
 use App\Jobs\Banking\UpdateTransaction;
@@ -41,7 +41,7 @@ class Payments extends Controller
 
         $transfer_cat_id = Category::transfer();
 
-        return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
     }
 
     /**
@@ -75,7 +75,7 @@ class Payments extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
+        return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
     }
 
     /**
@@ -165,7 +165,7 @@ class Payments extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
+        return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**
diff --git a/app/Http/Controllers/Expenses/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php
similarity index 94%
rename from app/Http/Controllers/Expenses/Vendors.php
rename to app/Http/Controllers/Purchases/Vendors.php
index 5ef40366c..5f8575060 100644
--- a/app/Http/Controllers/Expenses/Vendors.php
+++ b/app/Http/Controllers/Purchases/Vendors.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Vendors as Export;
+use App\Exports\Purchases\Vendors as Export;
 use App\Http\Requests\Common\Contact as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Expenses\Vendors as Import;
+use App\Imports\Purchases\Vendors as Import;
 use App\Jobs\Common\CreateContact;
 use App\Jobs\Common\DeleteContact;
 use App\Jobs\Common\UpdateContact;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 use App\Models\Setting\Currency;
 use App\Traits\Contacts;
 use Date;
@@ -30,7 +30,7 @@ class Vendors extends Controller
     {
         $vendors = Contact::type($this->getVendorTypes())->collect();
 
-        return view('expenses.vendors.index', compact('vendors'));
+        return view('purchases.vendors.index', compact('vendors'));
     }
 
     /**
@@ -86,7 +86,7 @@ class Vendors extends Controller
         $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
         $bills = $this->paginate($bills->sortByDesc('paid_at'), $limit);
 
-        return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
+        return view('purchases.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
     }
 
     /**
@@ -98,7 +98,7 @@ class Vendors extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('expenses.vendors.create', compact('currencies'));
+        return view('purchases.vendors.create', compact('currencies'));
     }
 
     /**
@@ -176,7 +176,7 @@ class Vendors extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('expenses.vendors.edit', compact('vendor', 'currencies'));
+        return view('purchases.vendors.edit', compact('vendor', 'currencies'));
     }
 
     /**
diff --git a/app/Http/Controllers/Incomes/Customers.php b/app/Http/Controllers/Sales/Customers.php
similarity index 94%
rename from app/Http/Controllers/Incomes/Customers.php
rename to app/Http/Controllers/Sales/Customers.php
index 81d2f3cfd..517aa7140 100644
--- a/app/Http/Controllers/Incomes/Customers.php
+++ b/app/Http/Controllers/Sales/Customers.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Customers as Export;
+use App\Exports\Sales\Customers as Export;
 use App\Http\Requests\Common\Contact as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Incomes\Customers as Import;
+use App\Imports\Sales\Customers as Import;
 use App\Jobs\Common\CreateContact;
 use App\Jobs\Common\DeleteContact;
 use App\Jobs\Common\UpdateContact;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use App\Traits\Contacts;
 use Date;
@@ -31,7 +31,7 @@ class Customers extends Controller
     {
         $customers = Contact::type($this->getCustomerTypes())->collect();
 
-        return view('incomes.customers.index', compact('customers'));
+        return view('sales.customers.index', compact('customers'));
     }
 
     /**
@@ -92,7 +92,7 @@ class Customers extends Controller
         $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
         $invoices = $this->paginate($invoices->sortByDesc('invoiced_at'), $limit);
 
-        return view('incomes.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
+        return view('sales.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
     }
 
     /**
@@ -104,7 +104,7 @@ class Customers extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('incomes.customers.create', compact('currencies'));
+        return view('sales.customers.create', compact('currencies'));
     }
 
     /**
@@ -182,7 +182,7 @@ class Customers extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('incomes.customers.edit', compact('customer', 'currencies'));
+        return view('sales.customers.edit', compact('customer', 'currencies'));
     }
 
     /**
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
similarity index 87%
rename from app/Http/Controllers/Incomes/Invoices.php
rename to app/Http/Controllers/Sales/Invoices.php
index 85571ffdf..8485e02c8 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Sales/Invoices.php
@@ -1,26 +1,26 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Invoices as Export;
+use App\Exports\Sales\Invoices as Export;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Http\Requests\Income\Invoice as Request;
-use App\Http\Requests\Income\InvoiceAddItem as ItemRequest;
-use App\Imports\Incomes\Invoices as Import;
-use App\Jobs\Income\CreateInvoice;
-use App\Jobs\Income\DeleteInvoice;
-use App\Jobs\Income\DuplicateInvoice;
-use App\Jobs\Income\UpdateInvoice;
+use App\Http\Requests\Sale\Invoice as Request;
+use App\Http\Requests\Sale\InvoiceAddItem as ItemRequest;
+use App\Imports\Sales\Invoices as Import;
+use App\Jobs\Sale\CreateInvoice;
+use App\Jobs\Sale\DeleteInvoice;
+use App\Jobs\Sale\DuplicateInvoice;
+use App\Jobs\Sale\UpdateInvoice;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
-use App\Models\Income\Invoice;
-use App\Models\Income\InvoiceStatus;
+use App\Models\Sale\Invoice;
+use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
-use App\Notifications\Income\Invoice as Notification;
+use App\Notifications\Sale\Invoice as Notification;
 use App\Traits\Contacts;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
@@ -51,7 +51,7 @@ class Invoices extends Controller
             return $item;
         })->pluck('name', 'code'));
 
-        return view('incomes.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
+        return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
     }
 
     /**
@@ -81,7 +81,7 @@ class Invoices extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
+        return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
     }
 
     /**
@@ -105,7 +105,7 @@ class Invoices extends Controller
 
         $number = $this->getNextInvoiceNumber();
 
-        return view('incomes.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
+        return view('sales.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
     }
 
     /**
@@ -168,14 +168,14 @@ class Invoices extends Controller
         \Excel::import(new Import(), $request->file('import'));
 
         if (!$success) {
-            return redirect('common/import/incomes/invoices');
+            return redirect('common/import/sales/invoices');
         }
 
         $message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
 
         flash($message)->success();
 
-        return redirect('incomes/invoices');
+        return redirect('sales/invoices');
     }
 
     /**
@@ -199,7 +199,7 @@ class Invoices extends Controller
 
         $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -276,7 +276,7 @@ class Invoices extends Controller
      */
     public function markSent(Invoice $invoice)
     {
-        event(new \App\Events\Income\InvoiceSent($invoice));
+        event(new \App\Events\Sale\InvoiceSent($invoice));
 
         $message = trans('invoices.messages.marked_sent');
 
@@ -324,7 +324,7 @@ class Invoices extends Controller
         unset($invoice->pdf_path);
         unset($invoice->reconciled);
 
-        event(new \App\Events\Income\InvoiceSent($invoice));
+        event(new \App\Events\Sale\InvoiceSent($invoice));
 
         flash(trans('invoices.messages.email_sent'))->success();
 
@@ -383,7 +383,7 @@ class Invoices extends Controller
     public function markPaid(Invoice $invoice)
     {
         try {
-            event(new \App\Events\Income\PaymentReceived($invoice, []));
+            event(new \App\Events\Sale\PaymentReceived($invoice, []));
 
             $message = trans('invoices.messages.marked_paid');
 
@@ -415,7 +415,7 @@ class Invoices extends Controller
             $currency->precision = (int) $currency->precision;
         }
 
-        $html = view('incomes.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
+        $html = view('sales.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
 
         return response()->json([
             'success' => true,
@@ -446,9 +446,9 @@ class Invoices extends Controller
 
         $invoice->paid = $paid;
 
-        $invoice->template_path = 'incomes.invoices.print_' . setting('invoice.template' ,'default');
+        $invoice->template_path = 'sales.invoices.print_' . setting('invoice.template' ,'default');
 
-        event(new \App\Events\Income\InvoicePrinting($invoice));
+        event(new \App\Events\Sale\InvoicePrinting($invoice));
 
         return $invoice;
     }
diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
similarity index 92%
rename from app/Http/Controllers/Incomes/Revenues.php
rename to app/Http/Controllers/Sales/Revenues.php
index de896d6e7..4339f1b5e 100644
--- a/app/Http/Controllers/Incomes/Revenues.php
+++ b/app/Http/Controllers/Sales/Revenues.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Revenues as Export;
+use App\Exports\Sales\Revenues as Export;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
 use App\Imports\Common\Items as Import;
@@ -41,7 +41,7 @@ class Revenues extends Controller
 
         $transfer_cat_id = Category::transfer();
 
-        return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
     }
 
     /**
@@ -75,7 +75,7 @@ class Revenues extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('incomes.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
+        return view('sales.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
     }
 
     /**
@@ -165,7 +165,7 @@ class Revenues extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
+        return view('sales.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**
diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php
index d32bd4a60..fa21be204 100644
--- a/app/Http/Controllers/Settings/Email.php
+++ b/app/Http/Controllers/Settings/Email.php
@@ -50,9 +50,9 @@ class Email extends Controller
             'log' => trans('settings.email.log'),
         ];
 
-        $invoice_tags = implode(', ', app('App\Notifications\Income\Invoice')->getTags());
+        $invoice_tags = implode(', ', app('App\Notifications\Sale\Invoice')->getTags());
         $payment_tags = implode(', ', app('App\Notifications\Portal\PaymentReceived')->getTags());
-        $bill_tags = implode(', ', app('App\Notifications\Expense\Bill')->getTags());
+        $bill_tags = implode(', ', app('App\Notifications\Purchase\Bill')->getTags());
 
         return view('settings.email.edit', compact(
             'setting',
diff --git a/app/Http/Requests/Expense/Bill.php b/app/Http/Requests/Purchase/Bill.php
similarity index 98%
rename from app/Http/Requests/Expense/Bill.php
rename to app/Http/Requests/Purchase/Bill.php
index b71dc22de..f704abcf4 100644
--- a/app/Http/Requests/Expense/Bill.php
+++ b/app/Http/Requests/Purchase/Bill.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 use Date;
diff --git a/app/Http/Requests/Expense/BillAddItem.php b/app/Http/Requests/Purchase/BillAddItem.php
similarity index 93%
rename from app/Http/Requests/Expense/BillAddItem.php
rename to app/Http/Requests/Purchase/BillAddItem.php
index 387ad3b8f..cb91ccd64 100644
--- a/app/Http/Requests/Expense/BillAddItem.php
+++ b/app/Http/Requests/Purchase/BillAddItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Expense/BillHistory.php b/app/Http/Requests/Purchase/BillHistory.php
similarity index 93%
rename from app/Http/Requests/Expense/BillHistory.php
rename to app/Http/Requests/Purchase/BillHistory.php
index be80f6702..173bb6afd 100644
--- a/app/Http/Requests/Expense/BillHistory.php
+++ b/app/Http/Requests/Purchase/BillHistory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Expense/BillItem.php b/app/Http/Requests/Purchase/BillItem.php
similarity index 95%
rename from app/Http/Requests/Expense/BillItem.php
rename to app/Http/Requests/Purchase/BillItem.php
index 65acc0b99..456436edf 100644
--- a/app/Http/Requests/Expense/BillItem.php
+++ b/app/Http/Requests/Purchase/BillItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Expense/BillTotal.php b/app/Http/Requests/Purchase/BillTotal.php
similarity index 94%
rename from app/Http/Requests/Expense/BillTotal.php
rename to app/Http/Requests/Purchase/BillTotal.php
index b4968d23b..350c34c48 100644
--- a/app/Http/Requests/Expense/BillTotal.php
+++ b/app/Http/Requests/Purchase/BillTotal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Income/Invoice.php b/app/Http/Requests/Sale/Invoice.php
similarity index 98%
rename from app/Http/Requests/Income/Invoice.php
rename to app/Http/Requests/Sale/Invoice.php
index 476d78e6e..9de6e2bce 100644
--- a/app/Http/Requests/Income/Invoice.php
+++ b/app/Http/Requests/Sale/Invoice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 use Date;
diff --git a/app/Http/Requests/Income/InvoiceAddItem.php b/app/Http/Requests/Sale/InvoiceAddItem.php
similarity index 93%
rename from app/Http/Requests/Income/InvoiceAddItem.php
rename to app/Http/Requests/Sale/InvoiceAddItem.php
index e03143bab..6125ed288 100644
--- a/app/Http/Requests/Income/InvoiceAddItem.php
+++ b/app/Http/Requests/Sale/InvoiceAddItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Income/InvoiceHistory.php b/app/Http/Requests/Sale/InvoiceHistory.php
similarity index 94%
rename from app/Http/Requests/Income/InvoiceHistory.php
rename to app/Http/Requests/Sale/InvoiceHistory.php
index 1316c2999..68bccec1a 100644
--- a/app/Http/Requests/Income/InvoiceHistory.php
+++ b/app/Http/Requests/Sale/InvoiceHistory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Income/InvoiceItem.php b/app/Http/Requests/Sale/InvoiceItem.php
similarity index 95%
rename from app/Http/Requests/Income/InvoiceItem.php
rename to app/Http/Requests/Sale/InvoiceItem.php
index bc8e0c1d8..2f7ea7c4e 100644
--- a/app/Http/Requests/Income/InvoiceItem.php
+++ b/app/Http/Requests/Sale/InvoiceItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/Requests/Income/InvoiceTotal.php b/app/Http/Requests/Sale/InvoiceTotal.php
similarity index 94%
rename from app/Http/Requests/Income/InvoiceTotal.php
rename to app/Http/Requests/Sale/InvoiceTotal.php
index f915792a2..24b4c1b2e 100644
--- a/app/Http/Requests/Income/InvoiceTotal.php
+++ b/app/Http/Requests/Sale/InvoiceTotal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 
diff --git a/app/Http/ViewComposers/Header.php b/app/Http/ViewComposers/Header.php
index 4446f9176..cf01dcc1e 100644
--- a/app/Http/ViewComposers/Header.php
+++ b/app/Http/ViewComposers/Header.php
@@ -41,11 +41,11 @@ class Header
                 $data = $underead->getAttribute('data');
 
                 switch ($underead->getAttribute('type')) {
-                    case 'App\Notifications\Expense\Bill':
+                    case 'App\Notifications\Purchase\Bill':
                         $bills[$data['bill_id']] = $data['amount'];
                         $notifications++;
                         break;
-                    case 'App\Notifications\Income\Invoice':
+                    case 'App\Notifications\Sale\Invoice':
                         $invoices[$data['invoice_id']] = $data['amount'];
                         $notifications++;
                         break;
diff --git a/app/Imports/Expenses/Bills.php b/app/Imports/Purchases/Bills.php
similarity index 59%
rename from app/Imports/Expenses/Bills.php
rename to app/Imports/Purchases/Bills.php
index 837416802..de550736c 100644
--- a/app/Imports/Expenses/Bills.php
+++ b/app/Imports/Purchases/Bills.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
-use App\Imports\Expenses\Sheets\Bills as Base;
-use App\Imports\Expenses\Sheets\BillItems;
-use App\Imports\Expenses\Sheets\BillItemTaxes;
-use App\Imports\Expenses\Sheets\BillHistories;
-use App\Imports\Expenses\Sheets\BillPayments;
-use App\Imports\Expenses\Sheets\BillTotals;
+use App\Imports\Purchases\Sheets\Bills as Base;
+use App\Imports\Purchases\Sheets\BillItems;
+use App\Imports\Purchases\Sheets\BillItemTaxes;
+use App\Imports\Purchases\Sheets\BillHistories;
+use App\Imports\Purchases\Sheets\BillPayments;
+use App\Imports\Purchases\Sheets\BillTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Bills implements WithMultipleSheets
diff --git a/app/Imports/Expenses/Payments.php b/app/Imports/Purchases/Payments.php
similarity index 97%
rename from app/Imports/Expenses/Payments.php
rename to app/Imports/Purchases/Payments.php
index ef0ddb271..38b2cde34 100644
--- a/app/Imports/Expenses/Payments.php
+++ b/app/Imports/Purchases/Payments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;
diff --git a/app/Imports/Expenses/Sheets/BillHistories.php b/app/Imports/Purchases/Sheets/BillHistories.php
similarity index 87%
rename from app/Imports/Expenses/Sheets/BillHistories.php
rename to app/Imports/Purchases/Sheets/BillHistories.php
index 5fc66bdcd..a8d134388 100644
--- a/app/Imports/Expenses/Sheets/BillHistories.php
+++ b/app/Imports/Purchases/Sheets/BillHistories.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillHistory as Model;
-use App\Http\Requests\Expense\BillHistory as Request;
+use App\Models\Purchase\BillHistory as Model;
+use App\Http\Requests\Purchase\BillHistory as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Expenses/Sheets/BillItemTaxes.php b/app/Imports/Purchases/Sheets/BillItemTaxes.php
similarity index 90%
rename from app/Imports/Expenses/Sheets/BillItemTaxes.php
rename to app/Imports/Purchases/Sheets/BillItemTaxes.php
index 0056aee32..8740e13c6 100644
--- a/app/Imports/Expenses/Sheets/BillItemTaxes.php
+++ b/app/Imports/Purchases/Sheets/BillItemTaxes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillItemTax as Model;
+use App\Models\Purchase\BillItemTax as Model;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Expenses/Sheets/BillItems.php b/app/Imports/Purchases/Sheets/BillItems.php
similarity index 88%
rename from app/Imports/Expenses/Sheets/BillItems.php
rename to app/Imports/Purchases/Sheets/BillItems.php
index 9453f20e8..c006f23bd 100644
--- a/app/Imports/Expenses/Sheets/BillItems.php
+++ b/app/Imports/Purchases/Sheets/BillItems.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillItem as Model;
-use App\Http\Requests\Expense\BillItem as Request;
+use App\Models\Purchase\BillItem as Model;
+use App\Http\Requests\Purchase\BillItem as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Expenses/Sheets/BillPayments.php b/app/Imports/Purchases/Sheets/BillPayments.php
similarity index 97%
rename from app/Imports/Expenses/Sheets/BillPayments.php
rename to app/Imports/Purchases/Sheets/BillPayments.php
index f31f42ea8..1a53af47d 100644
--- a/app/Imports/Expenses/Sheets/BillPayments.php
+++ b/app/Imports/Purchases/Sheets/BillPayments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;
diff --git a/app/Imports/Expenses/Sheets/BillTotals.php b/app/Imports/Purchases/Sheets/BillTotals.php
similarity index 88%
rename from app/Imports/Expenses/Sheets/BillTotals.php
rename to app/Imports/Purchases/Sheets/BillTotals.php
index 75a6996a3..f6983c442 100644
--- a/app/Imports/Expenses/Sheets/BillTotals.php
+++ b/app/Imports/Purchases/Sheets/BillTotals.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillTotal as Model;
-use App\Http\Requests\Expense\BillTotal as Request;
+use App\Models\Purchase\BillTotal as Model;
+use App\Http\Requests\Purchase\BillTotal as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Expenses/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php
similarity index 88%
rename from app/Imports/Expenses/Sheets/Bills.php
rename to app/Imports/Purchases/Sheets/Bills.php
index 866835e98..45c4f8f95 100644
--- a/app/Imports/Expenses/Sheets/Bills.php
+++ b/app/Imports/Purchases/Sheets/Bills.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\Bill as Model;
-use App\Http\Requests\Expense\Bill as Request;
+use App\Models\Purchase\Bill as Model;
+use App\Http\Requests\Purchase\Bill as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Expenses/Vendors.php b/app/Imports/Purchases/Vendors.php
similarity index 97%
rename from app/Imports/Expenses/Vendors.php
rename to app/Imports/Purchases/Vendors.php
index 7d8f327ca..5f6440c64 100644
--- a/app/Imports/Expenses/Vendors.php
+++ b/app/Imports/Purchases/Vendors.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
 use App\Models\Common\Contact as Model;
 use App\Http\Requests\Common\Contact as Request;
diff --git a/app/Imports/Incomes/Customers.php b/app/Imports/Sales/Customers.php
similarity index 97%
rename from app/Imports/Incomes/Customers.php
rename to app/Imports/Sales/Customers.php
index 32325ed52..307482887 100644
--- a/app/Imports/Incomes/Customers.php
+++ b/app/Imports/Sales/Customers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Incomes;
+namespace App\Imports\Sales;
 
 use App\Models\Common\Contact as Model;
 use App\Http\Requests\Common\Contact as Request;
diff --git a/app/Imports/Incomes/Invoices.php b/app/Imports/Sales/Invoices.php
similarity index 61%
rename from app/Imports/Incomes/Invoices.php
rename to app/Imports/Sales/Invoices.php
index aac66d65a..a45b0d748 100644
--- a/app/Imports/Incomes/Invoices.php
+++ b/app/Imports/Sales/Invoices.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Imports\Incomes;
+namespace App\Imports\Sales;
 
-use App\Imports\Incomes\Sheets\Invoices as Base;
-use App\Imports\Incomes\Sheets\InvoiceItems;
-use App\Imports\Incomes\Sheets\InvoiceItemTaxes;
-use App\Imports\Incomes\Sheets\InvoiceHistories;
-use App\Imports\Incomes\Sheets\InvoicePayments;
-use App\Imports\Incomes\Sheets\InvoiceTotals;
+use App\Imports\Sales\Sheets\Invoices as Base;
+use App\Imports\Sales\Sheets\InvoiceItems;
+use App\Imports\Sales\Sheets\InvoiceItemTaxes;
+use App\Imports\Sales\Sheets\InvoiceHistories;
+use App\Imports\Sales\Sheets\InvoicePayments;
+use App\Imports\Sales\Sheets\InvoiceTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Invoices implements WithMultipleSheets
diff --git a/app/Imports/Incomes/Revenues.php b/app/Imports/Sales/Revenues.php
similarity index 100%
rename from app/Imports/Incomes/Revenues.php
rename to app/Imports/Sales/Revenues.php
diff --git a/app/Imports/Incomes/Sheets/InvoiceHistories.php b/app/Imports/Sales/Sheets/InvoiceHistories.php
similarity index 87%
rename from app/Imports/Incomes/Sheets/InvoiceHistories.php
rename to app/Imports/Sales/Sheets/InvoiceHistories.php
index afe32fb57..425c4df59 100644
--- a/app/Imports/Incomes/Sheets/InvoiceHistories.php
+++ b/app/Imports/Sales/Sheets/InvoiceHistories.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceHistory as Model;
-use App\Http\Requests\Income\InvoiceHistory as Request;
+use App\Models\Sale\InvoiceHistory as Model;
+use App\Http\Requests\Sale\InvoiceHistory as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Incomes/Sheets/InvoiceItemTaxes.php b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php
similarity index 91%
rename from app/Imports/Incomes/Sheets/InvoiceItemTaxes.php
rename to app/Imports/Sales/Sheets/InvoiceItemTaxes.php
index b8d6dc555..1222ac20d 100644
--- a/app/Imports/Incomes/Sheets/InvoiceItemTaxes.php
+++ b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItemTax as Model;
+use App\Models\Sale\InvoiceItemTax as Model;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Incomes/Sheets/InvoiceItems.php b/app/Imports/Sales/Sheets/InvoiceItems.php
similarity index 88%
rename from app/Imports/Incomes/Sheets/InvoiceItems.php
rename to app/Imports/Sales/Sheets/InvoiceItems.php
index 1cf66a32c..6a7ed5b17 100644
--- a/app/Imports/Incomes/Sheets/InvoiceItems.php
+++ b/app/Imports/Sales/Sheets/InvoiceItems.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItem as Model;
-use App\Http\Requests\Income\InvoiceItem as Request;
+use App\Models\Sale\InvoiceItem as Model;
+use App\Http\Requests\Sale\InvoiceItem as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Incomes/Sheets/InvoicePayments.php b/app/Imports/Sales/Sheets/InvoicePayments.php
similarity index 97%
rename from app/Imports/Incomes/Sheets/InvoicePayments.php
rename to app/Imports/Sales/Sheets/InvoicePayments.php
index 6844769b0..63b1343a9 100644
--- a/app/Imports/Incomes/Sheets/InvoicePayments.php
+++ b/app/Imports/Sales/Sheets/InvoicePayments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;
diff --git a/app/Imports/Incomes/Sheets/InvoiceTotals.php b/app/Imports/Sales/Sheets/InvoiceTotals.php
similarity index 88%
rename from app/Imports/Incomes/Sheets/InvoiceTotals.php
rename to app/Imports/Sales/Sheets/InvoiceTotals.php
index b0348fca5..c0ac4b567 100644
--- a/app/Imports/Incomes/Sheets/InvoiceTotals.php
+++ b/app/Imports/Sales/Sheets/InvoiceTotals.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceTotal as Model;
-use App\Http\Requests\Income\InvoiceTotal as Request;
+use App\Models\Sale\InvoiceTotal as Model;
+use App\Http\Requests\Sale\InvoiceTotal as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Imports/Incomes/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php
similarity index 88%
rename from app/Imports/Incomes/Sheets/Invoices.php
rename to app/Imports/Sales/Sheets/Invoices.php
index 4c60b5424..a02689d6a 100644
--- a/app/Imports/Incomes/Sheets/Invoices.php
+++ b/app/Imports/Sales/Sheets/Invoices.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\Invoice as Model;
-use App\Http\Requests\Income\Invoice as Request;
+use App\Models\Sale\Invoice as Model;
+use App\Http\Requests\Sale\Invoice as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
diff --git a/app/Jobs/Banking/CreateDocumentTransaction.php b/app/Jobs/Banking/CreateDocumentTransaction.php
index e8eb4efe0..ac3addd0f 100644
--- a/app/Jobs/Banking/CreateDocumentTransaction.php
+++ b/app/Jobs/Banking/CreateDocumentTransaction.php
@@ -4,10 +4,10 @@ namespace App\Jobs\Banking;
 
 use App\Abstracts\Job;
 use App\Jobs\Banking\CreateTransaction;
-use App\Jobs\Expense\CreateBillHistory;
-use App\Jobs\Income\CreateInvoiceHistory;
+use App\Jobs\Purchase\CreateBillHistory;
+use App\Jobs\Sale\CreateInvoiceHistory;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use Date;
 
diff --git a/app/Jobs/Expense/CreateBill.php b/app/Jobs/Purchase/CreateBill.php
similarity index 96%
rename from app/Jobs/Expense/CreateBill.php
rename to app/Jobs/Purchase/CreateBill.php
index 5f651219b..531091095 100644
--- a/app/Jobs/Expense/CreateBill.php
+++ b/app/Jobs/Purchase/CreateBill.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Events\Expense\BillCreated;
-use App\Events\Expense\BillCreating;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillTotal;
+use App\Events\Purchase\BillCreated;
+use App\Events\Purchase\BillCreating;
+use App\Models\Purchase\Bill;
+use App\Models\Purchase\BillTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 
diff --git a/app/Jobs/Expense/CreateBillHistory.php b/app/Jobs/Purchase/CreateBillHistory.php
similarity index 93%
rename from app/Jobs/Expense/CreateBillHistory.php
rename to app/Jobs/Purchase/CreateBillHistory.php
index 364b7d070..f516b9db7 100644
--- a/app/Jobs/Expense/CreateBillHistory.php
+++ b/app/Jobs/Purchase/CreateBillHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\BillHistory;
 
 class CreateBillHistory extends Job
 {
diff --git a/app/Jobs/Expense/CreateBillItem.php b/app/Jobs/Purchase/CreateBillItem.php
similarity index 98%
rename from app/Jobs/Expense/CreateBillItem.php
rename to app/Jobs/Purchase/CreateBillItem.php
index ed7167cc1..929ac778a 100644
--- a/app/Jobs/Expense/CreateBillItem.php
+++ b/app/Jobs/Purchase/CreateBillItem.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\BillItem;
-use App\Models\Expense\BillItemTax;
+use App\Models\Purchase\BillItem;
+use App\Models\Purchase\BillItemTax;
 use App\Models\Setting\Tax;
 use Illuminate\Support\Str;
 
diff --git a/app/Jobs/Expense/DeleteBill.php b/app/Jobs/Purchase/DeleteBill.php
similarity index 90%
rename from app/Jobs/Expense/DeleteBill.php
rename to app/Jobs/Purchase/DeleteBill.php
index 4ee3dd43d..eddbb45d1 100644
--- a/app/Jobs/Expense/DeleteBill.php
+++ b/app/Jobs/Purchase/DeleteBill.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 
 class DeleteBill extends Job
 {
diff --git a/app/Jobs/Expense/DuplicateBill.php b/app/Jobs/Purchase/DuplicateBill.php
similarity index 88%
rename from app/Jobs/Expense/DuplicateBill.php
rename to app/Jobs/Purchase/DuplicateBill.php
index d46faa27a..24d4f5159 100644
--- a/app/Jobs/Expense/DuplicateBill.php
+++ b/app/Jobs/Purchase/DuplicateBill.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\Bill;
+use App\Models\Purchase\BillHistory;
 
 class DuplicateBill extends Job
 {
diff --git a/app/Jobs/Expense/UpdateBill.php b/app/Jobs/Purchase/UpdateBill.php
similarity index 97%
rename from app/Jobs/Expense/UpdateBill.php
rename to app/Jobs/Purchase/UpdateBill.php
index 64d512f8c..879252c91 100644
--- a/app/Jobs/Expense/UpdateBill.php
+++ b/app/Jobs/Purchase/UpdateBill.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Events\Expense\BillUpdated;
-use App\Events\Expense\BillUpdating;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillTotal;
+use App\Events\Purchase\BillUpdated;
+use App\Events\Purchase\BillUpdating;
+use App\Models\Purchase\Bill;
+use App\Models\Purchase\BillTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use App\Traits\Relationships;
diff --git a/app/Jobs/Income/CreateInvoice.php b/app/Jobs/Sale/CreateInvoice.php
similarity index 96%
rename from app/Jobs/Income/CreateInvoice.php
rename to app/Jobs/Sale/CreateInvoice.php
index 9a213f9c9..6ac4c4df1 100644
--- a/app/Jobs/Income/CreateInvoice.php
+++ b/app/Jobs/Sale/CreateInvoice.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Events\Income\InvoiceCreated;
-use App\Events\Income\InvoiceCreating;
-use App\Models\Income\Invoice;
-use App\Models\Income\InvoiceTotal;
+use App\Events\Sale\InvoiceCreated;
+use App\Events\Sale\InvoiceCreating;
+use App\Models\Sale\Invoice;
+use App\Models\Sale\InvoiceTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 
diff --git a/app/Jobs/Income/CreateInvoiceHistory.php b/app/Jobs/Sale/CreateInvoiceHistory.php
similarity index 94%
rename from app/Jobs/Income/CreateInvoiceHistory.php
rename to app/Jobs/Sale/CreateInvoiceHistory.php
index 8c13eeccc..613f861f5 100644
--- a/app/Jobs/Income/CreateInvoiceHistory.php
+++ b/app/Jobs/Sale/CreateInvoiceHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Models\Income\InvoiceHistory;
+use App\Models\Sale\InvoiceHistory;
 
 class CreateInvoiceHistory extends Job
 {
diff --git a/app/Jobs/Income/CreateInvoiceItem.php b/app/Jobs/Sale/CreateInvoiceItem.php
similarity index 98%
rename from app/Jobs/Income/CreateInvoiceItem.php
rename to app/Jobs/Sale/CreateInvoiceItem.php
index 455e6a9a8..5e78a0fea 100644
--- a/app/Jobs/Income/CreateInvoiceItem.php
+++ b/app/Jobs/Sale/CreateInvoiceItem.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Models\Income\InvoiceItem;
-use App\Models\Income\InvoiceItemTax;
+use App\Models\Sale\InvoiceItem;
+use App\Models\Sale\InvoiceItemTax;
 use App\Models\Setting\Tax;
 use Illuminate\Support\Str;
 
diff --git a/app/Jobs/Income/DeleteInvoice.php b/app/Jobs/Sale/DeleteInvoice.php
similarity index 90%
rename from app/Jobs/Income/DeleteInvoice.php
rename to app/Jobs/Sale/DeleteInvoice.php
index 256497114..94d7461eb 100644
--- a/app/Jobs/Income/DeleteInvoice.php
+++ b/app/Jobs/Sale/DeleteInvoice.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 
 class DeleteInvoice extends Job
 {
diff --git a/app/Jobs/Income/DuplicateInvoice.php b/app/Jobs/Sale/DuplicateInvoice.php
similarity index 83%
rename from app/Jobs/Income/DuplicateInvoice.php
rename to app/Jobs/Sale/DuplicateInvoice.php
index 3e0df54bf..cf401a11a 100644
--- a/app/Jobs/Income/DuplicateInvoice.php
+++ b/app/Jobs/Sale/DuplicateInvoice.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Events\Income\InvoiceCreated;
-use App\Models\Income\Invoice;
+use App\Events\Sale\InvoiceCreated;
+use App\Models\Sale\Invoice;
 
 class DuplicateInvoice extends Job
 {
diff --git a/app/Jobs/Income/UpdateInvoice.php b/app/Jobs/Sale/UpdateInvoice.php
similarity index 97%
rename from app/Jobs/Income/UpdateInvoice.php
rename to app/Jobs/Sale/UpdateInvoice.php
index 491df644d..900dc1d08 100644
--- a/app/Jobs/Income/UpdateInvoice.php
+++ b/app/Jobs/Sale/UpdateInvoice.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Events\Income\InvoiceUpdated;
-use App\Events\Income\InvoiceUpdating;
-use App\Models\Income\Invoice;
-use App\Models\Income\InvoiceTotal;
+use App\Events\Sale\InvoiceUpdated;
+use App\Events\Sale\InvoiceUpdating;
+use App\Models\Sale\Invoice;
+use App\Models\Sale\InvoiceTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use App\Traits\Relationships;
diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php
index c6e1a0d59..624c1fb16 100644
--- a/app/Listeners/Menu/AddAdminItems.php
+++ b/app/Listeners/Menu/AddAdminItems.php
@@ -32,7 +32,7 @@ class AddAdminItems
                 }
             }, 1, [
                 'url' => '/',
-                'title' => trans_choice('general.incomes', 2),
+                'title' => trans_choice('general.dashboards', 2),
                 'icon' => 'fa fa-tachometer-alt',
             ]);
         } else {
@@ -49,42 +49,42 @@ class AddAdminItems
             $menu->route('items.index', trans_choice('general.items', 2), [], 2, ['icon' => 'fa fa-cube']);
         }
 
-        // Incomes
-        if ($user->can(['read-incomes-invoices', 'read-incomes-revenues', 'read-incomes-customers'])) {
-            $menu->dropdown(trim(trans_choice('general.incomes', 2)), function ($sub) use ($user, $attr) {
-                if ($user->can('read-incomes-invoices')) {
+        // Sales
+        if ($user->can(['read-sales-invoices', 'read-sales-revenues', 'read-sales-customers'])) {
+            $menu->dropdown(trim(trans_choice('general.sales', 2)), function ($sub) use ($user, $attr) {
+                if ($user->can('read-sales-invoices')) {
                     $sub->route('invoices.index', trans_choice('general.invoices', 2), [], 1, $attr);
                 }
 
-                if ($user->can('read-incomes-revenues')) {
+                if ($user->can('read-sales-revenues')) {
                     $sub->route('revenues.index', trans_choice('general.revenues', 2), [], 2, $attr);
                 }
 
-                if ($user->can('read-incomes-customers')) {
+                if ($user->can('read-sales-customers')) {
                     $sub->route('customers.index', trans_choice('general.customers', 2), [], 3, $attr);
                 }
             }, 3, [
-                'title' => trans_choice('general.incomes', 2),
+                'title' => trans_choice('general.sales', 2),
                 'icon' => 'fa fa-money-bill',
             ]);
         }
 
-        // Expenses
-        if ($user->can(['read-expenses-bills', 'read-expenses-payments', 'read-expenses-vendors'])) {
-            $menu->dropdown(trim(trans_choice('general.expenses', 2)), function ($sub) use ($user, $attr) {
-                if ($user->can('read-expenses-bills')) {
+        // Purchases
+        if ($user->can(['read-purchases-bills', 'read-purchases-payments', 'read-purchases-vendors'])) {
+            $menu->dropdown(trim(trans_choice('general.purchases', 2)), function ($sub) use ($user, $attr) {
+                if ($user->can('read-purchases-bills')) {
                     $sub->route('bills.index', trans_choice('general.bills', 2), [], 1, $attr);
                 }
 
-                if ($user->can('read-expenses-payments')) {
+                if ($user->can('read-purchases-payments')) {
                     $sub->route('payments.index', trans_choice('general.payments', 2), [], 2, $attr);
                 }
 
-                if ($user->can('read-expenses-vendors')) {
+                if ($user->can('read-purchases-vendors')) {
                     $sub->route('vendors.index', trans_choice('general.vendors', 2), [], 3, $attr);
                 }
             }, 4, [
-                'title' => trans_choice('general.expenses', 2),
+                'title' => trans_choice('general.purchases', 2),
                 'icon' => 'fa fa-shopping-cart',
             ]);
         }
diff --git a/app/Listeners/Expense/CreateBillCreatedHistory.php b/app/Listeners/Purchase/CreateBillCreatedHistory.php
similarity index 76%
rename from app/Listeners/Expense/CreateBillCreatedHistory.php
rename to app/Listeners/Purchase/CreateBillCreatedHistory.php
index 6288e306f..ebf8f3a14 100644
--- a/app/Listeners/Expense/CreateBillCreatedHistory.php
+++ b/app/Listeners/Purchase/CreateBillCreatedHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Listeners\Expense;
+namespace App\Listeners\Purchase;
 
-use App\Events\Expense\BillCreated as Event;
-use App\Jobs\Expense\CreateBillHistory;
+use App\Events\Purchase\BillCreated as Event;
+use App\Jobs\Purchase\CreateBillHistory;
 use App\Traits\Jobs;
 
 class CreateBillCreatedHistory
diff --git a/app/Listeners/Expense/SendBillRecurringNotification.php b/app/Listeners/Purchase/SendBillRecurringNotification.php
similarity index 78%
rename from app/Listeners/Expense/SendBillRecurringNotification.php
rename to app/Listeners/Purchase/SendBillRecurringNotification.php
index 960285d4d..e9eb4d195 100644
--- a/app/Listeners/Expense/SendBillRecurringNotification.php
+++ b/app/Listeners/Purchase/SendBillRecurringNotification.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Listeners\Expense;
+namespace App\Listeners\Purchase;
 
-use App\Events\Expense\BillRecurring as Event;
-use App\Notifications\Expense\Bill as Notification;
+use App\Events\Purchase\BillRecurring as Event;
+use App\Notifications\Purchase\Bill as Notification;
 
 class SendBillRecurringNotification
 {
diff --git a/app/Listeners/Income/CreateInvoiceCreatedHistory.php b/app/Listeners/Sale/CreateInvoiceCreatedHistory.php
similarity index 76%
rename from app/Listeners/Income/CreateInvoiceCreatedHistory.php
rename to app/Listeners/Sale/CreateInvoiceCreatedHistory.php
index 91bdf3728..7da5912f3 100644
--- a/app/Listeners/Income/CreateInvoiceCreatedHistory.php
+++ b/app/Listeners/Sale/CreateInvoiceCreatedHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\InvoiceCreated as Event;
-use App\Jobs\Income\CreateInvoiceHistory;
+use App\Events\Sale\InvoiceCreated as Event;
+use App\Jobs\Sale\CreateInvoiceHistory;
 use App\Traits\Jobs;
 
 class CreateInvoiceCreatedHistory
diff --git a/app/Listeners/Income/CreateInvoiceTransaction.php b/app/Listeners/Sale/CreateInvoiceTransaction.php
similarity index 92%
rename from app/Listeners/Income/CreateInvoiceTransaction.php
rename to app/Listeners/Sale/CreateInvoiceTransaction.php
index e895d1b9f..06465ab58 100644
--- a/app/Listeners/Income/CreateInvoiceTransaction.php
+++ b/app/Listeners/Sale/CreateInvoiceTransaction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\PaymentReceived as Event;
+use App\Events\Sale\PaymentReceived as Event;
 use App\Jobs\Banking\CreateDocumentTransaction;
 use App\Traits\Jobs;
 
diff --git a/app/Listeners/Income/IncreaseNextInvoiceNumber.php b/app/Listeners/Sale/IncreaseNextInvoiceNumber.php
similarity index 79%
rename from app/Listeners/Income/IncreaseNextInvoiceNumber.php
rename to app/Listeners/Sale/IncreaseNextInvoiceNumber.php
index 55df368e7..53babdad5 100644
--- a/app/Listeners/Income/IncreaseNextInvoiceNumber.php
+++ b/app/Listeners/Sale/IncreaseNextInvoiceNumber.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\InvoiceCreated as Event;
+use App\Events\Sale\InvoiceCreated as Event;
 use App\Traits\Incomes;
 
 class IncreaseNextInvoiceNumber
diff --git a/app/Listeners/Income/MarkInvoiceSent.php b/app/Listeners/Sale/MarkInvoiceSent.php
similarity index 85%
rename from app/Listeners/Income/MarkInvoiceSent.php
rename to app/Listeners/Sale/MarkInvoiceSent.php
index 766773e5b..0fec48916 100644
--- a/app/Listeners/Income/MarkInvoiceSent.php
+++ b/app/Listeners/Sale/MarkInvoiceSent.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\InvoiceSent as Event;
-use App\Models\Income\InvoiceHistory;
+use App\Events\Sale\InvoiceSent as Event;
+use App\Models\Sale\InvoiceHistory;
 
 class MarkInvoiceSent
 {
diff --git a/app/Listeners/Income/MarkInvoiceViewed.php b/app/Listeners/Sale/MarkInvoiceViewed.php
similarity index 84%
rename from app/Listeners/Income/MarkInvoiceViewed.php
rename to app/Listeners/Sale/MarkInvoiceViewed.php
index 82c4db2ab..3781c23fe 100644
--- a/app/Listeners/Income/MarkInvoiceViewed.php
+++ b/app/Listeners/Sale/MarkInvoiceViewed.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\InvoiceViewed as Event;
+use App\Events\Sale\InvoiceViewed as Event;
 
 class MarkInvoiceViewed
 {
diff --git a/app/Listeners/Income/SendInvoicePaymentNotification.php b/app/Listeners/Sale/SendInvoicePaymentNotification.php
similarity index 91%
rename from app/Listeners/Income/SendInvoicePaymentNotification.php
rename to app/Listeners/Sale/SendInvoicePaymentNotification.php
index c02da9789..ef358b688 100644
--- a/app/Listeners/Income/SendInvoicePaymentNotification.php
+++ b/app/Listeners/Sale/SendInvoicePaymentNotification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\PaymentReceived as Event;
+use App\Events\Sale\PaymentReceived as Event;
 use App\Notifications\Portal\PaymentReceived as Notification;
 
 class SendInvoicePaymentNotification
diff --git a/app/Listeners/Income/SendInvoiceRecurringNotification.php b/app/Listeners/Sale/SendInvoiceRecurringNotification.php
similarity index 84%
rename from app/Listeners/Income/SendInvoiceRecurringNotification.php
rename to app/Listeners/Sale/SendInvoiceRecurringNotification.php
index d903e8ac4..d575d5068 100644
--- a/app/Listeners/Income/SendInvoiceRecurringNotification.php
+++ b/app/Listeners/Sale/SendInvoiceRecurringNotification.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Listeners\Income;
+namespace App\Listeners\Sale;
 
-use App\Events\Income\InvoiceRecurring as Event;
-use App\Notifications\Income\Invoice as Notification;
+use App\Events\Sale\InvoiceRecurring as Event;
+use App\Notifications\Sale\Invoice as Notification;
 
 class SendInvoiceRecurringNotification
 {
diff --git a/app/Listeners/Update/V10/Version106.php b/app/Listeners/Update/V10/Version106.php
deleted file mode 100644
index de29ebccf..000000000
--- a/app/Listeners/Update/V10/Version106.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V10;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use File;
-
-class Version106 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.0.6';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Moved to app directory
-        File::deleteDirectory(app_path('Http' . DIRECTORY_SEPARATOR .'Transformers'));
-    }
-}
diff --git a/app/Listeners/Update/V10/Version107.php b/app/Listeners/Update/V10/Version107.php
deleted file mode 100644
index d137620e4..000000000
--- a/app/Listeners/Update/V10/Version107.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V10;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use DB;
-
-class Version107 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.0.7';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $table = env('DB_PREFIX') . 'taxes';
-
-        DB::statement("ALTER TABLE `$table` MODIFY `rate` DOUBLE(15,4) NOT NULL");
-    }
-}
diff --git a/app/Listeners/Update/V10/Version108.php b/app/Listeners/Update/V10/Version108.php
deleted file mode 100644
index 97ad74f60..000000000
--- a/app/Listeners/Update/V10/Version108.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V10;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Common\Company;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillStatus;
-
-class Version108 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.0.8';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $this->updateSettings();
-        $this->updateBills();
-    }
-
-    private function updateSettings()
-    {
-        // Set new invoice settings
-        setting(['general.invoice_number_prefix' => setting('invoice.prefix', 'INV-')]);
-        setting(['general.invoice_number_digit' => setting('invoice.digit', '5')]);
-        setting(['general.invoice_number_next' => setting('invoice.start', '1')]);
-
-        setting()->forget('general.invoice_prefix');
-        setting()->forget('general.invoice_digit');
-        setting()->forget('general.invoice_start');
-
-        setting()->save();
-    }
-
-    private function updateBills()
-    {
-        // Create new bill statuses
-        $companies = Company::all();
-
-        foreach ($companies as $company) {
-            $rows = [
-                [
-                    'company_id' => $company->id,
-                    'name' => trans('bills.status.draft'),
-                    'code' => 'draft',
-                ],
-                [
-                    'company_id' => $company->id,
-                    'name' => trans('bills.status.received'),
-                    'code' => 'received',
-                ],
-            ];
-
-            foreach ($rows as $row) {
-                BillStatus::create($row);
-            }
-        }
-
-        $bills = Bill::all();
-
-        foreach ($bills as $bill) {
-            if (($bill->bill_status_code != 'new') || ($bill->bill_status_code != 'updated')) {
-                continue;
-            }
-
-            $bill->bill_status_code = 'draft';
-            $bill->save();
-        }
-
-        $new = BillStatus::where('code', 'new');
-        $new->delete();
-        $new->forceDelete();
-
-        $updated = BillStatus::where('code', 'updated');
-        $updated->delete();
-        $updated->forceDelete();
-    }
-}
diff --git a/app/Listeners/Update/V10/Version109.php b/app/Listeners/Update/V10/Version109.php
deleted file mode 100644
index e1f66eb54..000000000
--- a/app/Listeners/Update/V10/Version109.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V10;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Common\Company;
-use Artisan;
-
-class Version109 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.0.9';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Create new bill statuses
-        $companies = Company::all();
-
-        foreach ($companies as $company) {
-            Artisan::call('module:install', ['alias' => 'offlinepayment', 'company_id' => $company->id]);
-            Artisan::call('module:install', ['alias' => 'paypalstandard', 'company_id' => $company->id]);
-        }
-    }
-}
diff --git a/app/Listeners/Update/V11/Version110.php b/app/Listeners/Update/V11/Version110.php
deleted file mode 100644
index becbfe745..000000000
--- a/app/Listeners/Update/V11/Version110.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V11;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-
-class Version110 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.1.0';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Create permission
-        $permission = Permission::firstOrCreate([
-            'name' => 'create-common-import',
-            'display_name' => 'Create Common Import',
-            'description' => 'Create Common Import',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            $role->attachPermission($permission);
-        }
-    }
-}
diff --git a/app/Listeners/Update/V11/Version112.php b/app/Listeners/Update/V11/Version112.php
deleted file mode 100644
index b1c416d20..000000000
--- a/app/Listeners/Update/V11/Version112.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V11;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Common\Company;
-use App\Utilities\Installer;
-
-class Version112 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.1.2';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $locale = 'en-GB';
-
-        // Get default locale if only 1 company
-        if (Company::all()->count() == 1) {
-            $locale = setting('default.locale', 'en-GB');
-        }
-
-        // Set default locale
-        Installer::updateEnv(['APP_LOCALE' => $locale]);
-    }
-}
diff --git a/app/Listeners/Update/V11/Version113.php b/app/Listeners/Update/V11/Version113.php
deleted file mode 100644
index 9f1c254dd..000000000
--- a/app/Listeners/Update/V11/Version113.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V11;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Setting\Currency;
-use Artisan;
-
-class Version113 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.1.3';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-
-        // Update currencies
-        $currencies = Currency::all();
-
-        foreach ($currencies as $currency) {
-            $currency->precision = config('money.' . $currency->code . '.precision');
-            $currency->symbol = config('money.' . $currency->code . '.symbol');
-            $currency->symbol_first = config('money.' . $currency->code . '.symbol_first') ? 1 : 0;
-            $currency->decimal_mark = config('money.' . $currency->code . '.decimal_mark');
-            $currency->thousands_separator = config('money.' . $currency->code . '.thousands_separator');
-
-            $currency->save();
-        }
-    }
-}
diff --git a/app/Listeners/Update/V11/Version119.php b/app/Listeners/Update/V11/Version119.php
deleted file mode 100644
index a289ccf06..000000000
--- a/app/Listeners/Update/V11/Version119.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V11;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-use Illuminate\Support\Facades\Schema;
-use MediaUploader;
-use Storage;
-use Artisan;
-
-class Version119 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.1.9';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        if (Schema::hasTable('mediables')) {
-            return;
-        }
-
-        if (Schema::hasTable('media')) {
-            Schema::drop('media');
-        }
-
-        // Create permission
-        if (!Permission::where('name', 'delete-common-uploads')->first()) {
-            $permission = Permission::firstOrCreate([
-                'name' => 'delete-common-uploads',
-                'display_name' => 'Delete Common Uploads',
-                'description' => 'Delete Common Uploads',
-            ]);
-
-            // Attach permission to roles
-            $roles = Role::all();
-
-            $allowed = ['admin'];
-
-            foreach ($roles as $role) {
-                if (!in_array($role->name, $allowed)) {
-                    continue;
-                }
-
-                $role->attachPermission($permission);
-            }
-        }
-
-        $data = [];
-
-        $migrations = [
-            '\App\Models\Auth\User'             => 'picture',
-            '\App\Models\Common\Item'           => 'picture',
-            '\App\Models\Expense\Bill'          => 'attachment',
-            '\App\Models\Expense\Payment'       => 'attachment',
-            '\App\Models\Income\Invoice'        => 'attachment',
-            '\App\Models\Income\Revenue'        => 'attachment',
-        ];
-
-        foreach ($migrations as $model => $name) {
-            if ($model != '\App\Models\Auth\User') {
-                $items = $model::where('company_id', '<>', '0')->get();
-            } else {
-                $items = $model::all();
-            }
-
-            $data[basename($model)] = $items;
-        }
-
-        // Clear cache after update
-        Artisan::call('cache:clear');
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-
-        foreach ($migrations as $model => $name) {
-            $items = $data[basename($model)];
-
-            foreach ($items as $item) {
-                if (!$item->$name) {
-                    continue;
-                }
-
-                $path = explode('uploads/', $item->$name);
-
-                $path = end($path);
-
-                if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
-                    $path = $item->company_id . '/' . $path;
-                }
-
-                if (!empty($path) && Storage::exists($path)) {
-                    $media = \App\Models\Common\Media::where('filename', '=', pathinfo(basename($path), PATHINFO_FILENAME))->first();
-
-                    if ($media) {
-                        $item->attachMedia($media, $name);
-
-                        continue;
-                    }
-
-                    $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
-
-                    $item->attachMedia($media, $name);
-                }
-            }
-        }
-
-        $settings['company_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.company_logo')->where('company_id', '<>', '0')->get();
-        $settings['invoice_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.invoice_logo')->where('company_id', '<>', '0')->get();
-
-        foreach ($settings as $name => $items) {
-            foreach ($items as $item) {
-                if (!$item->value) {
-                    continue;
-                }
-
-                $path = explode('uploads/', $item->value);
-
-                $path = end($path);
-
-                if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
-                    $path = $item->company_id . '/' . $path;
-                }
-
-                if (!empty($path) && Storage::exists($path)) {
-                    $company = \App\Models\Common\Company::find($item->company_id);
-
-                    $media = \App\Models\Common\Media::where('filename', '=', pathinfo(basename($path), PATHINFO_FILENAME))->first();
-
-                    if ($company && !$media) {
-                        $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
-
-                        $company->attachMedia($media, $name);
-
-                        $item->update(['value' => $media->id]);
-                    } elseif ($media) {
-                        $item->update(['value' => $media->id]);
-                    } else {
-                        $item->update(['value' => '']);
-                    }
-                } else {
-                    $item->update(['value' => '']);
-                }
-            }
-        }
-    }
-}
diff --git a/app/Listeners/Update/V12/Version120.php b/app/Listeners/Update/V12/Version120.php
deleted file mode 100644
index a03b2c478..000000000
--- a/app/Listeners/Update/V12/Version120.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-use App\Models\Common\Company;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
-use App\Models\Setting\Category;
-use DB;
-use Schema;
-use Artisan;
-
-class Version120 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.0';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $this->updatePermissions();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-
-        $this->updateInvoicesAndBills();
-
-        $this->changeQuantityColumn();
-    }
-
-    protected function updatePermissions()
-    {
-        $permissions = [];
-
-        // Create tax summary permission
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-reports-tax-summary',
-            'display_name' => 'Read Reports Tax Summary',
-            'description' => 'Read Reports Tax Summary',
-        ]);
-
-        // Create profit loss permission
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-reports-profit-loss',
-            'display_name' => 'Read Reports Profit Loss',
-            'description' => 'Read Reports Profit Loss',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            foreach ($permissions as $permission) {
-                $role->attachPermission($permission);
-            }
-        }
-    }
-
-    protected function updateInvoicesAndBills()
-    {
-        $companies = Company::all();
-
-        foreach ($companies as $company) {
-            // Invoices
-            $invoice_category = Category::create([
-                'company_id' => $company->id,
-                'name' => trans_choice('general.invoices', 2),
-                'type' => 'income',
-                'color' => '#00c0ef',
-                'enabled' => '1'
-            ]);
-
-            foreach ($company->invoices as $invoice) {
-                $invoice->category_id = $invoice_category->id;
-                $invoice->save();
-            }
-
-            // Bills
-            $bill_category = Category::create([
-                'company_id' => $company->id,
-                'name' => trans_choice('general.bills', 2),
-                'type' => 'expense',
-                'color' => '#dd4b39',
-                'enabled' => '1'
-            ]);
-
-            foreach ($company->bills as $bill) {
-                $bill->category_id = $bill_category->id;
-                $bill->save();
-            }
-        }
-    }
-
-    protected function changeQuantityColumn()
-    {
-        $connection = env('DB_CONNECTION');
-
-        if ($connection == 'mysql') {
-            $tables = [
-                env('DB_PREFIX') . 'invoice_items',
-                env('DB_PREFIX') . 'bill_items'
-            ];
-
-            foreach ($tables as $table) {
-                DB::statement("ALTER TABLE `$table` MODIFY `quantity` DOUBLE(7,2) NOT NULL");
-            }
-        } else {
-            Schema::table('invoice_items', function ($table) {
-                $table->decimal('quantity', 7, 2)->change();
-            });
-
-            Schema::table('bill_items', function ($table) {
-                $table->decimal('quantity', 7, 2)->change();
-            });
-        }
-    }
-}
diff --git a/app/Listeners/Update/V12/Version1210.php b/app/Listeners/Update/V12/Version1210.php
deleted file mode 100644
index a36d6d03c..000000000
--- a/app/Listeners/Update/V12/Version1210.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use Artisan;
-
-class Version1210 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.10';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-}
diff --git a/app/Listeners/Update/V12/Version1211.php b/app/Listeners/Update/V12/Version1211.php
deleted file mode 100644
index 0afb3a7ff..000000000
--- a/app/Listeners/Update/V12/Version1211.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use Artisan;
-
-class Version1211 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.11';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-}
diff --git a/app/Listeners/Update/V12/Version126.php b/app/Listeners/Update/V12/Version126.php
deleted file mode 100644
index 3f96470ac..000000000
--- a/app/Listeners/Update/V12/Version126.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-
-class Version126 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.6';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $permissions = [];
-
-        // Create permission
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-modules-my',
-            'display_name' => 'Read Modules My',
-            'description' => 'Read Modules My',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            foreach ($permissions as $permission) {
-                $role->attachPermission($permission);
-            }
-        }
-    }
-}
diff --git a/app/Listeners/Update/V12/Version127.php b/app/Listeners/Update/V12/Version127.php
deleted file mode 100644
index f96ea31f7..000000000
--- a/app/Listeners/Update/V12/Version127.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Permission;
-use File;
-use Illuminate\Support\Str;
-
-class Version127 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.7';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Update permissions
-        $permissions = Permission::all();
-        foreach ($permissions as $permission) {
-            if (strstr($permission->name, '-companies-companies')) {
-                $permission->name = str_replace('-companies-companies', '-common-companies', $permission->name);
-                $permission->save();
-            }
-
-            if (strstr($permission->name, '-items-items')) {
-                $permission->name = str_replace('-items-items', '-common-items', $permission->name);
-                $permission->save();
-            }
-        }
-
-        // Delete folders
-        $dirs = ['dashboard', 'search', 'companies', 'items'];
-        foreach ($dirs as $dir) {
-            File::deleteDirectory(app_path('Filters/' . ucfirst($dir)));
-            File::deleteDirectory(app_path('Http/Controllers/' . ucfirst($dir)));
-            File::deleteDirectory(app_path('Http/Requests/' . ucfirst(Str::singular($dir))));
-            File::deleteDirectory(resource_path('views/' . $dir));
-        }
-    }
-}
diff --git a/app/Listeners/Update/V12/Version129.php b/app/Listeners/Update/V12/Version129.php
deleted file mode 100644
index 042f2dc9f..000000000
--- a/app/Listeners/Update/V12/Version129.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V12;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use Artisan;
-
-class Version129 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.2.9';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-}
diff --git a/app/Listeners/Update/V13/Version130.php b/app/Listeners/Update/V13/Version130.php
deleted file mode 100644
index ca43cd8bd..000000000
--- a/app/Listeners/Update/V13/Version130.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-use Artisan;
-
-class Version130 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.0';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Set new Item Reminder settings
-        setting()->setExtraColumns(['company_id' => session('company_id')]);
-        setting(['general.send_item_reminder' => '0']);
-        setting(['general.schedule_item_stocks' => '3,5,7']);
-        setting(['general.wizard' => '1']);
-        setting(['general.invoice_item' => 'settings.invoice.item']);
-        setting(['general.invoice_price' => 'settings.invoice.price']);
-        setting(['general.invoice_quantity' => 'settings.invoice.quantity']);
-        setting()->save();
-
-        $this->updatePermissions();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-
-    protected function updatePermissions()
-    {
-        $permissions = [];
-
-        // Banking Reconciliations
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-banking-reconciliations',
-            'display_name' => 'Read Banking Reconciliations',
-            'description' => 'Read Banking Reconciliations',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-banking-reconciliations',
-            'display_name' => 'Create Banking Reconciliations',
-            'description' => 'Create Banking Reconciliations',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-banking-reconciliations',
-            'display_name' => 'Update Banking Reconciliations',
-            'description' => 'Update Banking Reconciliations',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'delete-banking-reconciliations',
-            'display_name' => 'Delete Banking Reconciliations',
-            'description' => 'Delete Banking Reconciliations',
-        ]);
-
-        // Create Wizard Permissions
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-wizard-companies',
-            'display_name' => 'Create Wizard Compaines',
-            'description' => 'Create Wizard Compaines',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-wizard-currencies',
-            'display_name' => 'Create Wizard Currencies',
-            'description' => 'Create Wizard Currencies',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-wizard-taxes',
-            'display_name' => 'Create Wizard Taxes',
-            'description' => 'Create Wizard Taxes',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-wizard-finish',
-            'display_name' => 'Create Wizard Finish',
-            'description' => 'Create Wizard Finish',
-        ]);
-
-        // Read Wizard Permissions
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-wizard-companies',
-            'display_name' => 'Read Wizard Compaines',
-            'description' => 'Read Wizard Compaines',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-wizard-currencies',
-            'display_name' => 'Read Wizard Currencies',
-            'description' => 'Read Wizard Currencies',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-wizard-taxes',
-            'display_name' => 'Read Wizard Taxes',
-            'description' => 'Read Wizard Taxes',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-wizard-finish',
-            'display_name' => 'Read Wizard Finish',
-            'description' => 'Read Wizard Finish',
-        ]);
-
-        // Update Wizard Permissions
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-wizard-companies',
-            'display_name' => 'Update Wizard Compaines',
-            'description' => 'Update Wizard Compaines',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-wizard-currencies',
-            'display_name' => 'Update Wizard Currencies',
-            'description' => 'Update Wizard Currencies',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-wizard-taxes',
-            'display_name' => 'Update Wizard Taxes',
-            'description' => 'Update Wizard Taxes',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-wizard-finish',
-            'display_name' => 'Update Wizard Finish',
-            'description' => 'Update Wizard Finish',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            foreach ($permissions as $permission) {
-                $role->attachPermission($permission);
-            }
-        }
-    }
-}
diff --git a/app/Listeners/Update/V13/Version1311.php b/app/Listeners/Update/V13/Version1311.php
deleted file mode 100644
index dd92b7ed4..000000000
--- a/app/Listeners/Update/V13/Version1311.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-use Artisan;
-
-class Version1311 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.11';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $this->updatePermissions();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-
-    protected function updatePermissions()
-    {
-        $permissions = [];
-
-        // Common Uploads
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-common-uploads',
-            'display_name' => 'Read Common Uploads',
-            'description' => 'Read Common Uploads',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            foreach ($permissions as $permission) {
-                $role->attachPermission($permission);
-            }
-        }
-    }
-}
diff --git a/app/Listeners/Update/V13/Version1313.php b/app/Listeners/Update/V13/Version1313.php
deleted file mode 100644
index 33d281685..000000000
--- a/app/Listeners/Update/V13/Version1313.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Common\Company;
-use App\Utilities\Installer;
-use Artisan;
-
-class Version1313 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.13';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $schedule_time = '09:00';
-
-        // Get default locale if only 1 company
-        if (Company::all()->count() == 1) {
-            $schedule_time = setting('general.schedule_time', '09:00');
-        }
-
-        // Set default locale
-        Installer::updateEnv(['APP_SCHEDULE_TIME' => '"' . $schedule_time . '"']);
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-}
diff --git a/app/Listeners/Update/V13/Version1316.php b/app/Listeners/Update/V13/Version1316.php
deleted file mode 100644
index f36059eee..000000000
--- a/app/Listeners/Update/V13/Version1316.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Common\Company;
-use App\Utilities\Overrider;
-use App\Models\Banking\Account;
-use Artisan;
-use Date;
-
-class Version1316 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.16';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Cache Clear
-        Artisan::call('cache:clear');
-
-        $this->setSettings();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-
-    protected function setSettings()
-    {
-        $company_id = session('company_id');
-
-        // Create new bill statuses
-        $companies = Company::all();
-
-        foreach ($companies as $company) {
-            // Set settings
-            setting()->forgetAll();
-
-            session(['company_id' => $company->id]);
-
-            Overrider::load('settings');
-
-            $settings = [
-                'general.financial_start'           => Date::now()->startOfYear()->format('d-m'),
-                'general.timezone'                  => 'Europe/London',
-                'general.date_format'               => 'd M Y',
-                'general.date_separator'            => 'space',
-                'general.percent_position'          => 'after',
-                'general.invoice_number_prefix'     => 'INV-',
-                'general.invoice_number_digit'      => '5',
-                'general.invoice_number_next'       => '1',
-                'general.default_payment_method'    => 'offlinepayment.cash.1',
-                'general.email_protocol'            => 'mail',
-                'general.email_sendmail_path'       => '/usr/sbin/sendmail -bs',
-                'general.send_invoice_reminder'     => '0',
-                'general.schedule_invoice_days'     => '1,3,5,10',
-                'general.send_bill_reminder'        => '0',
-                'general.schedule_bill_days'        => '10,5,3,1',
-                'general.send_item_reminder'        => '0',
-                'general.schedule_item_stocks'      => '3,5,7',
-                'general.schedule_time'             => '09:00',
-                'general.admin_theme'               => 'skin-green-light',
-                'general.list_limit'                => '25',
-                'general.use_gravatar'              => '0',
-                'general.session_handler'           => 'file',
-                'general.session_lifetime'          => '30',
-                'general.file_size'                 => '2',
-                'general.file_types'                => 'pdf,jpeg,jpg,png',
-                'general.wizard'                    => '0',
-                'general.invoice_item'              => 'settings.invoice.item',
-                'general.invoice_price'             => 'settings.invoice.price',
-                'general.invoice_quantity'          => 'settings.invoice.quantity',
-                'offlinepayment.methods'            => '[{"code":"offlinepayment.cash.1","name":"Cash","order":"1","description":null},{"code":"offlinepayment.bank_transfer.2","name":"Bank Transfer","order":"2","description":null}]',
-            ];
-
-            foreach ($settings as $key => $value) {
-                if (!empty(setting($key))) {
-                    continue;
-                }
-
-                setting([$key => $value]);
-            }
-
-            if (empty(setting('general.default_account'))) {
-                $account = Account::where('company_id', $company->id)->first();
-
-                if ($account) {
-                    setting()->set('general.default_account', $account->id);
-                }
-            }
-
-            setting()->save();
-        }
-
-        setting()->forgetAll();
-
-        session(['company_id' => $company_id]);
-
-        Overrider::load('settings');
-    }
-}
diff --git a/app/Listeners/Update/V13/Version132.php b/app/Listeners/Update/V13/Version132.php
deleted file mode 100644
index 0dba6cd8c..000000000
--- a/app/Listeners/Update/V13/Version132.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Auth\Role;
-use App\Models\Auth\Permission;
-use Artisan;
-
-class Version132 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.2';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $this->updatePermissions();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-
-    protected function updatePermissions()
-    {
-        $permissions = [];
-
-        // Banking Reconciliations
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'read-common-notifications',
-            'display_name' => 'Read Common Notifications',
-            'description' => 'Read Common Notifications',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'create-common-notifications',
-            'display_name' => 'Create Common Notifications',
-            'description' => 'Create Common Notifications',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'update-common-notifications',
-            'display_name' => 'Update Common Notifications',
-            'description' => 'Update Common Notifications',
-        ]);
-
-        $permissions[] = Permission::firstOrCreate([
-            'name' => 'delete-common-notifications',
-            'display_name' => 'Delete Common Notifications',
-            'description' => 'Delete Common Notifications',
-        ]);
-
-        // Attach permission to roles
-        $roles = Role::all();
-
-        foreach ($roles as $role) {
-            $allowed = ['admin', 'manager'];
-
-            if (!in_array($role->name, $allowed)) {
-                continue;
-            }
-
-            foreach ($permissions as $permission) {
-                $role->attachPermission($permission);
-            }
-        }
-    }
-}
diff --git a/app/Listeners/Update/V13/Version135.php b/app/Listeners/Update/V13/Version135.php
deleted file mode 100644
index fc41af850..000000000
--- a/app/Listeners/Update/V13/Version135.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use Date;
-
-class Version135 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.5';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Add financial year start to settings
-        setting()->setExtraColumns(['company_id' => session('company_id')]);
-        setting(['general.financial_start' => Date::now()->startOfYear()->format('d F')]);
-        setting()->save();
-    }
-}
diff --git a/app/Listeners/Update/V13/Version138.php b/app/Listeners/Update/V13/Version138.php
deleted file mode 100644
index e2ec0ee58..000000000
--- a/app/Listeners/Update/V13/Version138.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use Date;
-
-class Version138 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.8';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        // Re-format financial start
-        $current_setting = setting('localisation.financial_start', Date::now()->startOfYear()->format('d F'));
-
-        setting()->setExtraColumns(['company_id' => session('company_id')]);
-        setting(['general.financial_start' => Date::parse($current_setting)->format('d-m')]);
-        setting()->save();
-    }
-}
diff --git a/app/Listeners/Update/V13/Version139.php b/app/Listeners/Update/V13/Version139.php
deleted file mode 100644
index 60fb1e75b..000000000
--- a/app/Listeners/Update/V13/Version139.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Listeners\Update\V13;
-
-use App\Abstracts\Listeners\Update as Listener;
-use App\Events\Install\UpdateFinished as Event;
-use App\Models\Income\InvoiceItem;
-use App\Models\Income\InvoiceItemTax;
-use App\Models\Setting\Tax;
-use Artisan;
-
-class Version139 extends Listener
-{
-    const ALIAS = 'core';
-
-    const VERSION = '1.3.9';
-
-    /**
-     * Handle the event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handle(Event $event)
-    {
-        // Check if should listen
-        if (!$this->check($event)) {
-            return;
-        }
-
-        $this->copyOldInvoiceItemTaxes();
-
-        // Update database
-        Artisan::call('migrate', ['--force' => true]);
-    }
-
-    protected function copyOldInvoiceItemTaxes()
-    {
-        $company_id = session('company_id');
-
-        $invoice_items = InvoiceItem::where('company_id', '<>', '0')->where('tax_id', '<>', '0')->get();
-
-        foreach ($invoice_items as $invoice_item) {
-            session(['company_id' => $invoice_item->company_id]);
-
-            $tax = Tax::where('id', $invoice_item->tax_id)->first();
-
-            if (empty($tax)) {
-                continue;
-            }
-
-            InvoiceItemTax::create([
-                'company_id' => $invoice_item->company_id,
-                'invoice_id' => $invoice_item->invoice_id,
-                'invoice_item_id' => $invoice_item->id,
-                'tax_id' => $invoice_item->tax_id,
-                'name' => $tax->name,
-                'amount' => $invoice_item->tax,
-            ]);
-        }
-
-        session(['company_id' => $company_id]);
-    }
-}
diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php
index 80d041ba6..3e55ee220 100644
--- a/app/Listeners/Update/V20/Version200.php
+++ b/app/Listeners/Update/V20/Version200.php
@@ -48,6 +48,10 @@ class Version200 extends Listener
 
         $this->copyTransactions();
 
+        $this->updateInvoices();
+
+        $this->updateBills();
+
         $this->copyContacts();
 
         $this->updateModules();
@@ -527,6 +531,58 @@ class Version200 extends Listener
         DB::table('payments')->delete();
     }
 
+    public function updateInvoices()
+    {
+        DB::table('recurring')
+            ->where('recurable_type', 'App\Models\Income\Invoice')
+            ->update([
+                'recurable_type' => 'App\Models\Sale\Invoice',
+            ]);
+
+        DB::table('mediables')
+            ->where('mediable_type', 'App\Models\Income\Invoice')
+            ->update([
+                'mediable_type' => 'App\Models\Sale\Invoice',
+            ]);
+
+        if (Schema::hasTable('double_entry_ledger')) {
+            DB::table('double_entry_ledger')
+                ->where('ledgerable_type', 'App\Models\Income\Invoice')
+                ->update([
+                    'ledgerable_type' => 'App\Models\Sale\Invoice',
+                ]);
+        }
+    }
+
+    public function updateBills()
+    {
+        DB::table('recurring')
+            ->where('recurable_type', 'App\Models\Expense\Bill')
+            ->update([
+                'recurable_type' => 'App\Models\Purchase\Bill',
+            ]);
+
+        DB::table('mediables')
+            ->where('mediable_type', 'App\Models\Expense\Bill')
+            ->update([
+                'mediable_type' => 'App\Models\Purchase\Bill',
+            ]);
+
+        DB::table('mediables')
+            ->where('mediable_type', 'App\Models\Expense\Vendor')
+            ->update([
+                'mediable_type' => 'App\Models\Purchase\Vendor',
+            ]);
+
+        if (Schema::hasTable('double_entry_ledger')) {
+            DB::table('double_entry_ledger')
+                ->where('ledgerable_type', 'App\Models\Expense\Bill')
+                ->update([
+                    'ledgerable_type' => 'App\Models\Purchase\Bill',
+                ]);
+        }
+    }
+
     public function copyContacts()
     {
         $this->copyCustomers();
@@ -688,6 +744,15 @@ class Version200 extends Listener
                 'update-customers-profile',
             ],
         ]);
+
+        $this->updatePermissionNames([
+            'expenses-bills' => 'purchases-bills',
+            'expenses-payments' => 'purchases-payments',
+            'expenses-vendors' => 'purchases-vendors',
+            'incomes-customers' => 'sales-customers',
+            'incomes-invoices' => 'sales-invoices',
+            'incomes-revenues' => 'sales-revenues',
+        ]);
     }
 
     public function attachPermissions($items)
@@ -745,6 +810,29 @@ class Version200 extends Listener
         }
     }
 
+    public function updatePermissionNames($items)
+    {
+        $prefixes = [
+            'create',
+            'read',
+            'update',
+            'delete',
+        ];
+
+        foreach ($items as $old => $new) {
+            foreach ($prefixes as $prefix) {
+                $old_name = $prefix . '-' . $old;
+                $new_name = $prefix . '-' . $new;
+
+                DB::table('permissions')
+                    ->where('name', $old_name)
+                    ->update([
+                        'name' => $new_name,
+                    ]);
+            }
+        }
+    }
+
     public function deleteOldFiles()
     {
         $files = [
@@ -859,8 +947,8 @@ class Version200 extends Listener
             'resources/assets/js/components/Example.vue',
             'resources/assets/sass/_variables.scss',
             'resources/assets/sass/app.scss',
-            'resources/views/expenses/bills/bill.blade.php',
-            'resources/views/incomes/invoices/invoice.blade.php',
+            'resources/views/purchases/bills/bill.blade.php',
+            'resources/views/sales/invoices/invoice.blade.php',
             'resources/views/layouts/customer.blade.php',
             'resources/views/layouts/link.blade.php',
             'resources/views/modules/token/create.blade.php',
@@ -885,12 +973,26 @@ class Version200 extends Listener
 
         $directories = [
             'app/Filters',
+            'app/Http/Controllers/Api/Expenses',
+            'app/Http/Controllers/Api/Incomes',
+            'app/Http/Controllers/Expenses',
+            'app/Http/Controllers/Incomes',
             'app/Http/Controllers/Customers',
             'app/Http/Controllers/Reports',
             'app/Http/Requests/Customer',
+            'app/Http/Requests/Expense',
+            'app/Http/Requests/Income',
+            'app/Jobs/Expense',
+            'app/Jobs/Income',
             'app/Listeners/Incomes',
             'app/Listeners/Updates',
+            'app/Models/Expense',
+            'app/Models/Income',
+            'app/Notifications/Expense',
+            'app/Notifications/Income',
             'app/Overrides',
+            'app/Transformers/Expense',
+            'app/Transformers/Income',
             'modules/OfflinePayment',
             'public/js/chartjs',
             'public/js/daterangepicker',
@@ -898,10 +1000,14 @@ class Version200 extends Listener
             'public/js/lightbox',
             'public/js/moment',
             'resources/views/customers',
+            'resources/views/expenses',
+            'resources/views/incomes',
             'resources/views/partials/customer',
             'resources/views/reports/expense_summary',
             'resources/views/reports/income_expense_summary',
             'resources/views/reports/income_summary',
+            'tests/Feature/Expenses',
+            'tests/Feature/Incomes',
             'tests/Feature/Reports',
         ];
 
diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
index b95beb0b0..d89c0d962 100644
--- a/app/Models/Banking/Transaction.php
+++ b/app/Models/Banking/Transaction.php
@@ -47,7 +47,7 @@ class Transaction extends Model
 
     public function bill()
     {
-        return $this->belongsTo('App\Models\Expense\Bill', 'document_id');
+        return $this->belongsTo('App\Models\Purchase\Bill', 'document_id');
     }
 
     public function category()
@@ -67,7 +67,7 @@ class Transaction extends Model
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Income\Invoice', 'document_id');
+        return $this->belongsTo('App\Models\Sale\Invoice', 'document_id');
     }
 
     public function recurring()
diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php
index 68794c646..93108cbc1 100644
--- a/app/Models/Common/Company.php
+++ b/app/Models/Common/Company.php
@@ -45,32 +45,32 @@ class Company extends Eloquent
 
     public function bills()
     {
-        return $this->hasMany('App\Models\Expense\Bill');
+        return $this->hasMany('App\Models\Purchase\Bill');
     }
 
     public function bill_histories()
     {
-        return $this->hasMany('App\Models\Expense\BillHistory');
+        return $this->hasMany('App\Models\Purchase\BillHistory');
     }
 
     public function bill_items()
     {
-        return $this->hasMany('App\Models\Expense\BillItem');
+        return $this->hasMany('App\Models\Purchase\BillItem');
     }
 
     public function bill_item_taxes()
     {
-        return $this->hasMany('App\Models\Expense\BillItemTax');
+        return $this->hasMany('App\Models\Purchase\BillItemTax');
     }
 
     public function bill_statuses()
     {
-        return $this->hasMany('App\Models\Expense\BillStatus');
+        return $this->hasMany('App\Models\Purchase\BillStatus');
     }
 
     public function bill_totals()
     {
-        return $this->hasMany('App\Models\Expense\BillTotal');
+        return $this->hasMany('App\Models\Purchase\BillTotal');
     }
 
     public function categories()
@@ -115,32 +115,32 @@ class Company extends Eloquent
 
     public function invoices()
     {
-        return $this->hasMany('App\Models\Income\Invoice');
+        return $this->hasMany('App\Models\Sale\Invoice');
     }
 
     public function invoice_histories()
     {
-        return $this->hasMany('App\Models\Income\InvoiceHistory');
+        return $this->hasMany('App\Models\Sale\InvoiceHistory');
     }
 
     public function invoice_items()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItem');
+        return $this->hasMany('App\Models\Sale\InvoiceItem');
     }
 
     public function invoice_item_taxes()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItemTax');
+        return $this->hasMany('App\Models\Sale\InvoiceItemTax');
     }
 
     public function invoice_statuses()
     {
-        return $this->hasMany('App\Models\Income\InvoiceStatus');
+        return $this->hasMany('App\Models\Sale\InvoiceStatus');
     }
 
     public function invoice_totals()
     {
-        return $this->hasMany('App\Models\Income\InvoiceTotal');
+        return $this->hasMany('App\Models\Sale\InvoiceTotal');
     }
 
     public function items()
diff --git a/app/Models/Common/Contact.php b/app/Models/Common/Contact.php
index 15f8025a4..d54b54c71 100644
--- a/app/Models/Common/Contact.php
+++ b/app/Models/Common/Contact.php
@@ -30,7 +30,7 @@ class Contact extends Model
 
     public function bills()
     {
-        return $this->hasMany('App\Models\Expense\Bill');
+        return $this->hasMany('App\Models\Purchase\Bill');
     }
 
     public function currency()
@@ -50,7 +50,7 @@ class Contact extends Model
 
     public function invoices()
     {
-        return $this->hasMany('App\Models\Income\Invoice');
+        return $this->hasMany('App\Models\Sale\Invoice');
     }
 
     public function transactions()
diff --git a/app/Models/Common/Item.php b/app/Models/Common/Item.php
index 1b39ad18a..7e824a545 100644
--- a/app/Models/Common/Item.php
+++ b/app/Models/Common/Item.php
@@ -46,12 +46,12 @@ class Item extends Model
 
     public function bill_items()
     {
-        return $this->hasMany('App\Models\Expense\BillItem');
+        return $this->hasMany('App\Models\Purchase\BillItem');
     }
 
     public function invoice_items()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItem');
+        return $this->hasMany('App\Models\Sale\InvoiceItem');
     }
 
     /**
diff --git a/app/Models/Expense/Bill.php b/app/Models/Purchase/Bill.php
similarity index 94%
rename from app/Models/Expense/Bill.php
rename to app/Models/Purchase/Bill.php
index 0cc520ce1..e925d679c 100644
--- a/app/Models/Expense/Bill.php
+++ b/app/Models/Purchase/Bill.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 use App\Models\Banking\Transaction;
@@ -65,17 +65,17 @@ class Bill extends Model
 
     public function histories()
     {
-        return $this->hasMany('App\Models\Expense\BillHistory');
+        return $this->hasMany('App\Models\Purchase\BillHistory');
     }
 
     public function items()
     {
-        return $this->hasMany('App\Models\Expense\BillItem');
+        return $this->hasMany('App\Models\Purchase\BillItem');
     }
 
     public function item_taxes()
     {
-        return $this->hasMany('App\Models\Expense\BillItemTax');
+        return $this->hasMany('App\Models\Purchase\BillItemTax');
     }
 
     public function recurring()
@@ -85,12 +85,12 @@ class Bill extends Model
 
     public function status()
     {
-        return $this->belongsTo('App\Models\Expense\BillStatus', 'bill_status_code', 'code');
+        return $this->belongsTo('App\Models\Purchase\BillStatus', 'bill_status_code', 'code');
     }
 
     public function totals()
     {
-        return $this->hasMany('App\Models\Expense\BillTotal');
+        return $this->hasMany('App\Models\Purchase\BillTotal');
     }
 
     public function transactions()
diff --git a/app/Models/Expense/BillHistory.php b/app/Models/Purchase/BillHistory.php
similarity index 70%
rename from app/Models/Expense/BillHistory.php
rename to app/Models/Purchase/BillHistory.php
index fe4b4c16c..3219fd9dc 100644
--- a/app/Models/Expense/BillHistory.php
+++ b/app/Models/Purchase/BillHistory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -21,11 +21,11 @@ class BillHistory extends Model
 
     public function bill()
     {
-        return $this->belongsTo('App\Models\Expense\Bill');
+        return $this->belongsTo('App\Models\Purchase\Bill');
     }
 
     public function status()
     {
-        return $this->belongsTo('App\Models\Expense\BillStatus', 'status_code', 'code');
+        return $this->belongsTo('App\Models\Purchase\BillStatus', 'status_code', 'code');
     }
 }
diff --git a/app/Models/Expense/BillItem.php b/app/Models/Purchase/BillItem.php
similarity index 88%
rename from app/Models/Expense/BillItem.php
rename to app/Models/Purchase/BillItem.php
index 6a80c60c7..d2f8da66a 100644
--- a/app/Models/Expense/BillItem.php
+++ b/app/Models/Purchase/BillItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -29,7 +29,7 @@ class BillItem extends Model
 
     public function bill()
     {
-        return $this->belongsTo('App\Models\Expense\Bill');
+        return $this->belongsTo('App\Models\Purchase\Bill');
     }
 
     public function item()
@@ -39,7 +39,7 @@ class BillItem extends Model
 
     public function taxes()
     {
-        return $this->hasMany('App\Models\Expense\BillItemTax', 'bill_item_id', 'id');
+        return $this->hasMany('App\Models\Purchase\BillItemTax', 'bill_item_id', 'id');
     }
 
     /**
diff --git a/app/Models/Expense/BillItemTax.php b/app/Models/Purchase/BillItemTax.php
similarity index 88%
rename from app/Models/Expense/BillItemTax.php
rename to app/Models/Purchase/BillItemTax.php
index 524aa186a..c13b1e405 100644
--- a/app/Models/Expense/BillItemTax.php
+++ b/app/Models/Purchase/BillItemTax.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -21,7 +21,7 @@ class BillItemTax extends Model
 
     public function bill()
     {
-        return $this->belongsTo('App\Models\Expense\Bill');
+        return $this->belongsTo('App\Models\Purchase\Bill');
     }
 
     public function tax()
diff --git a/app/Models/Expense/BillStatus.php b/app/Models/Purchase/BillStatus.php
similarity index 96%
rename from app/Models/Expense/BillStatus.php
rename to app/Models/Purchase/BillStatus.php
index 62410ffe4..c3f38e3cf 100644
--- a/app/Models/Expense/BillStatus.php
+++ b/app/Models/Purchase/BillStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 
diff --git a/app/Models/Expense/BillTotal.php b/app/Models/Purchase/BillTotal.php
similarity index 95%
rename from app/Models/Expense/BillTotal.php
rename to app/Models/Purchase/BillTotal.php
index d6a81705c..d46250dd4 100644
--- a/app/Models/Expense/BillTotal.php
+++ b/app/Models/Purchase/BillTotal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Expense;
+namespace App\Models\Purchase;
 
 use App\Abstracts\Model;
 use App\Models\Setting\Tax;
@@ -28,7 +28,7 @@ class BillTotal extends Model
 
     public function bill()
     {
-        return $this->belongsTo('App\Models\Expense\Bill');
+        return $this->belongsTo('App\Models\Purchase\Bill');
     }
 
     /**
diff --git a/app/Models/Income/Invoice.php b/app/Models/Sale/Invoice.php
similarity index 94%
rename from app/Models/Income/Invoice.php
rename to app/Models/Sale/Invoice.php
index 99a2dbf63..a3a7c3d50 100644
--- a/app/Models/Income/Invoice.php
+++ b/app/Models/Sale/Invoice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 use App\Models\Banking\Transaction;
@@ -68,17 +68,17 @@ class Invoice extends Model
 
     public function items()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItem');
+        return $this->hasMany('App\Models\Sale\InvoiceItem');
     }
 
     public function item_taxes()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItemTax');
+        return $this->hasMany('App\Models\Sale\InvoiceItemTax');
     }
 
     public function histories()
     {
-        return $this->hasMany('App\Models\Income\InvoiceHistory');
+        return $this->hasMany('App\Models\Sale\InvoiceHistory');
     }
 
     public function payments()
@@ -93,12 +93,12 @@ class Invoice extends Model
 
     public function status()
     {
-        return $this->belongsTo('App\Models\Income\InvoiceStatus', 'invoice_status_code', 'code');
+        return $this->belongsTo('App\Models\Sale\InvoiceStatus', 'invoice_status_code', 'code');
     }
 
     public function totals()
     {
-        return $this->hasMany('App\Models\Income\InvoiceTotal');
+        return $this->hasMany('App\Models\Sale\InvoiceTotal');
     }
 
     public function transactions()
diff --git a/app/Models/Income/InvoiceHistory.php b/app/Models/Sale/InvoiceHistory.php
similarity index 70%
rename from app/Models/Income/InvoiceHistory.php
rename to app/Models/Sale/InvoiceHistory.php
index 484d71ad2..e2424d903 100644
--- a/app/Models/Income/InvoiceHistory.php
+++ b/app/Models/Sale/InvoiceHistory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -21,11 +21,11 @@ class InvoiceHistory extends Model
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Income\Invoice');
+        return $this->belongsTo('App\Models\Sale\Invoice');
     }
 
     public function status()
     {
-        return $this->belongsTo('App\Models\Income\InvoiceStatus', 'status_code', 'code');
+        return $this->belongsTo('App\Models\Sale\InvoiceStatus', 'status_code', 'code');
     }
 }
diff --git a/app/Models/Income/InvoiceItem.php b/app/Models/Sale/InvoiceItem.php
similarity index 88%
rename from app/Models/Income/InvoiceItem.php
rename to app/Models/Sale/InvoiceItem.php
index 583056d72..3e50bab2a 100644
--- a/app/Models/Income/InvoiceItem.php
+++ b/app/Models/Sale/InvoiceItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -29,7 +29,7 @@ class InvoiceItem extends Model
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Income\Invoice');
+        return $this->belongsTo('App\Models\Sale\Invoice');
     }
 
     public function item()
@@ -39,7 +39,7 @@ class InvoiceItem extends Model
 
     public function taxes()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItemTax', 'invoice_item_id', 'id');
+        return $this->hasMany('App\Models\Sale\InvoiceItemTax', 'invoice_item_id', 'id');
     }
 
     /**
diff --git a/app/Models/Income/InvoiceItemTax.php b/app/Models/Sale/InvoiceItemTax.php
similarity index 88%
rename from app/Models/Income/InvoiceItemTax.php
rename to app/Models/Sale/InvoiceItemTax.php
index 09faac532..f21a58136 100644
--- a/app/Models/Income/InvoiceItemTax.php
+++ b/app/Models/Sale/InvoiceItemTax.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 use App\Traits\Currencies;
@@ -21,7 +21,7 @@ class InvoiceItemTax extends Model
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Income\Invoice');
+        return $this->belongsTo('App\Models\Sale\Invoice');
     }
 
     public function tax()
diff --git a/app/Models/Income/InvoiceStatus.php b/app/Models/Sale/InvoiceStatus.php
similarity index 97%
rename from app/Models/Income/InvoiceStatus.php
rename to app/Models/Sale/InvoiceStatus.php
index 9b7afddfe..cbe4dc023 100644
--- a/app/Models/Income/InvoiceStatus.php
+++ b/app/Models/Sale/InvoiceStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 
diff --git a/app/Models/Income/InvoiceTotal.php b/app/Models/Sale/InvoiceTotal.php
similarity index 95%
rename from app/Models/Income/InvoiceTotal.php
rename to app/Models/Sale/InvoiceTotal.php
index ac96dbb19..d15a925b5 100644
--- a/app/Models/Income/InvoiceTotal.php
+++ b/app/Models/Sale/InvoiceTotal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Income;
+namespace App\Models\Sale;
 
 use App\Abstracts\Model;
 use App\Models\Setting\Tax;
@@ -28,7 +28,7 @@ class InvoiceTotal extends Model
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Income\Invoice');
+        return $this->belongsTo('App\Models\Sale\Invoice');
     }
 
     /**
diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php
index dc13d7e03..6dcf184bf 100644
--- a/app/Models/Setting/Category.php
+++ b/app/Models/Setting/Category.php
@@ -24,7 +24,7 @@ class Category extends Model
 
     public function bills()
     {
-        return $this->hasMany('App\Models\Expense\Bill');
+        return $this->hasMany('App\Models\Purchase\Bill');
     }
 
     public function expense_transactions()
@@ -39,7 +39,7 @@ class Category extends Model
 
     public function invoices()
     {
-        return $this->hasMany('App\Models\Income\Invoice');
+        return $this->hasMany('App\Models\Sale\Invoice');
     }
 
     public function items()
diff --git a/app/Models/Setting/Currency.php b/app/Models/Setting/Currency.php
index f449d57fa..f74468df5 100644
--- a/app/Models/Setting/Currency.php
+++ b/app/Models/Setting/Currency.php
@@ -30,7 +30,7 @@ class Currency extends Model
 
     public function bills()
     {
-        return $this->hasMany('App\Models\Expense\Bill', 'currency_code', 'code');
+        return $this->hasMany('App\Models\Purchase\Bill', 'currency_code', 'code');
     }
 
     public function contacts()
@@ -55,7 +55,7 @@ class Currency extends Model
 
     public function invoices()
     {
-        return $this->hasMany('App\Models\Income\Invoice', 'currency_code', 'code');
+        return $this->hasMany('App\Models\Sale\Invoice', 'currency_code', 'code');
     }
 
     public function transactions()
diff --git a/app/Models/Setting/Tax.php b/app/Models/Setting/Tax.php
index ccd0aec28..63ff17a1d 100644
--- a/app/Models/Setting/Tax.php
+++ b/app/Models/Setting/Tax.php
@@ -37,12 +37,12 @@ class Tax extends Model
 
     public function bill_items()
     {
-        return $this->hasMany('App\Models\Expense\BillItemTax');
+        return $this->hasMany('App\Models\Purchase\BillItemTax');
     }
 
     public function invoice_items()
     {
-        return $this->hasMany('App\Models\Income\InvoiceItemTax');
+        return $this->hasMany('App\Models\Sale\InvoiceItemTax');
     }
 
     /**
diff --git a/app/Notifications/Expense/Bill.php b/app/Notifications/Purchase/Bill.php
similarity index 97%
rename from app/Notifications/Expense/Bill.php
rename to app/Notifications/Purchase/Bill.php
index 951d4357d..de5641cab 100644
--- a/app/Notifications/Expense/Bill.php
+++ b/app/Notifications/Purchase/Bill.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications\Expense;
+namespace App\Notifications\Purchase;
 
 use App\Abstracts\Notification;
 use Illuminate\Notifications\Messages\MailMessage;
diff --git a/app/Notifications/Income/Invoice.php b/app/Notifications/Sale/Invoice.php
similarity index 98%
rename from app/Notifications/Income/Invoice.php
rename to app/Notifications/Sale/Invoice.php
index 905098d74..a91c07426 100644
--- a/app/Notifications/Income/Invoice.php
+++ b/app/Notifications/Sale/Invoice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications\Income;
+namespace App\Notifications\Sale;
 
 use App\Abstracts\Notification;
 use Illuminate\Notifications\Messages\MailMessage;
diff --git a/app/Observers/Transaction.php b/app/Observers/Transaction.php
index 8693b5267..14ab91a7a 100644
--- a/app/Observers/Transaction.php
+++ b/app/Observers/Transaction.php
@@ -2,8 +2,8 @@
 
 namespace App\Observers;
 
-use App\Jobs\Expense\CreateBillHistory;
-use App\Jobs\Income\CreateInvoiceHistory;
+use App\Jobs\Purchase\CreateBillHistory;
+use App\Jobs\Sale\CreateInvoiceHistory;
 use App\Models\Banking\Transaction as Model;
 use App\Traits\Jobs;
 
diff --git a/app/Providers/Event.php b/app/Providers/Event.php
index 8d5cad18c..d2876b51a 100644
--- a/app/Providers/Event.php
+++ b/app/Providers/Event.php
@@ -14,28 +14,6 @@ class Event extends Provider
     protected $listen = [
         'App\Events\Install\UpdateFinished' => [
             'App\Listeners\Update\CreateModuleUpdatedHistory',
-            'App\Listeners\Update\V10\Version106',
-            'App\Listeners\Update\V10\Version107',
-            'App\Listeners\Update\V10\Version108',
-            'App\Listeners\Update\V10\Version109',
-            'App\Listeners\Update\V11\Version110',
-            'App\Listeners\Update\V11\Version112',
-            'App\Listeners\Update\V11\Version113',
-            'App\Listeners\Update\V11\Version119',
-            'App\Listeners\Update\V12\Version120',
-            'App\Listeners\Update\V12\Version126',
-            'App\Listeners\Update\V12\Version127',
-            'App\Listeners\Update\V12\Version129',
-            'App\Listeners\Update\V12\Version1210',
-            'App\Listeners\Update\V12\Version1211',
-            'App\Listeners\Update\V13\Version130',
-            'App\Listeners\Update\V13\Version132',
-            'App\Listeners\Update\V13\Version135',
-            'App\Listeners\Update\V13\Version138',
-            'App\Listeners\Update\V13\Version139',
-            'App\Listeners\Update\V13\Version1311',
-            'App\Listeners\Update\V13\Version1313',
-            'App\Listeners\Update\V13\Version1316',
             'App\Listeners\Update\V20\Version200',
         ],
         'Illuminate\Auth\Events\Login' => [
@@ -44,28 +22,28 @@ class Event extends Provider
         'Illuminate\Auth\Events\Logout' => [
             'App\Listeners\Auth\Logout',
         ],
-        'App\Events\Expense\BillCreated' => [
-            'App\Listeners\Expense\CreateBillCreatedHistory',
+        'App\Events\Purchase\BillCreated' => [
+            'App\Listeners\Purchase\CreateBillCreatedHistory',
         ],
-        'App\Events\Expense\BillRecurring' => [
-            'App\Listeners\Expense\SendBillRecurringNotification',
+        'App\Events\Purchase\BillRecurring' => [
+            'App\Listeners\Purchase\SendBillRecurringNotification',
         ],
-        'App\Events\Income\PaymentReceived' => [
-            'App\Listeners\Income\CreateInvoiceTransaction',
-            'App\Listeners\Income\SendInvoicePaymentNotification',
+        'App\Events\Sale\PaymentReceived' => [
+            'App\Listeners\Sale\CreateInvoiceTransaction',
+            'App\Listeners\Sale\SendInvoicePaymentNotification',
         ],
-        'App\Events\Income\InvoiceCreated' => [
-            'App\Listeners\Income\CreateInvoiceCreatedHistory',
-            'App\Listeners\Income\IncreaseNextInvoiceNumber',
+        'App\Events\Sale\InvoiceCreated' => [
+            'App\Listeners\Sale\CreateInvoiceCreatedHistory',
+            'App\Listeners\Sale\IncreaseNextInvoiceNumber',
         ],
-        'App\Events\Income\InvoiceSent' => [
-            'App\Listeners\Income\MarkInvoiceSent',
+        'App\Events\Sale\InvoiceSent' => [
+            'App\Listeners\Sale\MarkInvoiceSent',
         ],
-        'App\Events\Income\InvoiceViewed' => [
-            'App\Listeners\Income\MarkInvoiceViewed',
+        'App\Events\Sale\InvoiceViewed' => [
+            'App\Listeners\Sale\MarkInvoiceViewed',
         ],
-        'App\Events\Income\InvoiceRecurring' => [
-            'App\Listeners\Income\SendInvoiceRecurringNotification',
+        'App\Events\Sale\InvoiceRecurring' => [
+            'App\Listeners\Sale\SendInvoiceRecurringNotification',
         ],
         'App\Events\Menu\AdminCreated' => [
             'App\Listeners\Menu\AddAdminItems',
diff --git a/app/Providers/ViewComposer.php b/app/Providers/ViewComposer.php
index 5cc902e17..2cb7a1d53 100644
--- a/app/Providers/ViewComposer.php
+++ b/app/Providers/ViewComposer.php
@@ -58,13 +58,13 @@ class ViewComposer extends Provider
 
         // Add logo
         View::composer(
-            ['expenses.bills.print', 'expenses.bills.show', 'incomes.invoices.print_default', 'incomes.invoices.print_classic', 'incomes.invoices.print_modern', 'incomes.invoices.show', 'portal.invoices.show'],
+            ['purchases.bills.print', 'purchases.bills.show', 'sales.invoices.print_default', 'sales.invoices.print_classic', 'sales.invoices.print_modern', 'sales.invoices.show', 'portal.invoices.show'],
             'App\Http\ViewComposers\Logo'
         );
 
         // Add Invoice Text
         View::composer(
-            ['incomes.invoices.*', 'portal.invoices.*'],
+            ['sales.invoices.*', 'portal.invoices.*'],
             'App\Http\ViewComposers\InvoiceText'
         );
     }
diff --git a/app/Reports/ExpenseSummary.php b/app/Reports/ExpenseSummary.php
index a99cd5023..2211cf391 100644
--- a/app/Reports/ExpenseSummary.php
+++ b/app/Reports/ExpenseSummary.php
@@ -4,7 +4,7 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 use App\Utilities\Recurring;
 
 class ExpenseSummary extends Report
diff --git a/app/Reports/IncomeExpenseSummary.php b/app/Reports/IncomeExpenseSummary.php
index 34dda1230..0ef2f458a 100644
--- a/app/Reports/IncomeExpenseSummary.php
+++ b/app/Reports/IncomeExpenseSummary.php
@@ -4,8 +4,8 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Purchase\Bill;
+use App\Models\Sale\Invoice;
 use App\Utilities\Recurring;
 
 class IncomeExpenseSummary extends Report
diff --git a/app/Reports/IncomeSummary.php b/app/Reports/IncomeSummary.php
index eb3cfc322..63d829eae 100644
--- a/app/Reports/IncomeSummary.php
+++ b/app/Reports/IncomeSummary.php
@@ -4,7 +4,7 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Utilities\Recurring;
 
 class IncomeSummary extends Report
diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php
index 8d03cbe64..27e1ab790 100644
--- a/app/Reports/ProfitLoss.php
+++ b/app/Reports/ProfitLoss.php
@@ -4,8 +4,8 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Purchase\Bill;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Category;
 use App\Utilities\Recurring;
 
diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php
index c2f00c0e0..6275b0198 100644
--- a/app/Reports/TaxSummary.php
+++ b/app/Reports/TaxSummary.php
@@ -4,8 +4,8 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Purchase\Bill;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Tax;
 use App\Traits\Currencies;
 use App\Utilities\Recurring;
diff --git a/app/Transformers/Expense/Bill.php b/app/Transformers/Purchase/Bill.php
similarity index 97%
rename from app/Transformers/Expense/Bill.php
rename to app/Transformers/Purchase/Bill.php
index f442e1b63..c08d67f2b 100644
--- a/app/Transformers/Expense/Bill.php
+++ b/app/Transformers/Purchase/Bill.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Transformers\Expense;
+namespace App\Transformers\Purchase;
 
 use App\Transformers\Banking\Transaction;
 use App\Transformers\Common\Contact;
 use App\Transformers\Setting\Currency;
-use App\Models\Expense\Bill as Model;
+use App\Models\Purchase\Bill as Model;
 use League\Fractal\TransformerAbstract;
 
 class Bill extends TransformerAbstract
diff --git a/app/Transformers/Expense/BillHistories.php b/app/Transformers/Purchase/BillHistories.php
similarity index 89%
rename from app/Transformers/Expense/BillHistories.php
rename to app/Transformers/Purchase/BillHistories.php
index 909754b13..c6e0026d9 100644
--- a/app/Transformers/Expense/BillHistories.php
+++ b/app/Transformers/Purchase/BillHistories.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Expense;
+namespace App\Transformers\Purchase;
 
-use App\Models\Expense\BillHistory as Model;
+use App\Models\Purchase\BillHistory as Model;
 use League\Fractal\TransformerAbstract;
 
 class BillHistories extends TransformerAbstract
diff --git a/app/Transformers/Expense/BillItems.php b/app/Transformers/Purchase/BillItems.php
similarity index 90%
rename from app/Transformers/Expense/BillItems.php
rename to app/Transformers/Purchase/BillItems.php
index b99b386c2..654ef8a98 100644
--- a/app/Transformers/Expense/BillItems.php
+++ b/app/Transformers/Purchase/BillItems.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Expense;
+namespace App\Transformers\Purchase;
 
-use App\Models\Expense\BillItem as Model;
+use App\Models\Purchase\BillItem as Model;
 use League\Fractal\TransformerAbstract;
 
 class BillItems extends TransformerAbstract
diff --git a/app/Transformers/Expense/BillStatus.php b/app/Transformers/Purchase/BillStatus.php
similarity index 87%
rename from app/Transformers/Expense/BillStatus.php
rename to app/Transformers/Purchase/BillStatus.php
index e5ff54daf..c5d42cfa2 100644
--- a/app/Transformers/Expense/BillStatus.php
+++ b/app/Transformers/Purchase/BillStatus.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Expense;
+namespace App\Transformers\Purchase;
 
-use App\Models\Expense\BillStatus as Model;
+use App\Models\Purchase\BillStatus as Model;
 use League\Fractal\TransformerAbstract;
 
 class BillStatus extends TransformerAbstract
diff --git a/app/Transformers/Expense/BillTotals.php b/app/Transformers/Purchase/BillTotals.php
similarity index 89%
rename from app/Transformers/Expense/BillTotals.php
rename to app/Transformers/Purchase/BillTotals.php
index d93a677a8..6582b256b 100644
--- a/app/Transformers/Expense/BillTotals.php
+++ b/app/Transformers/Purchase/BillTotals.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Expense;
+namespace App\Transformers\Purchase;
 
-use App\Models\Expense\BillTotal as Model;
+use App\Models\Purchase\BillTotal as Model;
 use League\Fractal\TransformerAbstract;
 
 class BillTotals extends TransformerAbstract
diff --git a/app/Transformers/Income/Invoice.php b/app/Transformers/Sale/Invoice.php
similarity index 97%
rename from app/Transformers/Income/Invoice.php
rename to app/Transformers/Sale/Invoice.php
index 600418064..6899c2203 100644
--- a/app/Transformers/Income/Invoice.php
+++ b/app/Transformers/Sale/Invoice.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Transformers\Income;
+namespace App\Transformers\Sale;
 
 use App\Transformers\Banking\Transaction;
 use App\Transformers\Common\Contact;
 use App\Transformers\Setting\Currency;
-use App\Models\Income\Invoice as Model;
+use App\Models\Sale\Invoice as Model;
 use League\Fractal\TransformerAbstract;
 
 class Invoice extends TransformerAbstract
diff --git a/app/Transformers/Income/InvoiceHistories.php b/app/Transformers/Sale/InvoiceHistories.php
similarity index 89%
rename from app/Transformers/Income/InvoiceHistories.php
rename to app/Transformers/Sale/InvoiceHistories.php
index 91114c45e..4f2fdb738 100644
--- a/app/Transformers/Income/InvoiceHistories.php
+++ b/app/Transformers/Sale/InvoiceHistories.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Income;
+namespace App\Transformers\Sale;
 
-use App\Models\Income\InvoiceHistory as Model;
+use App\Models\Sale\InvoiceHistory as Model;
 use League\Fractal\TransformerAbstract;
 
 class InvoiceHistories extends TransformerAbstract
diff --git a/app/Transformers/Income/InvoiceItems.php b/app/Transformers/Sale/InvoiceItems.php
similarity index 90%
rename from app/Transformers/Income/InvoiceItems.php
rename to app/Transformers/Sale/InvoiceItems.php
index deee96a9f..4890152c9 100644
--- a/app/Transformers/Income/InvoiceItems.php
+++ b/app/Transformers/Sale/InvoiceItems.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Income;
+namespace App\Transformers\Sale;
 
-use App\Models\Income\InvoiceItem as Model;
+use App\Models\Sale\InvoiceItem as Model;
 use League\Fractal\TransformerAbstract;
 
 class InvoiceItems extends TransformerAbstract
diff --git a/app/Transformers/Income/InvoiceStatus.php b/app/Transformers/Sale/InvoiceStatus.php
similarity index 87%
rename from app/Transformers/Income/InvoiceStatus.php
rename to app/Transformers/Sale/InvoiceStatus.php
index a5fbe6747..3451cfa9d 100644
--- a/app/Transformers/Income/InvoiceStatus.php
+++ b/app/Transformers/Sale/InvoiceStatus.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Income;
+namespace App\Transformers\Sale;
 
-use App\Models\Income\InvoiceStatus as Model;
+use App\Models\Sale\InvoiceStatus as Model;
 use League\Fractal\TransformerAbstract;
 
 class InvoiceStatus extends TransformerAbstract
diff --git a/app/Transformers/Income/InvoiceTotals.php b/app/Transformers/Sale/InvoiceTotals.php
similarity index 90%
rename from app/Transformers/Income/InvoiceTotals.php
rename to app/Transformers/Sale/InvoiceTotals.php
index 7e3e4af5d..49b322590 100644
--- a/app/Transformers/Income/InvoiceTotals.php
+++ b/app/Transformers/Sale/InvoiceTotals.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Transformers\Income;
+namespace App\Transformers\Sale;
 
-use App\Models\Income\InvoiceTotal as Model;
+use App\Models\Sale\InvoiceTotal as Model;
 use League\Fractal\TransformerAbstract;
 
 class InvoiceTotals extends TransformerAbstract
diff --git a/app/Widgets/TotalExpenses.php b/app/Widgets/TotalExpenses.php
index 95f2ab78d..a05b94ad7 100644
--- a/app/Widgets/TotalExpenses.php
+++ b/app/Widgets/TotalExpenses.php
@@ -4,7 +4,7 @@ namespace App\Widgets;
 
 use App\Abstracts\Widget;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 
 class TotalExpenses extends Widget
 {
diff --git a/app/Widgets/TotalIncome.php b/app/Widgets/TotalIncome.php
index 61d3e9401..021d2592b 100644
--- a/app/Widgets/TotalIncome.php
+++ b/app/Widgets/TotalIncome.php
@@ -4,7 +4,7 @@ namespace App\Widgets;
 
 use App\Abstracts\Widget;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 
 class TotalIncome extends Widget
 {
diff --git a/app/Widgets/TotalProfit.php b/app/Widgets/TotalProfit.php
index f3c96fe98..1123d660d 100644
--- a/app/Widgets/TotalProfit.php
+++ b/app/Widgets/TotalProfit.php
@@ -4,8 +4,8 @@ namespace App\Widgets;
 
 use App\Abstracts\Widget;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Purchase\Bill;
+use App\Models\Sale\Invoice;
 
 class TotalProfit extends Widget
 {
diff --git a/config/search-string.php b/config/search-string.php
index d3e9b42e8..7c4873253 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -135,7 +135,7 @@ return [
         ],
     ],
 
-    App\Models\Expense\Bill::class => [
+    App\Models\Purchase\Bill::class => [
         'columns' => [
             'bill_number' => ['searchable' => true],
             'order_number' => ['searchable' => true],
@@ -155,7 +155,7 @@ return [
         ],
     ],
 
-    App\Models\Income\Invoice::class => [
+    App\Models\Sale\Invoice::class => [
         'columns' => [
             'invoice_number' => ['searchable' => true],
             'order_number' => ['searchable' => true],
diff --git a/database/migrations/2017_10_11_000000_create_bill_totals_table.php b/database/migrations/2017_10_11_000000_create_bill_totals_table.php
index fb4ad60bd..31e8fc9d7 100644
--- a/database/migrations/2017_10_11_000000_create_bill_totals_table.php
+++ b/database/migrations/2017_10_11_000000_create_bill_totals_table.php
@@ -3,9 +3,9 @@
 
 use App\Abstracts\Model;
 use App\Models\Common\Company;
-use App\Models\Expense\Bill;
-use App\Models\Expense\BillItem;
-use App\Models\Expense\BillTotal;
+use App\Models\Purchase\Bill;
+use App\Models\Purchase\BillItem;
+use App\Models\Purchase\BillTotal;
 use App\Models\Setting\Tax;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2017_10_11_000000_create_invoice_totals_table.php b/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
index e8d333d14..e023f31a6 100644
--- a/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
+++ b/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
@@ -2,9 +2,9 @@
 
 use App\Abstracts\Model;
 use App\Models\Common\Company;
-use App\Models\Income\Invoice;
-use App\Models\Income\InvoiceItem;
-use App\Models\Income\InvoiceTotal;
+use App\Models\Sale\Invoice;
+use App\Models\Sale\InvoiceItem;
+use App\Models\Sale\InvoiceTotal;
 use App\Models\Setting\Tax;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/seeds/BillStatuses.php b/database/seeds/BillStatuses.php
index 318eb42bb..86ab6b12b 100644
--- a/database/seeds/BillStatuses.php
+++ b/database/seeds/BillStatuses.php
@@ -3,7 +3,7 @@
 namespace Database\Seeds;
 
 use App\Abstracts\Model;
-use App\Models\Expense\BillStatus;
+use App\Models\Purchase\BillStatus;
 use Illuminate\Database\Seeder;
 
 class BillStatuses extends Seeder
diff --git a/database/seeds/InvoiceStatuses.php b/database/seeds/InvoiceStatuses.php
index eb3aba14b..494db7667 100644
--- a/database/seeds/InvoiceStatuses.php
+++ b/database/seeds/InvoiceStatuses.php
@@ -3,7 +3,7 @@
 namespace Database\Seeds;
 
 use App\Abstracts\Model;
-use App\Models\Income\InvoiceStatus;
+use App\Models\Sale\InvoiceStatus;
 use Illuminate\Database\Seeder;
 
 class InvoiceStatuses extends Seeder
diff --git a/database/seeds/Roles.php b/database/seeds/Roles.php
index 4316a9d76..454250517 100644
--- a/database/seeds/Roles.php
+++ b/database/seeds/Roles.php
@@ -45,12 +45,12 @@ class Roles extends Seeder
                 'common-search' => 'r',
                 'common-uploads' => 'r,d',
                 'common-widgets' => 'c,r,u,d',
-                'expenses-bills' => 'c,r,u,d',
-                'expenses-payments' => 'c,r,u,d',
-                'expenses-vendors' => 'c,r,u,d',
-                'incomes-customers' => 'c,r,u,d',
-                'incomes-invoices' => 'c,r,u,d',
-                'incomes-revenues' => 'c,r,u,d',
+                'purchases-bills' => 'c,r,u,d',
+                'purchases-payments' => 'c,r,u,d',
+                'purchases-vendors' => 'c,r,u,d',
+                'sales-customers' => 'c,r,u,d',
+                'sales-invoices' => 'c,r,u,d',
+                'sales-revenues' => 'c,r,u,d',
                 'install-updates' => 'r,u',
                 'modules-api-key' => 'c,u',
                 'modules-home' => 'r',
@@ -95,12 +95,12 @@ class Roles extends Seeder
                 'common-search' => 'r',
                 'common-uploads' => 'r',
                 'common-widgets' => 'r',
-                'expenses-bills' => 'c,r,u,d',
-                'expenses-payments' => 'c,r,u,d',
-                'expenses-vendors' => 'c,r,u,d',
-                'incomes-customers' => 'c,r,u,d',
-                'incomes-invoices' => 'c,r,u,d',
-                'incomes-revenues' => 'c,r,u,d',
+                'purchases-bills' => 'c,r,u,d',
+                'purchases-payments' => 'c,r,u,d',
+                'purchases-vendors' => 'c,r,u,d',
+                'sales-customers' => 'c,r,u,d',
+                'sales-invoices' => 'c,r,u,d',
+                'sales-revenues' => 'c,r,u,d',
                 'install-updates' => 'r,u',
                 'notifications' => 'r,u',
                 'reports-expense-summary' => 'r',
diff --git a/modules/OfflinePayments/Http/Controllers/Payment.php b/modules/OfflinePayments/Http/Controllers/Payment.php
index 13d864c62..769d5f336 100644
--- a/modules/OfflinePayments/Http/Controllers/Payment.php
+++ b/modules/OfflinePayments/Http/Controllers/Payment.php
@@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Http\Controllers;
 
 use App\Abstracts\Http\PaymentController;
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\URL;
 
@@ -69,7 +69,7 @@ class Payment extends PaymentController
     public function confirm(Invoice $invoice, Request $request)
     {
         try {
-            event(new \App\Events\Income\PaymentReceived($invoice, $request));
+            event(new \App\Events\Sale\PaymentReceived($invoice, $request));
 
             $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
 
diff --git a/modules/PaypalStandard/Http/Controllers/Payment.php b/modules/PaypalStandard/Http/Controllers/Payment.php
index 1d67e6174..2828c87b2 100644
--- a/modules/PaypalStandard/Http/Controllers/Payment.php
+++ b/modules/PaypalStandard/Http/Controllers/Payment.php
@@ -4,7 +4,7 @@ namespace Modules\PaypalStandard\Http\Controllers;
 
 use App\Abstracts\Http\PaymentController;
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use Monolog\Handler\StreamHandler;
@@ -117,7 +117,7 @@ class Payment extends PaymentController
                 $total_paid_match = ((double) $request['mc_gross'] == $invoice->amount);
 
                 if ($receiver_match && $total_paid_match) {
-                    event(new \App\Events\Income\PaymentReceived($invoice, $request));
+                    event(new \App\Events\Sale\PaymentReceived($invoice, $request));
                 }
 
                 if (!$receiver_match) {
diff --git a/resources/assets/js/views/expenses/bills.js b/resources/assets/js/views/purchases/bills.js
similarity index 99%
rename from resources/assets/js/views/expenses/bills.js
rename to resources/assets/js/views/purchases/bills.js
index e7130330f..8b3b94314 100644
--- a/resources/assets/js/views/expenses/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -76,7 +76,7 @@ const app = new Vue({
 
     methods:{
         onChangeContact(contact_id) {
-            axios.get(url + '/expenses/vendors/' + contact_id + '/currency')
+            axios.get(url + '/purchases/vendors/' + contact_id + '/currency')
             .then(response => {
                 this.form.contact_name = response.data.name;
                 this.form.contact_email = response.data.email;
diff --git a/resources/assets/js/views/expenses/payments.js b/resources/assets/js/views/purchases/payments.js
similarity index 100%
rename from resources/assets/js/views/expenses/payments.js
rename to resources/assets/js/views/purchases/payments.js
diff --git a/resources/assets/js/views/expenses/vendors.js b/resources/assets/js/views/purchases/vendors.js
similarity index 100%
rename from resources/assets/js/views/expenses/vendors.js
rename to resources/assets/js/views/purchases/vendors.js
diff --git a/resources/assets/js/views/incomes/customers.js b/resources/assets/js/views/sales/customers.js
similarity index 100%
rename from resources/assets/js/views/incomes/customers.js
rename to resources/assets/js/views/sales/customers.js
diff --git a/resources/assets/js/views/incomes/invoices.js b/resources/assets/js/views/sales/invoices.js
similarity index 100%
rename from resources/assets/js/views/incomes/invoices.js
rename to resources/assets/js/views/sales/invoices.js
diff --git a/resources/assets/js/views/incomes/revenues.js b/resources/assets/js/views/sales/revenues.js
similarity index 100%
rename from resources/assets/js/views/incomes/revenues.js
rename to resources/assets/js/views/sales/revenues.js
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index ac549024e..39061fa0f 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -49,6 +49,8 @@ return [
     'defaults'              => 'Default|Defaults',
     'widgets'               => 'Widget|Widgets',
     'templates'             => 'Template|Templates',
+    'sales'                 => 'Sale|Sales',
+    'purchases'             => 'Purchases|Purchases',
 
     'dashboard'             => 'Dashboard',
     'welcome'               => 'Welcome',
diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index 7d6c8b395..e6a124f9b 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -53,14 +53,14 @@
                     </a>
                 </li>
 
-                @permission(['create-incomes-invoices', 'create-incomes-revenues', 'create-incomes-customers', 'create-expenses-bills', 'create-expenses-payments', 'create-expenses-vendors'])
+                @permission(['create-sales-invoices', 'create-sales-revenues', 'create-sales-invoices', 'create-purchases-bills', 'create-purchases-payments', 'create-purchases-vendors'])
                     <li class="nav-item dropdown">
                         <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="fas fa-plus"></i>
                         </a>
                         <div class="dropdown-menu dropdown-menu-lg dropdown-menu-dark dropdown-menu-right">
                             <div class="row shortcuts px-4">
-                                @permission('create-incomes-invoices')
+                                @permission('create-sales-invoices')
                                     <a href="{{ route('invoices.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
                                         <i class="fa fa-money-bill"></i>
@@ -69,7 +69,7 @@
                                     </a>
                                 @endpermission
 
-                                @permission('create-incomes-revenues')
+                                @permission('create-sales-revenues')
                                     <a href="{{ route('revenues.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
                                             <i class="fas fa-hand-holding-usd"></i>
@@ -78,7 +78,7 @@
                                     </a>
                                 @endpermission
 
-                                @permission('create-incomes-customers')
+                                @permission('create-sales-customers')
                                     <a href="{{ route('customers.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
                                         <i class="fas fa-user"></i>
@@ -87,7 +87,7 @@
                                     </a>
                                 @endpermission
 
-                                @permission('create-expenses-bills')
+                                @permission('create-purchases-bills')
                                     <a href="{{ route('bills.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
                                         <i class="fa fa-shopping-cart"></i>
@@ -96,7 +96,7 @@
                                     </a>
                                 @endpermission
 
-                                @permission('create-expenses-payments')
+                                @permission('create-purchases-payments')
                                     <a href="{{ route('payments.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
                                             <i class="fas fa-hand-holding-usd"></i>
@@ -105,7 +105,7 @@
                                     </a>
                                 @endpermission
 
-                                @permission('create-expenses-vendors')
+                                @permission('create-purchases-vendors')
                                     <a href="{{ route('vendors.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
                                         <i class="fas fa-user"></i>
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
similarity index 98%
rename from resources/views/expenses/bills/create.blade.php
rename to resources/views/purchases/bills/create.blade.php
index 70b777c5c..42671f6da 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -61,7 +61,7 @@
                                     </tr>
                                 </thead>
                                 <tbody id="bill-item-rows">
-                                    @include('expenses.bills.item')
+                                    @include('purchases.bills.item')
 
                                     @stack('add_item_td_start')
                                         <tr class="row" id="addItem">
@@ -179,7 +179,7 @@
 
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons('expenses/bills') }}
+                    {{ Form::saveButtons('purchases/bills') }}
                 </div>
             </div>
         {!! Form::close() !!}
@@ -191,5 +191,5 @@
         var bill_items = false;
     </script>
 
-    <script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
similarity index 98%
rename from resources/views/expenses/bills/edit.blade.php
rename to resources/views/purchases/bills/edit.blade.php
index 13a9490bc..0c75c7ca3 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -62,7 +62,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @include('expenses.bills.item')
+                                    @include('purchases.bills.item')
 
                                     @stack('add_item_td_start')
                                         <tr class="row" id="addItem">
@@ -178,10 +178,10 @@
                 </div>
             </div>
 
-            @permission('update-expenses-bills')
+            @permission('update-purchases-bills')
                 <div class="card-footer">
                     <div class="row float-right">
-                        {{ Form::saveButtons('expenses/bills') }}
+                        {{ Form::saveButtons('purchases/bills') }}
                     </div>
                 </div>
             @endpermission
@@ -194,5 +194,5 @@
         var bill_items = {!! json_encode($bill->items()->select(['item_id', 'name', 'quantity', 'price', 'total', 'tax'])->get()) !!};
     </script>
 
-    <script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
similarity index 92%
rename from resources/views/expenses/bills/index.blade.php
rename to resources/views/purchases/bills/index.blade.php
index b7f2790a0..24d8c1b5b 100644
--- a/resources/views/expenses/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.bills', 2))
 
 @section('new_button')
-    @permission('create-expenses-bills')
+    @permission('create-purchases-bills')
         <span><a href="{{ route('bills.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/expenses/bills') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+        <span><a href="{{ url('common/import/purchases/bills') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('bills.export', request()->input()) }}" class="btn btn-white btn-sm header-button-bottom"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'expenses/bills',
+                    'url' => 'purchases/bills',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.bills', $bulk_actions, 'expenses/bills') }}
+                    {{ Form::bulkActionRowGroup('general.bills', $bulk_actions, 'purchases/bills') }}
                 {!! Form::close() !!}
             </div>
 
@@ -70,13 +70,13 @@
                                                 <a class="dropdown-item" href="{{ route('bills.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                             @endif
                                             <div class="dropdown-divider"></div>
-                                            @permission('create-expenses-bills')
+                                            @permission('create-purchases-bills')
                                                 <a class="dropdown-item" href="{{ route('bills.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                             @endpermission
-                                            @permission('delete-expenses-bills')
+                                            @permission('delete-purchases-bills')
                                                 <div class="dropdown-divider"></div>
                                                 @if (!$item->reconciled)
-                                                    {!! Form::deleteLink($item, 'expenses/bills') !!}
+                                                    {!! Form::deleteLink($item, 'purchases/bills') !!}
                                                 @endif
                                             @endpermission
                                         </div>
@@ -95,10 +95,10 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'bills', 'docs_path' => 'expenses/bills'])
+        @include('partials.admin.empty_page', ['page' => 'bills', 'docs_path' => 'purchases/bills'])
     @endif
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
similarity index 100%
rename from resources/views/expenses/bills/item.blade.php
rename to resources/views/purchases/bills/item.blade.php
diff --git a/resources/views/expenses/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php
similarity index 100%
rename from resources/views/expenses/bills/print.blade.php
rename to resources/views/purchases/bills/print.blade.php
diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
similarity index 98%
rename from resources/views/expenses/bills/show.blade.php
rename to resources/views/purchases/bills/show.blade.php
index f744e8706..821aee6df 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -61,7 +61,7 @@
 
                                             <div class="mt-3">
                                                 @stack('timeline_body_create_bill_body_button_edit_start')
-                                                    <a href="{{ url('expenses/bills/' . $bill->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
+                                                    <a href="{{ url('purchases/bills/' . $bill->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
                                                         {{ trans('general.edit') }}
                                                     </a>
                                                 @stack('timeline_body_create_bill_body_button_edit_end')
@@ -90,8 +90,8 @@
 
                                                 <div class="mt-3">
                                                     @stack('timeline_body_receive_bill_body_button_sent_start')
-                                                        @permission('update-expenses-bills')
-                                                            <a href="{{ url('expenses/bills/' . $bill->id . '/received') }}" class="btn btn-warning btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
+                                                        @permission('update-purchases-bills')
+                                                            <a href="{{ url('purchases/bills/' . $bill->id . '/received') }}" class="btn btn-warning btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
                                                         @endpermission
                                                     @stack('timeline_body_receive_bill_body_button_sent_end')
                                                 </div>
@@ -434,7 +434,7 @@
                                             @if(empty($bill->paid) || ($bill->paid != $bill->amount))
                                                 <a class="dropdown-item" href="#" id="button-payment">{{ trans('bills.add_payment') }}</a>
                                             @endif
-                                            @permission('update-expenses-bills')
+                                            @permission('update-purchases-bills')
                                                 @if($bill->bill_status_code == 'draft')
                                                     <a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
                                                 @else
@@ -450,9 +450,9 @@
                                     @stack('button_pdf_end')
 
                                     @stack('button_delete_start')
-                                        @permission('delete-expenses-bills')
+                                        @permission('delete-purchases-bills')
                                             @if(!$bill->reconciled)
-                                                {!! Form::deleteLink($bill, 'expenses/bills') !!}
+                                                {!! Form::deleteLink($bill, 'purchases/bills') !!}
                                             @endif
                                         @endpermission
                                     @stack('button_delete_end')
@@ -603,5 +603,5 @@
 @endpush
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
similarity index 94%
rename from resources/views/expenses/payments/create.blade.php
rename to resources/views/purchases/payments/create.blade.php
index 6e72e3eaf..c63f5b508 100644
--- a/resources/views/expenses/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -46,7 +46,7 @@
 
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons('expenses/payments') }}
+                    {{ Form::saveButtons('purchases/payments') }}
                 </div>
             </div>
 
@@ -56,5 +56,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
similarity index 93%
rename from resources/views/expenses/payments/edit.blade.php
rename to resources/views/purchases/payments/edit.blade.php
index de500b2c0..e7ea96cb6 100644
--- a/resources/views/expenses/payments/edit.blade.php
+++ b/resources/views/purchases/payments/edit.blade.php
@@ -59,10 +59,10 @@
                 </div>
             </div>
 
-            @permission('update-expenses-payments')
+            @permission('update-purchases-payments')
                 <div class="card-footer">
                     <div class="row float-right">
-                        {{ Form::saveButtons('expenses/payments') }}
+                        {{ Form::saveButtons('purchases/payments') }}
                     </div>
                 </div>
             @endpermission
@@ -72,5 +72,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
similarity index 92%
rename from resources/views/expenses/payments/index.blade.php
rename to resources/views/purchases/payments/index.blade.php
index a7f200edc..ca6cf6be6 100644
--- a/resources/views/expenses/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.payments', 2))
 
 @section('new_button')
-    @permission('create-expenses-payments')
+    @permission('create-purchases-payments')
         <span><a href="{{ route('payments.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/expenses/payments') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+        <span><a href="{{ url('common/import/purchases/payments') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('payments.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'expenses/payments',
+                    'url' => 'purchases/payments',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.payments', $bulk_actions, 'expenses/payments') }}
+                    {{ Form::bulkActionRowGroup('general.payments', $bulk_actions, 'purchases/payments') }}
                 {!! Form::close() !!}
             </div>
 
@@ -70,13 +70,13 @@
                                                     <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                                     <div class="dropdown-divider"></div>
                                                 @endif
-                                                @permission('create-expenses-payments')
+                                                @permission('create-purchases-payments')
                                                     <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                                 @endpermission
-                                                @permission('delete-expenses-payments')
+                                                @permission('delete-purchases-payments')
                                                     @if (!$item->reconciled)
                                                         <div class="dropdown-divider"></div>
-                                                        {!! Form::deleteLink($item, 'expenses/payments') !!}
+                                                        {!! Form::deleteLink($item, 'purchases/payments') !!}
                                                     @endif
                                                 @endpermission
                                             </div>
@@ -102,10 +102,10 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'expenses/payments'])
+        @include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'purchases/payments'])
     @endif
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php
similarity index 92%
rename from resources/views/expenses/vendors/create.blade.php
rename to resources/views/purchases/vendors/create.blade.php
index f12795d5f..ae823ad28 100644
--- a/resources/views/expenses/vendors/create.blade.php
+++ b/resources/views/purchases/vendors/create.blade.php
@@ -41,7 +41,7 @@
 
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons('expenses/vendors') }}
+                    {{ Form::saveButtons('purchases/vendors') }}
                 </div>
             </div>
 
@@ -51,5 +51,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/vendors/edit.blade.php b/resources/views/purchases/vendors/edit.blade.php
similarity index 90%
rename from resources/views/expenses/vendors/edit.blade.php
rename to resources/views/purchases/vendors/edit.blade.php
index f56dc8133..497e38e16 100644
--- a/resources/views/expenses/vendors/edit.blade.php
+++ b/resources/views/purchases/vendors/edit.blade.php
@@ -40,10 +40,10 @@
                 </div>
             </div>
 
-            @permission('update-expenses-vendors')
+            @permission('update-purchases-vendors')
                 <div class="card-footer">
                     <div class="float-right">
-                        {{ Form::saveButtons('expenses/vendors') }}
+                        {{ Form::saveButtons('purchases/vendors') }}
                     </div>
                 </div>
             @endpermission
@@ -54,5 +54,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
similarity index 91%
rename from resources/views/expenses/vendors/index.blade.php
rename to resources/views/purchases/vendors/index.blade.php
index 880b45219..e42efe739 100644
--- a/resources/views/expenses/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.vendors', 2))
 
 @section('new_button')
-    @permission('create-expenses-vendors')
+    @permission('create-purchases-vendors')
         <span><a href="{{ route('vendors.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/expenses/vendors') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+        <span><a href="{{ url('common/import/purchases/vendors') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('vendors.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'expenses/vendors',
+                    'url' => 'purchases/vendors',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, 'expenses/vendors') }}
+                    {{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, 'purchases/vendors') }}
                 {!! Form::close() !!}
             </div>
 
@@ -64,7 +64,7 @@
                                     @money($item->unpaid, setting('default.currency'), true)
                                 </td>
                                 <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1">
-                                    @if (user()->can('update-expenses-vendors'))
+                                    @if (user()->can('update-purchases-vendors'))
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
@@ -82,13 +82,13 @@
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
                                             <a class="dropdown-item" href="{{ route('vendors.show', $item->id) }}">{{ trans('general.show') }}</a>
                                             <a class="dropdown-item" href="{{ route('vendors.edit', $item->id) }}">{{ trans('general.edit') }}</a>
-                                            @permission('create-expenses-vendors')
+                                            @permission('create-purchases-vendors')
                                                 <div class="dropdown-divider"></div>
                                                 <a class="dropdown-item" href="{{ route('vendors.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                             @endpermission
-                                            @permission('delete-expenses-vendors')
+                                            @permission('delete-purchases-vendors')
                                                 <div class="dropdown-divider"></div>
-                                                {!! Form::deleteLink($item, 'expenses/vendors') !!}
+                                                {!! Form::deleteLink($item, 'purchases/vendors') !!}
                                             @endpermission
                                         </div>
                                     </div>
@@ -106,10 +106,10 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'expenses/vendors'])
+        @include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'purchases/vendors'])
     @endif
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/expenses/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php
similarity index 96%
rename from resources/views/expenses/vendors/show.blade.php
rename to resources/views/purchases/vendors/show.blade.php
index ada58a3bf..1829ecede 100644
--- a/resources/views/expenses/vendors/show.blade.php
+++ b/resources/views/purchases/vendors/show.blade.php
@@ -47,7 +47,7 @@
                 </div>
             </div>
 
-            <a href="{{ url('expenses/vendors/' . $vendor->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
+            <a href="{{ url('purchases/vendors/' . $vendor->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
         </div>
 
         <div class="col-xl-9">
@@ -156,7 +156,7 @@
                                         <tbody>
                                             @foreach($bills as $item)
                                                 <tr class="row align-items-center border-top-1">
-                                                    <td class="col-xs-4 col-sm-3"><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
+                                                    <td class="col-xs-4 col-sm-3"><a href="{{ url('purchases/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
                                                     <td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
                                                     <td class="col-sm-2 d-none d-sm-none">@date($item->billed_at)</td>
                                                     <td class="col-sm-2 d-none d-sm-none">@date($item->due_at)</td>
@@ -182,5 +182,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/sales/customers/create.blade.php
similarity index 95%
rename from resources/views/incomes/customers/create.blade.php
rename to resources/views/sales/customers/create.blade.php
index f17d6ecdd..716cb6444 100644
--- a/resources/views/incomes/customers/create.blade.php
+++ b/resources/views/sales/customers/create.blade.php
@@ -63,7 +63,7 @@
 
         <div class="card-footer">
             <div class="row float-right">
-                {{ Form::saveButtons('incomes/customers') }}
+                {{ Form::saveButtons('sales/customers') }}
             </div>
         </div>
 
@@ -81,5 +81,5 @@
         };
     </script>
 
-    <script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php
similarity index 94%
rename from resources/views/incomes/customers/edit.blade.php
rename to resources/views/sales/customers/edit.blade.php
index 5fe0fbc07..76e339ad3 100644
--- a/resources/views/incomes/customers/edit.blade.php
+++ b/resources/views/sales/customers/edit.blade.php
@@ -71,10 +71,10 @@
             </div>
         </div>
 
-        @permission('update-incomes-customers')
+        @permission('update-sales-customers')
             <div class="card-footer">
                 <div class="float-right">
-                    {{ Form::saveButtons('incomes/customers') }}
+                    {{ Form::saveButtons('sales/customers') }}
                 </div>
             </div>
         @endpermission
@@ -86,5 +86,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
similarity index 89%
rename from resources/views/incomes/customers/index.blade.php
rename to resources/views/sales/customers/index.blade.php
index 96d062f17..c4e17c7a3 100644
--- a/resources/views/incomes/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.customers', 2))
 
 @section('new_button')
-    @permission('create-incomes-customers')
-        <span><a href="{{ url('incomes/customers/create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/incomes/customers') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+    @permission('create-sales-customers')
+        <span><a href="{{ url('sales/customers/create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
+        <span><a href="{{ url('common/import/sales/customers') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('customers.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'incomes/customers',
+                    'url' => 'sales/customers',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.customers', $bulk_actions, 'incomes/customers') }}
+                    {{ Form::bulkActionRowGroup('general.customers', $bulk_actions, 'sales/customers') }}
                 {!! Form::close() !!}
             </div>
 
@@ -64,7 +64,7 @@
                                     @money($item->unpaid, setting('default.currency'), true)
                                 </td>
                                 <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1">
-                                    @if (user()->can('update-incomes-customers'))
+                                    @if (user()->can('update-sales-customers'))
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
@@ -84,13 +84,13 @@
                                                 <a class="dropdown-item" href="{{ route('customers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
 
                                                 <div class="dropdown-divider"></div>
-                                            @permission('create-incomes-customers')
+                                            @permission('create-sales-customers')
                                                 <a class="dropdown-item" href="{{ route('customers.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
 
                                                 <div class="dropdown-divider"></div>
                                             @endpermission
-                                            @permission('delete-incomes-customers')
-                                                {!! Form::deleteLink($item, 'incomes/customers') !!}
+                                            @permission('delete-sales-customers')
+                                                {!! Form::deleteLink($item, 'sales/customers') !!}
                                             @endpermission
                                         </div>
                                     </div>
@@ -108,10 +108,10 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'incomes/customers'])
+        @include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'sales/customers'])
     @endif
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/customers/show.blade.php b/resources/views/sales/customers/show.blade.php
similarity index 96%
rename from resources/views/incomes/customers/show.blade.php
rename to resources/views/sales/customers/show.blade.php
index b7d666097..8f3838020 100644
--- a/resources/views/incomes/customers/show.blade.php
+++ b/resources/views/sales/customers/show.blade.php
@@ -44,7 +44,7 @@
                 </div>
             </div>
 
-            <a href="{{ url('incomes/customers/' . $customer->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
+            <a href="{{ route('customers.edit', $customer->id) }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
         </div>
 
         <div class="col-xl-9">
@@ -151,7 +151,7 @@
                                         <tbody>
                                             @foreach($invoices as $item)
                                                 <tr class="row align-items-center border-top-1">
-                                                    <td class="col-xs-4 col-sm-3"><a href="{{ url('incomes/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
+                                                    <td class="col-xs-4 col-sm-3"><a href="{{ url('sales/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
                                                     <td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
                                                     <td class="col-sm-2 d-none d-sm-block">@date($item->invoiced_at)</td>
                                                     <td class="col-sm-2 d-none d-sm-block">@date($item->due_at)</td>
@@ -176,5 +176,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
similarity index 98%
rename from resources/views/incomes/invoices/create.blade.php
rename to resources/views/sales/invoices/create.blade.php
index ebc2e55e0..835241c79 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -61,7 +61,7 @@
                                     </tr>
                                 </thead>
                                 <tbody id="invoice-item-rows">
-                                    @include('incomes.invoices.item')
+                                    @include('sales.invoices.item')
 
                                     @stack('add_item_td_start')
                                         <tr class="row" id="addItem">
@@ -181,7 +181,7 @@
 
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons('incomes/invoices') }}
+                    {{ Form::saveButtons('sales/invoices') }}
                 </div>
             </div>
         {!! Form::close() !!}
@@ -193,5 +193,5 @@
         var invoice_items = false;
     </script>
 
-    <script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
similarity index 98%
rename from resources/views/incomes/invoices/edit.blade.php
rename to resources/views/sales/invoices/edit.blade.php
index 7bc286049..f279efac0 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -62,7 +62,7 @@
                                     </tr>
                                 </thead>
                                 <tbody id="invoice-item-rows">
-                                    @include('incomes.invoices.item')
+                                    @include('sales.invoices.item')
 
                                     @stack('add_item_td_start')
                                         <tr class="row" id="addItem">
@@ -180,10 +180,10 @@
                 </div>
             </div>
 
-            @permission('update-incomes-invoices')
+            @permission('update-sales-invoices')
                 <div class="card-footer">
                     <div class="row float-right">
-                        {{ Form::saveButtons('incomes/invoices') }}
+                        {{ Form::saveButtons('sales/invoices') }}
                     </div>
                 </div>
             @endpermission
@@ -196,5 +196,5 @@
         var invoice_items = {!! json_encode($invoice->items()->select(['item_id', 'name', 'quantity', 'price', 'total', 'tax'])->get()) !!};
     </script>
 
-    <script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
similarity index 92%
rename from resources/views/incomes/invoices/index.blade.php
rename to resources/views/sales/invoices/index.blade.php
index 730ac934a..ac3a04007 100644
--- a/resources/views/incomes/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.invoices', 2))
 
 @section('new_button')
-    @permission('create-incomes-invoices')
+    @permission('create-sales-invoices')
         <span><a href="{{ route('invoices.create') }}" class="btn btn-primary btn-sm btn-success header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/incomes/invoices') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+        <span><a href="{{ url('common/import/sales/invoices') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('invoices.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'incomes/invoices',
+                    'url' => 'sales/invoices',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, 'incomes/invoices') }}
+                    {{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, 'sales/invoices') }}
                 {!! Form::close() !!}
             </div>
 
@@ -71,14 +71,14 @@
                                             @endif
                                             <div class="dropdown-divider"></div>
 
-                                            @permission('create-incomes-invoices')
+                                            @permission('create-sales-invoices')
                                                 <a class="dropdown-item" href="{{ route('invoices.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                                 <div class="dropdown-divider"></div>
                                             @endpermission
 
-                                            @permission('delete-incomes-invoices')
+                                            @permission('delete-sales-invoices')
                                                 @if (!$item->reconciled)
-                                                    {!! Form::deleteLink($item, 'incomes/invoices') !!}
+                                                    {!! Form::deleteLink($item, 'sales/invoices') !!}
                                                 @endif
                                             @endpermission
                                         </div>
@@ -97,10 +97,10 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'invoices', 'docs_path' => 'incomes/invoices'])
+        @include('partials.admin.empty_page', ['page' => 'invoices', 'docs_path' => 'sales/invoices'])
     @endif
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
similarity index 100%
rename from resources/views/incomes/invoices/item.blade.php
rename to resources/views/sales/invoices/item.blade.php
diff --git a/resources/views/incomes/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
similarity index 100%
rename from resources/views/incomes/invoices/print_classic.blade.php
rename to resources/views/sales/invoices/print_classic.blade.php
diff --git a/resources/views/incomes/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
similarity index 100%
rename from resources/views/incomes/invoices/print_default.blade.php
rename to resources/views/sales/invoices/print_default.blade.php
diff --git a/resources/views/incomes/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
similarity index 100%
rename from resources/views/incomes/invoices/print_modern.blade.php
rename to resources/views/sales/invoices/print_modern.blade.php
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
similarity index 96%
rename from resources/views/incomes/invoices/show.blade.php
rename to resources/views/sales/invoices/show.blade.php
index 6eef6dfdf..b2ea70e7a 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -61,7 +61,7 @@
 
                                             <div class="mt-3">
                                                 @stack('timeline_body_create_invoice_body_button_edit_start')
-                                                    <a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
+                                                    <a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
                                                         {{ trans('general.edit') }}
                                                     </a>
                                                 @stack('timeline_body_create_invoice_body_button_edit_end')
@@ -90,9 +90,9 @@
 
                                                 <div class="mt-3">
                                                     @stack('timeline_body_send_invoice_body_button_sent_start')
-                                                        @permission('update-incomes-invoices')
+                                                        @permission('update-sales-invoices')
                                                             @if($invoice->invoice_status_code == 'draft')
-                                                                <a href="{{ url('incomes/invoices/' . $invoice->id . '/sent') }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a>
+                                                                <a href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a>
                                                             @else
                                                                 <button type="button" class="btn btn-secondary btn-sm header-button-top" disabled="disabled">
                                                                     <span class="text-disabled">{{ trans('invoices.mark_sent') }}</span>
@@ -103,7 +103,7 @@
 
                                                     @stack('timeline_body_send_invoice_body_button_email_start')
                                                         @if($invoice->contact_email)
-                                                            <a href="{{ url('incomes/invoices/' . $invoice->id . '/email') }}" class="btn btn-warning btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
+                                                            <a href="{{ url('sales/invoices/' . $invoice->id . '/email') }}" class="btn btn-warning btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
                                                         @else
                                                             <button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
                                                                 <span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@@ -151,7 +151,7 @@
 
                                             <div class="mt-3">
                                                 @stack('timeline_body_get_paid_body_button_pay_start')
-                                                    @permission('update-incomes-invoices')
+                                                    @permission('update-sales-invoices')
                                                         <a href="{{ route('invoices.paid', $invoice->id) }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_paid') }}</a>
                                                     @endpermission
                                                 @stack('timeline_body_get_paid_body_button_pay_end')
@@ -436,14 +436,14 @@
                     <div class="float-right">
                         @stack('button_edit_start')
                             @if(!$invoice->reconciled)
-                                <a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info header-button-top">
+                                <a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info header-button-top">
                                     <i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
                                 </a>
                             @endif
                         @stack('button_edit_end')
 
                         @stack('button_print_start')
-                            <a href="{{ url('incomes/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success header-button-top">
+                            <a href="{{ url('sales/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success header-button-top">
                                 <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
                             </a>
                         @stack('button_print_end')
@@ -460,8 +460,8 @@
                                 <div class="dropdown-menu" role="menu">
                                     @stack('button_pay_start')
                                         @if($invoice->status->code != 'paid')
-                                            @permission('update-incomes-invoices')
-                                                <a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a>
+                                            @permission('update-sales-invoices')
+                                                <a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a>
                                             @endpermission
 
                                             @if(empty($invoice->paid) || ($invoice->paid != $invoice->amount))
@@ -472,9 +472,9 @@
                                     @stack('button_pay_end')
 
                                     @stack('button_sent_start')
-                                        @permission('update-incomes-invoices')
+                                        @permission('update-sales-invoices')
                                             @if($invoice->invoice_status_code == 'draft')
-                                                <a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/sent') }}">{{ trans('invoices.mark_sent') }}</a>
+                                                <a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}">{{ trans('invoices.mark_sent') }}</a>
                                             @else
                                                 <button type="button" class="dropdown-item" disabled="disabled"><span class="text-disabled">{{ trans('invoices.mark_sent') }}</span></button>
                                             @endif
@@ -483,7 +483,7 @@
 
                                     @stack('button_email_start')
                                         @if($invoice->contact_email)
-                                            <a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/email') }}">{{ trans('invoices.send_mail') }}</a>
+                                            <a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/email') }}">{{ trans('invoices.send_mail') }}</a>
                                         @else
                                             <button type="button" class="dropdown-item" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
                                                 <span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@@ -492,13 +492,13 @@
                                     @stack('button_email_end')
 
                                     @stack('button_pdf_start')
-                                        <a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/pdf') }}">{{ trans('invoices.download_pdf') }}</a>
+                                        <a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pdf') }}">{{ trans('invoices.download_pdf') }}</a>
                                     @stack('button_pdf_end')
 
                                     @stack('button_delete_start')
-                                        @permission('delete-incomes-invoices')
+                                        @permission('delete-sales-invoices')
                                             @if(!$invoice->reconciled)
-                                                {!! Form::deleteLink($invoice, 'incomes/invoices') !!}
+                                                {!! Form::deleteLink($invoice, 'sales/invoices') !!}
                                             @endif
                                         @endpermission
                                     @stack('button_delete_end')
@@ -664,5 +664,5 @@
 @endpush
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
similarity index 94%
rename from resources/views/incomes/revenues/create.blade.php
rename to resources/views/sales/revenues/create.blade.php
index 9ac831980..d1529cef0 100644
--- a/resources/views/incomes/revenues/create.blade.php
+++ b/resources/views/sales/revenues/create.blade.php
@@ -46,7 +46,7 @@
 
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons('incomes/revenues') }}
+                    {{ Form::saveButtons('sales/revenues') }}
                 </div>
             </div>
 
@@ -56,5 +56,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
similarity index 94%
rename from resources/views/incomes/revenues/edit.blade.php
rename to resources/views/sales/revenues/edit.blade.php
index c422be440..73b2853af 100644
--- a/resources/views/incomes/revenues/edit.blade.php
+++ b/resources/views/sales/revenues/edit.blade.php
@@ -59,10 +59,10 @@
                 </div>
             </div>
 
-            @permission('update-incomes-revenues')
+            @permission('update-sales-revenues')
                 <div class="card-footer">
                     <div class="row float-right">
-                        {{ Form::saveButtons('incomes/revenues') }}
+                        {{ Form::saveButtons('sales/revenues') }}
                     </div>
                 </div>
             @endpermission
@@ -73,5 +73,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/resources/views/incomes/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
similarity index 92%
rename from resources/views/incomes/revenues/index.blade.php
rename to resources/views/sales/revenues/index.blade.php
index 21256918f..9e881a5ad 100644
--- a/resources/views/incomes/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -3,9 +3,9 @@
 @section('title', trans_choice('general.revenues', 2))
 
 @section('new_button')
-    @permission('create-incomes-revenues')
+    @permission('create-sales-revenues')
         <span><a href="{{ route('revenues.create') }}" class="btn btn-primary btn-sm btn-success header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-        <span><a href="{{ url('common/import/incomes/revenues') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
+        <span><a href="{{ url('common/import/sales/revenues') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
     @endpermission
     <span><a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
 @endsection
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
                 {!! Form::open([
-                    'url' => 'incomes/revenues',
+                    'url' => 'sales/revenues',
                     'role' => 'form',
                     'method' => 'GET',
                     'class' => 'mb-0'
@@ -27,7 +27,7 @@
                         </div>
                     </div>
 
-                    {{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, 'incomes/revenues') }}
+                    {{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, 'sales/revenues') }}
                 {!! Form::close() !!}
             </div>
 
@@ -70,14 +70,14 @@
                                                     <a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                                     <div class="dropdown-divider"></div>
                                                 @endif
-                                                @permission('create-incomes-revenues')
+                                                @permission('create-sales-revenues')
                                                     <a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                                 @endpermission
 
-                                                @permission('delete-incomes-revenues')
+                                                @permission('delete-sales-revenues')
                                                     @if (!$item->reconciled)
                                                         <div class="dropdown-divider"></div>
-                                                        {!! Form::deleteLink($item, 'incomes/revenues') !!}
+                                                        {!! Form::deleteLink($item, 'sales/revenues') !!}
                                                     @endif
                                                 @endpermission
                                             </div>
@@ -103,12 +103,12 @@
             </div>
         </div>
     @else
-        @include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'incomes/revenues'])
+        @include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'sales/revenues'])
     @endif
 
 
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
 @endpush
diff --git a/routes/admin.php b/routes/admin.php
index 4a03c2353..412935ded 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -52,57 +52,57 @@ Route::group(['prefix' => 'auth'], function () {
     Route::resource('permissions', 'Auth\Permissions');
 });
 
-Route::group(['prefix' => 'incomes'], function () {
-    Route::get('invoices/{invoice}/sent', 'Incomes\Invoices@markSent')->name('invoices.sent');
-    Route::get('invoices/{invoice}/email', 'Incomes\Invoices@emailInvoice')->name('invoices.email');
-    Route::get('invoices/{invoice}/pay', 'Incomes\Invoices@markPaid')->name('invoices.paid');
-    Route::get('invoices/{invoice}/print', 'Incomes\Invoices@printInvoice')->name('invoices.print');
-    Route::get('invoices/{invoice}/pdf', 'Incomes\Invoices@pdfInvoice')->name('invoices.pdf');
-    Route::get('invoices/{invoice}/duplicate', 'Incomes\Invoices@duplicate')->name('invoices.duplicate');
-    Route::get('invoices/addItem', 'Incomes\Invoices@addItem')->middleware(['money'])->name('invoice.add.item');
-    Route::post('invoices/import', 'Incomes\Invoices@import')->name('invoices.import');
-    Route::get('invoices/export', 'Incomes\Invoices@export')->name('invoices.export');
-    Route::resource('invoices', 'Incomes\Invoices', ['middleware' => ['date.format', 'money']]);
+Route::group(['prefix' => 'sales'], function () {
+    Route::get('invoices/{invoice}/sent', 'Sales\Invoices@markSent')->name('invoices.sent');
+    Route::get('invoices/{invoice}/email', 'Sales\Invoices@emailInvoice')->name('invoices.email');
+    Route::get('invoices/{invoice}/pay', 'Sales\Invoices@markPaid')->name('invoices.paid');
+    Route::get('invoices/{invoice}/print', 'Sales\Invoices@printInvoice')->name('invoices.print');
+    Route::get('invoices/{invoice}/pdf', 'Sales\Invoices@pdfInvoice')->name('invoices.pdf');
+    Route::get('invoices/{invoice}/duplicate', 'Sales\Invoices@duplicate')->name('invoices.duplicate');
+    Route::get('invoices/addItem', 'Sales\Invoices@addItem')->middleware(['money'])->name('invoice.add.item');
+    Route::post('invoices/import', 'Sales\Invoices@import')->name('invoices.import');
+    Route::get('invoices/export', 'Sales\Invoices@export')->name('invoices.export');
+    Route::resource('invoices', 'Sales\Invoices', ['middleware' => ['date.format', 'money']]);
 
-    Route::get('revenues/{revenue}/duplicate', 'Incomes\Revenues@duplicate')->name('revenues.duplicate');
-    Route::post('revenues/import', 'Incomes\Revenues@import')->name('revenues.import');
-    Route::get('revenues/export', 'Incomes\Revenues@export')->name('revenues.export');
-    Route::resource('revenues', 'Incomes\Revenues', ['middleware' => ['date.format', 'money']]);
+    Route::get('revenues/{revenue}/duplicate', 'Sales\Revenues@duplicate')->name('revenues.duplicate');
+    Route::post('revenues/import', 'Sales\Revenues@import')->name('revenues.import');
+    Route::get('revenues/export', 'Sales\Revenues@export')->name('revenues.export');
+    Route::resource('revenues', 'Sales\Revenues', ['middleware' => ['date.format', 'money']]);
 
-    Route::get('customers/currency', 'Incomes\Customers@currency');
-    Route::get('customers/{customer}/duplicate', 'Incomes\Customers@duplicate')->name('customers.duplicate');
-    Route::post('customers/field', 'Incomes\Customers@field')->name('customers.field');
-    Route::post('customers/import', 'Incomes\Customers@import')->name('customers.import');
-    Route::get('customers/export', 'Incomes\Customers@export')->name('customers.export');
-    Route::get('customers/{customer}/enable', 'Incomes\Customers@enable')->name('customers.enable');
-    Route::get('customers/{customer}/disable', 'Incomes\Customers@disable')->name('customers.disable');
-    Route::get('customers/{customer}/currency', 'Incomes\Customers@currency')->name('customers.currency');
-    Route::resource('customers', 'Incomes\Customers');
+    Route::get('customers/currency', 'Sales\Customers@currency');
+    Route::get('customers/{customer}/duplicate', 'Sales\Customers@duplicate')->name('customers.duplicate');
+    Route::post('customers/field', 'Sales\Customers@field')->name('customers.field');
+    Route::post('customers/import', 'Sales\Customers@import')->name('customers.import');
+    Route::get('customers/export', 'Sales\Customers@export')->name('customers.export');
+    Route::get('customers/{customer}/enable', 'Sales\Customers@enable')->name('customers.enable');
+    Route::get('customers/{customer}/disable', 'Sales\Customers@disable')->name('customers.disable');
+    Route::get('customers/{customer}/currency', 'Sales\Customers@currency')->name('customers.currency');
+    Route::resource('customers', 'Sales\Customers');
 });
 
-Route::group(['prefix' => 'expenses'], function () {
-    Route::get('bills/{bill}/received', 'Expenses\Bills@markReceived')->name('bills.received');
-    Route::get('bills/{bill}/print', 'Expenses\Bills@printBill')->name('bills.print');
-    Route::get('bills/{bill}/pdf', 'Expenses\Bills@pdfBill')->name('bills.pdf');
-    Route::get('bills/{bill}/duplicate', 'Expenses\Bills@duplicate')->name('bills.duplicate');
-    Route::get('bills/addItem', 'Expenses\Bills@addItem')->middleware(['money'])->name('bill.add.item');
-    Route::post('bills/import', 'Expenses\Bills@import')->name('bills.import');
-    Route::get('bills/export', 'Expenses\Bills@export')->name('bills.export');
-    Route::resource('bills', 'Expenses\Bills', ['middleware' => ['date.format', 'money']]);
+Route::group(['prefix' => 'purchases'], function () {
+    Route::get('bills/{bill}/received', 'Purchases\Bills@markReceived')->name('bills.received');
+    Route::get('bills/{bill}/print', 'Purchases\Bills@printBill')->name('bills.print');
+    Route::get('bills/{bill}/pdf', 'Purchases\Bills@pdfBill')->name('bills.pdf');
+    Route::get('bills/{bill}/duplicate', 'Purchases\Bills@duplicate')->name('bills.duplicate');
+    Route::get('bills/addItem', 'Purchases\Bills@addItem')->middleware(['money'])->name('bill.add.item');
+    Route::post('bills/import', 'Purchases\Bills@import')->name('bills.import');
+    Route::get('bills/export', 'Purchases\Bills@export')->name('bills.export');
+    Route::resource('bills', 'Purchases\Bills', ['middleware' => ['date.format', 'money']]);
 
-    Route::get('payments/{payment}/duplicate', 'Expenses\Payments@duplicate')->name('payments.duplicate');
-    Route::post('payments/import', 'Expenses\Payments@import')->name('payments.import');
-    Route::get('payments/export', 'Expenses\Payments@export')->name('payments.export');
-    Route::resource('payments', 'Expenses\Payments', ['middleware' => ['date.format', 'money']]);
+    Route::get('payments/{payment}/duplicate', 'Purchases\Payments@duplicate')->name('payments.duplicate');
+    Route::post('payments/import', 'Purchases\Payments@import')->name('payments.import');
+    Route::get('payments/export', 'Purchases\Payments@export')->name('payments.export');
+    Route::resource('payments', 'Purchases\Payments', ['middleware' => ['date.format', 'money']]);
 
-    Route::get('vendors/currency', 'Expenses\Vendors@currency');
-    Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate')->name('vendors.duplicate');
-    Route::post('vendors/import', 'Expenses\Vendors@import')->name('vendors.import');
-    Route::get('vendors/export', 'Expenses\Vendors@export')->name('vendors.export');
-    Route::get('vendors/{vendor}/enable', 'Expenses\Vendors@enable')->name('vendors.enable');
-    Route::get('vendors/{vendor}/currency', 'Expenses\Vendors@currency')->name('vendors.currency');
-    Route::get('vendors/{vendor}/disable', 'Expenses\Vendors@disable')->name('vendors.disable');
-    Route::resource('vendors', 'Expenses\Vendors');
+    Route::get('vendors/currency', 'Purchases\Vendors@currency');
+    Route::get('vendors/{vendor}/duplicate', 'Purchases\Vendors@duplicate')->name('vendors.duplicate');
+    Route::post('vendors/import', 'Purchases\Vendors@import')->name('vendors.import');
+    Route::get('vendors/export', 'Purchases\Vendors@export')->name('vendors.export');
+    Route::get('vendors/{vendor}/enable', 'Purchases\Vendors@enable')->name('vendors.enable');
+    Route::get('vendors/{vendor}/currency', 'Purchases\Vendors@currency')->name('vendors.currency');
+    Route::get('vendors/{vendor}/disable', 'Purchases\Vendors@disable')->name('vendors.disable');
+    Route::resource('vendors', 'Purchases\Vendors');
 });
 
 Route::group(['prefix' => 'banking'], function () {
diff --git a/routes/api.php b/routes/api.php
index 310e732de..a1fdb2e59 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -20,13 +20,13 @@ $api->version('v1', ['middleware' => ['api']], function($api) {
         $api->get('contacts/{contact}/disable', 'Common\Contacts@disable')->name('contacts.disable');
         $api->resource('contacts', 'Common\Contacts');
 
-        // Incomes
-        $api->resource('invoices', 'Incomes\Invoices');
-        $api->resource('invoices.transactions', 'Incomes\InvoiceTransactions');
+        // Sales
+        $api->resource('invoices', 'Sales\Invoices');
+        $api->resource('invoices.transactions', 'Sales\InvoiceTransactions');
 
-        // Expenses
-        $api->get('bills/{bill}/received', 'Expenses\Bills@received')->name('bills.received');
-        $api->resource('bills', 'Expenses\Bills');
+        // Purchases
+        $api->get('bills/{bill}/received', 'Purchases\Bills@received')->name('bills.received');
+        $api->resource('bills', 'Purchases\Bills');
 
         // Banking
         $api->get('accounts/{account}/enable', 'Banking\Accounts@enable')->name('accounts.enable');
diff --git a/tests/Feature/Commands/BillReminderTest.php b/tests/Feature/Commands/BillReminderTest.php
index 2c521c52c..fa3f44f3e 100644
--- a/tests/Feature/Commands/BillReminderTest.php
+++ b/tests/Feature/Commands/BillReminderTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Commands;
 
-use App\Jobs\Expense\CreateBill;
-use App\Notifications\Expense\Bill as BillNotification;
+use App\Jobs\Purchase\CreateBill;
+use App\Notifications\Purchase\Bill as BillNotification;
 use Illuminate\Support\Facades\Notification as Notification;
 use Jenssegers\Date\Date;
 use Tests\Feature\FeatureTestCase;
diff --git a/tests/Feature/Commands/InvoiceReminderTest.php b/tests/Feature/Commands/InvoiceReminderTest.php
index c47982a73..64e24914e 100644
--- a/tests/Feature/Commands/InvoiceReminderTest.php
+++ b/tests/Feature/Commands/InvoiceReminderTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Commands;
 
-use App\Jobs\Income\CreateInvoice;
-use App\Notifications\Income\Invoice as InvoiceNotification;
+use App\Jobs\Sale\CreateInvoice;
+use App\Notifications\Sale\Invoice as InvoiceNotification;
 use Illuminate\Support\Facades\Notification;
 use Jenssegers\Date\Date;
 use Tests\Feature\FeatureTestCase;
diff --git a/tests/Feature/Expenses/BillsTest.php b/tests/Feature/Purchases/BillsTest.php
similarity index 98%
rename from tests/Feature/Expenses/BillsTest.php
rename to tests/Feature/Purchases/BillsTest.php
index d5f96852f..d60ffea78 100644
--- a/tests/Feature/Expenses/BillsTest.php
+++ b/tests/Feature/Purchases/BillsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Feature\Expenses;
+namespace Tests\Feature\Purchases;
 
-use App\Jobs\Expense\CreateBill;
+use App\Jobs\Purchase\CreateBill;
 use Tests\Feature\FeatureTestCase;
 
 class BillsTest extends FeatureTestCase
diff --git a/tests/Feature/Expenses/PaymentsTest.php b/tests/Feature/Purchases/PaymentsTest.php
similarity index 97%
rename from tests/Feature/Expenses/PaymentsTest.php
rename to tests/Feature/Purchases/PaymentsTest.php
index 479a47033..ea5d1d931 100644
--- a/tests/Feature/Expenses/PaymentsTest.php
+++ b/tests/Feature/Purchases/PaymentsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Expenses;
+namespace Tests\Feature\Purchases;
 
 use App\Jobs\Banking\CreateTransaction;
 use App\Models\Banking\Transaction;
diff --git a/tests/Feature/Expenses/VendorsTest.php b/tests/Feature/Purchases/VendorsTest.php
similarity index 98%
rename from tests/Feature/Expenses/VendorsTest.php
rename to tests/Feature/Purchases/VendorsTest.php
index a577c13a9..df750651e 100644
--- a/tests/Feature/Expenses/VendorsTest.php
+++ b/tests/Feature/Purchases/VendorsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Expenses;
+namespace Tests\Feature\Purchases;
 
 use App\Jobs\Common\CreateContact;
 use Tests\Feature\FeatureTestCase;
diff --git a/tests/Feature/Incomes/CustomersTest.php b/tests/Feature/Sales/CustomersTest.php
similarity index 99%
rename from tests/Feature/Incomes/CustomersTest.php
rename to tests/Feature/Sales/CustomersTest.php
index 13e35dc41..588de9486 100644
--- a/tests/Feature/Incomes/CustomersTest.php
+++ b/tests/Feature/Sales/CustomersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Incomes;
+namespace Tests\Feature\Sales;
 
 use App\Jobs\Common\CreateContact;
 use App\Models\Auth\User;
diff --git a/tests/Feature/Incomes/InvoicesTest.php b/tests/Feature/Sales/InvoicesTest.php
similarity index 98%
rename from tests/Feature/Incomes/InvoicesTest.php
rename to tests/Feature/Sales/InvoicesTest.php
index 5f76625ff..95e2d5ccd 100644
--- a/tests/Feature/Incomes/InvoicesTest.php
+++ b/tests/Feature/Sales/InvoicesTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Feature\Incomes;
+namespace Tests\Feature\Sales;
 
-use App\Jobs\Income\CreateInvoice;
+use App\Jobs\Sale\CreateInvoice;
 use Tests\Feature\FeatureTestCase;
 
 class InvoicesTest extends FeatureTestCase
diff --git a/tests/Feature/Incomes/RevenuesTest.php b/tests/Feature/Sales/RevenuesTest.php
similarity index 98%
rename from tests/Feature/Incomes/RevenuesTest.php
rename to tests/Feature/Sales/RevenuesTest.php
index 3fe9104ee..5f0230ebf 100644
--- a/tests/Feature/Incomes/RevenuesTest.php
+++ b/tests/Feature/Sales/RevenuesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Incomes;
+namespace Tests\Feature\Sales;
 
 use App\Jobs\Banking\CreateTransaction;
 use App\Models\Banking\Transaction;
diff --git a/webpack.mix.js b/webpack.mix.js
index 4cb8808b7..abf88d8c1 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -35,15 +35,15 @@ mix
     .js('resources/assets/js/views/common/reports.js', 'public/js/common')
     .js('resources/assets/js/views/common/search.js', 'public/js/common')
 
-    // Expenses
-    .js('resources/assets/js/views/expenses/bills.js', 'public/js/expenses')
-    .js('resources/assets/js/views/expenses/payments.js', 'public/js/expenses')
-    .js('resources/assets/js/views/expenses/vendors.js', 'public/js/expenses')
+    // Sales
+    .js('resources/assets/js/views/sales/invoices.js', 'public/js/sales')
+    .js('resources/assets/js/views/sales/revenues.js', 'public/js/sales')
+    .js('resources/assets/js/views/sales/customers.js', 'public/js/sales')
 
-    // Incomes
-    .js('resources/assets/js/views/incomes/invoices.js', 'public/js/incomes')
-    .js('resources/assets/js/views/incomes/revenues.js', 'public/js/incomes')
-    .js('resources/assets/js/views/incomes/customers.js', 'public/js/incomes')
+    // Purchases
+    .js('resources/assets/js/views/purchases/bills.js', 'public/js/purchases')
+    .js('resources/assets/js/views/purchases/payments.js', 'public/js/purchases')
+    .js('resources/assets/js/views/purchases/vendors.js', 'public/js/purchases')
 
     // Install
     .js('resources/assets/js/install.js', 'public/js')