diff --git a/.gitignore b/.gitignore
index cb3842ff..a4dfdd60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /storage/file
+composer.lock
+yarn.lock
\ No newline at end of file
diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 4a0366b2..c07da1ce 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -12,7 +12,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
-abstract class AbstractControllerLogic
+abstract class AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/General/Eloquent/Filters/importer.php b/app/Classes/General/Eloquent/Filters/importer.php
deleted file mode 100644
index 13eb3311..00000000
--- a/app/Classes/General/Eloquent/Filters/importer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ModuleTypes;
-use Illuminate\Database\Eloquent\Builder;
-
-class Importer implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('modules', function ($query){
-            $query->where('module_type', ModuleTypes::IMPORTER);
-        });
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
index 62114ed7..198ee6df 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php
@@ -6,13 +6,13 @@ use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsOb
 use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
 use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
 use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class AuthenticateUserLogic extends AbstractControllerLogic
+class AuthenticateUserLogic extends AbstractControllersLogic
 {
 
     protected function notification():array {
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
index 6c0a7444..76cdc888 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CheckEmailLogic.php
@@ -7,13 +7,13 @@ use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
 use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CheckEmailLogic extends AbstractControllerLogic
+class CheckEmailLogic extends AbstractControllersLogic
 {
 
     protected function notification():array {
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php
index 77acdf8e..55b5152c 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateUserLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Accounts\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
 use App\Classes\Modules\Accounts\Services\CreatesUser;
@@ -30,7 +30,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateUserLogic extends AbstractControllerLogic
+class CreateUserLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
index 2899073d..8796765f 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/ListUsersLogic.php
@@ -4,13 +4,13 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Classes\Modules\Accounts\Services\ListsUsers;
 use App\Classes\Modules\Accounts\Standards\Rules\CanListUsers;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Http\Resources\UserResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListUsersLogic extends AbstractControllerLogic
+class ListUsersLogic extends AbstractControllersLogic
 {
 
     /**
@@ -30,7 +30,7 @@ class ListUsersLogic extends AbstractControllerLogic
     private $listsUsers;
 
     /**
-     * ListUsersControllerLogic constructor.
+     * ListUsersControllersLogic constructor.
      * @param CanListUsers $canListUser
      * @param ListsUsers $listsUsers
      */
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php b/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php
index 414ab066..3bd510c7 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/RegistrationStep2Logic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Http\Resources\UserResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 
@@ -31,7 +31,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class RegistrationStep2Logic extends AbstractControllerLogic
+class RegistrationStep2Logic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
index 979a93b9..368f34ce 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Http\Resources\UserResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 
@@ -31,7 +31,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateUserLogic extends AbstractControllerLogic
+class UpdateUserLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 7badc419..81531ca4 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
@@ -12,7 +12,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateAddressLogic extends AbstractControllerLogic
+class CreateAddressLogic extends AbstractControllersLogic
 {
 
     /**
@@ -32,7 +32,7 @@ class CreateAddressLogic extends AbstractControllerLogic
     private $createsAddress;
 
     /**
-     * CreateAddressControllerLogic constructor.
+     * CreateAddressControllersLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param CreatesAddress $createsAddress
      */
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
index eed4f73d..b5f6753b 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanDeleteAddress;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteAddressLogic extends AbstractControllerLogic
+class DeleteAddressLogic extends AbstractControllersLogic
 {
     /**
      * @return array
@@ -34,7 +34,7 @@ class DeleteAddressLogic extends AbstractControllerLogic
         private $fetchesAddress;
 
     /**
-     * DeleteAddressControllerLogic constructor.
+     * DeleteAddressControllersLogic constructor.
      * @param CanDeleteAddress $canDeleteAddress
      * @param DeletesAddress $deletesAddress
      * @param FetchesAddress $fetchesAddress
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
index 6ca4bc5a..84b4b1a3 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanFetchAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
@@ -12,7 +12,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchAddressLogic extends AbstractControllerLogic
+class FetchAddressLogic extends AbstractControllersLogic
 {
 
     /**
@@ -32,7 +32,7 @@ class FetchAddressLogic extends AbstractControllerLogic
     private $fetchesAddress;
 
     /**
-     * FetchAddressControllerLogic constructor.
+     * FetchAddressControllersLogic constructor.
      * @param CanFetchAddress $canFetchAddress
      * @param FetchesAddress $fetchesAddress
      */
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
index 57e3a2f0..24a7b932 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
 use App\Http\Resources\AddressResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListAddressesLogic extends AbstractControllerLogic
+class ListAddressesLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index aa7b4434..3b4937d5 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Addresses\Services\UpdatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
@@ -13,7 +13,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateAddressLogic extends AbstractControllerLogic
+class UpdateAddressLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Bookings/ControllerLogic/CreateBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
similarity index 97%
rename from app/Classes/Modules/Bookings/ControllerLogic/CreateBookingLogic.php
rename to app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
index 75a9b3e0..88f82349 100644
--- a/app/Classes/Modules/Bookings/ControllerLogic/CreateBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
@@ -20,7 +20,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateBookingLogic extends AbstractControllerLogic
+class CreateBookingLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Bookings/ControllerLogic/DeleteBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
similarity index 94%
rename from app/Classes/Modules/Bookings/ControllerLogic/DeleteBookingLogic.php
rename to app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
index dd9a7211..fc4b447b 100644
--- a/app/Classes/Modules/Bookings/ControllerLogic/DeleteBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DeleteBookingLogic.php
@@ -6,7 +6,7 @@ use App\Classes\Modules\Segments\Services\UpdatesSegment;
 use App\Classes\Modules\Segments\Standards\Rules\CanUpdateSegment;
 use App\Http\Resources\BookingResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
 
@@ -19,7 +19,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteBookingLogic extends AbstractControllerLogic
+class DeleteBookingLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Bookings/ControllerLogic/UpdateBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
similarity index 95%
rename from app/Classes/Modules/Bookings/ControllerLogic/UpdateBookingLogic.php
rename to app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
index 5db55b0d..f38788bb 100644
--- a/app/Classes/Modules/Bookings/ControllerLogic/UpdateBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 use App\Http\Resources\BookingResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateBookingLogic extends AbstractControllerLogic
+class UpdateBookingLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Companies/ControllerLogic/CreateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
similarity index 91%
rename from app/Classes/Modules/Companies/ControllerLogic/CreateCompanyLogic.php
rename to app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
index 7f9c25a3..62292083 100644
--- a/app/Classes/Modules/Companies/ControllerLogic/CreateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
@@ -3,14 +3,14 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Http\Resources\CompanyResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateCompanyLogic extends AbstractControllerLogic
+class CreateCompanyLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Companies/ControllerLogic/DeleteCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
similarity index 93%
rename from app/Classes/Modules/Companies/ControllerLogic/DeleteCompanyLogic.php
rename to app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
index 83d3548b..aa4ea625 100644
--- a/app/Classes/Modules/Companies/ControllerLogic/DeleteCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/DeleteCompanyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Companies\Services\DeletesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanDeleteCompany;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteCompanyLogic extends AbstractControllerLogic
+class DeleteCompanyLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Companies/ControllerLogic/FetchCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
similarity index 90%
rename from app/Classes/Modules/Companies/ControllerLogic/FetchCompanyLogic.php
rename to app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
index bf1db91a..b64ac700 100644
--- a/app/Classes/Modules/Companies/ControllerLogic/FetchCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanFetchCompany;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
@@ -12,7 +12,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchCompanyLogic extends AbstractControllerLogic
+class FetchCompanyLogic extends AbstractControllersLogic
 {
 
     /**
@@ -32,7 +32,7 @@ class FetchCompanyLogic extends AbstractControllerLogic
     private $fetchesCompany;
 
     /**
-     * FetchCompanyControllerLogic constructor.
+     * FetchCompanyControllersLogic constructor.
      * @param CanFetchCompany $canFetchCompany
      * @param FetchesCompany $fetchesCompany
      */
diff --git a/app/Classes/Modules/Companies/ControllerLogic/ListCompaniesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
similarity index 87%
rename from app/Classes/Modules/Companies/ControllerLogic/ListCompaniesLogic.php
rename to app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
index 96c54464..dbfd108c 100644
--- a/app/Classes/Modules/Companies/ControllerLogic/ListCompaniesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Classes\Modules\Companies\ControllerLogic;
+namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Companies\Services\ListsCompanies;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
 use App\Http\Resources\CompanyResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListCompaniesLogic extends AbstractControllerLogic
+class ListCompaniesLogic extends AbstractControllersLogic
 {
 
     /**
@@ -31,7 +31,7 @@ class ListCompaniesLogic extends AbstractControllerLogic
     private $listsCompanies;
 
     /**
-     * ListCompaniesControllerLogic constructor.
+     * ListCompaniesControllersLogic constructor.
      * @param CanListCompanies $canListCompanies
      * @param ListsCompanies $listsCompanies
      */
diff --git a/app/Classes/Modules/Companies/ControllerLogic/UpdateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
similarity index 92%
rename from app/Classes/Modules/Companies/ControllerLogic/UpdateCompanyLogic.php
rename to app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
index edd078bc..597d2ede 100644
--- a/app/Classes/Modules/Companies/ControllerLogic/UpdateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
@@ -13,7 +13,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateCompanyLogic extends AbstractControllerLogic
+class UpdateCompanyLogic extends AbstractControllersLogic
 {
 
     /**
@@ -36,7 +36,7 @@ class UpdateCompanyLogic extends AbstractControllerLogic
     private $fetchesCompany;
 
     /**
-     * UpdateCompanyControllerLogic constructor.
+     * UpdateCompanyControllersLogic constructor.
      * @param CanUpdateCompany $canUpdateCompany
      * @param UpdatesCompany $updatesCompany
      * @param FetchesCompany $fetchesCompany
diff --git a/app/Classes/Modules/CompanyBanks/ControllerLogic/CreateCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php
similarity index 95%
rename from app/Classes/Modules/CompanyBanks/ControllerLogic/CreateCompanyBankLogic.php
rename to app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php
index 06c538f9..c6188a90 100644
--- a/app/Classes/Modules/CompanyBanks/ControllerLogic/CreateCompanyBankLogic.php
+++ b/app/Classes/Modules/CompanyBanks/ControllersLogic/CreateCompanyBankLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\CompanyBanks\Standards\Rules\CanCreateCompanyBank;
 use App\Classes\Modules\CompanyBanks\Services\CreatesCompanyBank;
@@ -14,7 +14,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateCompanyBankLogic extends AbstractControllerLogic
+class CreateCompanyBankLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/CompanyBanks/ControllerLogic/DeleteCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php
similarity index 94%
rename from app/Classes/Modules/CompanyBanks/ControllerLogic/DeleteCompanyBankLogic.php
rename to app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php
index e38e5db0..4c33e308 100644
--- a/app/Classes/Modules/CompanyBanks/ControllerLogic/DeleteCompanyBankLogic.php
+++ b/app/Classes/Modules/CompanyBanks/ControllersLogic/DeleteCompanyBankLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
 
 use App\Http\Resources\CompanyBankResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteCompanyBankLogic extends AbstractControllerLogic
+class DeleteCompanyBankLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/CompanyBanks/ControllerLogic/UpdateCompanyBankLogic.php b/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php
similarity index 95%
rename from app/Classes/Modules/CompanyBanks/ControllerLogic/UpdateCompanyBankLogic.php
rename to app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php
index 8f74d5f7..b2b78ee5 100644
--- a/app/Classes/Modules/CompanyBanks/ControllerLogic/UpdateCompanyBankLogic.php
+++ b/app/Classes/Modules/CompanyBanks/ControllersLogic/UpdateCompanyBankLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\CompanyBanks\ControllersLogic;
 
 use App\Http\Resources\CompanyBankResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\CompanyBanks\Services\FetchesCompanyBank;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateCompanyBankLogic extends AbstractControllerLogic
+class UpdateCompanyBankLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Currencies/ControllerLogic/CreateCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
similarity index 95%
rename from app/Classes/Modules/Currencies/ControllerLogic/CreateCurrencyLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
index a1150831..81d7f9f8 100644
--- a/app/Classes/Modules/Currencies/ControllerLogic/CreateCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/CreateCurrencyLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Currencies\Standards\Rules\CanCreateCurrency;
 use App\Classes\Modules\Currencies\Services\CreatesCurrency;
@@ -15,7 +15,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateCurrencyLogic extends AbstractControllerLogic
+class CreateCurrencyLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Currencies/ControllerLogic/DeleteCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
similarity index 94%
rename from app/Classes/Modules/Currencies/ControllerLogic/DeleteCurrencyLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
index 6c9f374b..c08279db 100644
--- a/app/Classes/Modules/Currencies/ControllerLogic/DeleteCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/DeleteCurrencyLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 use App\Http\Resources\CurrencyResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteCurrencyLogic extends AbstractControllerLogic
+class DeleteCurrencyLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Currencies/ControllerLogic/ListCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
similarity index 93%
rename from app/Classes/Modules/Currencies/ControllerLogic/ListCurrencyLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
index 985dd5e1..e0bd11b3 100644
--- a/app/Classes/Modules/Currencies/ControllerLogic/ListCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/ListCurrencyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Currencies\Services\ListsCurrency;
 use App\Classes\Modules\Currencies\Standards\Rules\CanListCurrency;
 use App\Http\Resources\CurrencyResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListCurrencyLogic extends AbstractControllerLogic
+class ListCurrencyLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Currencies/ControllerLogic/RateCalculateCurrencyLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
similarity index 94%
rename from app/Classes/Modules/Currencies/ControllerLogic/RateCalculateCurrencyLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
index e9f04c0e..35686210 100644
--- a/app/Classes/Modules/Currencies/ControllerLogic/RateCalculateCurrencyLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/RateCalculateCurrencyLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
 
@@ -12,7 +12,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class RateCalculateCurrencyLogic extends AbstractControllerLogic
+class RateCalculateCurrencyLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Currencies/ControllerLogic/UpdateCurrencyRateLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/UpdateCurrencyRateLogic.php
similarity index 96%
rename from app/Classes/Modules/Currencies/ControllerLogic/UpdateCurrencyRateLogic.php
rename to app/Classes/Modules/Currencies/ControllersLogic/UpdateCurrencyRateLogic.php
index 635e832e..821bce3f 100644
--- a/app/Classes/Modules/Currencies/ControllerLogic/UpdateCurrencyRateLogic.php
+++ b/app/Classes/Modules/Currencies/ControllersLogic/UpdateCurrencyRateLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Currencies\ControllersLogic;
 
 use App\Http\Resources\CurrencyResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
 
@@ -18,7 +18,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateCurrencyRateLogic extends AbstractControllerLogic
+class UpdateCurrencyRateLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Documents/ControllerLogic/ApproveDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
similarity index 95%
rename from app/Classes/Modules/Documents/ControllerLogic/ApproveDocumentLogic.php
rename to app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
index 3b916ba1..ab3f33c1 100644
--- a/app/Classes/Modules/Documents/ControllerLogic/ApproveDocumentLogic.php
+++ b/app/Classes/Modules/Documents/ControllersLogic/ApproveDocumentLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Documents\ControllersLogic;
 
 use App\Http\Resources\DocumentResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
@@ -19,7 +19,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class ApproveDocumentLogic extends AbstractControllerLogic
+class ApproveDocumentLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Documents/ControllerLogic/ListDocumentLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
similarity index 94%
rename from app/Classes/Modules/Documents/ControllerLogic/ListDocumentLogic.php
rename to app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
index 9f293067..37bdf2f5 100644
--- a/app/Classes/Modules/Documents/ControllerLogic/ListDocumentLogic.php
+++ b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Documents\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Documents\Services\ListsDocuments;
 use App\Classes\Modules\Documents\Standards\Rules\CanListDocuments;
 use App\Http\Resources\DocumentResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListDocumentLogic extends AbstractControllerLogic
+class ListDocumentLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php b/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
index ef5a8e2c..fd4cd12c 100644
--- a/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
+++ b/app/Classes/Modules/Receipts/ControllersLogic/CreateReceiptLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Receipts\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceipt;
 use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceiptDetail;
@@ -26,7 +26,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateReceiptLogic extends AbstractControllerLogic
+class CreateReceiptLogic extends AbstractControllersLogic
 {
 
 
diff --git a/app/Classes/Modules/SegmentConstants/ControllerLogic/CreateSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php
similarity index 96%
rename from app/Classes/Modules/SegmentConstants/ControllerLogic/CreateSegmentConstantLogic.php
rename to app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php
index 990e7be6..a0bc7b80 100644
--- a/app/Classes/Modules/SegmentConstants/ControllerLogic/CreateSegmentConstantLogic.php
+++ b/app/Classes/Modules/SegmentConstants/ControllersLogic/CreateSegmentConstantLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
 use App\Classes\Modules\Segments\Services\FetchesSegment;
@@ -19,7 +19,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateSegmentConstantLogic extends AbstractControllerLogic
+class CreateSegmentConstantLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/SegmentConstants/ControllerLogic/ListStandardSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php
similarity index 96%
rename from app/Classes/Modules/SegmentConstants/ControllerLogic/ListStandardSegmentConstantLogic.php
rename to app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php
index 3ce065c1..40daa24d 100644
--- a/app/Classes/Modules/SegmentConstants/ControllerLogic/ListStandardSegmentConstantLogic.php
+++ b/app/Classes/Modules/SegmentConstants/ControllersLogic/ListStandardSegmentConstantLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\SegmentConstants\Services\ListsSegmentConstants;
 use App\Classes\Modules\SegmentConstants\Standards\Rules\CanListStandardSegmentConstants;
 use App\Http\Resources\SegmentResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListStandardSegmentConstantLogic extends AbstractControllerLogic
+class ListStandardSegmentConstantLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php
similarity index 95%
rename from app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateSegmentConstantLogic.php
rename to app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php
index 73250c47..2b15bba3 100644
--- a/app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateSegmentConstantLogic.php
+++ b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateSegmentConstantLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
 
@@ -18,7 +18,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateSegmentConstantLogic extends AbstractControllerLogic
+class UpdateSegmentConstantLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateStandardSegmentConstantLogic.php b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php
similarity index 97%
rename from app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateStandardSegmentConstantLogic.php
rename to app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php
index 55c4ea78..fd8f76a4 100644
--- a/app/Classes/Modules/SegmentConstants/ControllerLogic/UpdateStandardSegmentConstantLogic.php
+++ b/app/Classes/Modules/SegmentConstants/ControllersLogic/UpdateStandardSegmentConstantLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\SegmentConstants\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
 
@@ -18,7 +18,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateStandardSegmentConstantLogic extends AbstractControllerLogic
+class UpdateStandardSegmentConstantLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Segments/ControllerLogic/CreateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
similarity index 94%
rename from app/Classes/Modules/Segments/ControllerLogic/CreateSegmentLogic.php
rename to app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
index 557117c6..c37c876e 100644
--- a/app/Classes/Modules/Segments/ControllerLogic/CreateSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Segments\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Segments\Standards\Rules\CanCreateSegment;
 use App\Classes\Modules\Segments\Services\CreatesSegment;
@@ -14,7 +14,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateSegmentLogic extends AbstractControllerLogic
+class CreateSegmentLogic extends AbstractControllersLogic
 {
     /**
      * @return array
diff --git a/app/Classes/Modules/Segments/ControllerLogic/DeleteSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
similarity index 94%
rename from app/Classes/Modules/Segments/ControllerLogic/DeleteSegmentLogic.php
rename to app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
index 47c4f14a..4e6f9775 100644
--- a/app/Classes/Modules/Segments/ControllerLogic/DeleteSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 
 use App\Http\Resources\SegmentResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 
@@ -16,7 +16,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class DeleteSegmentLogic extends AbstractControllerLogic
+class DeleteSegmentLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Segments/ControllerLogic/ListStandardSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php
similarity index 92%
rename from app/Classes/Modules/Segments/ControllerLogic/ListStandardSegmentLogic.php
rename to app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php
index 6458962b..4eb1fdec 100644
--- a/app/Classes/Modules/Segments/ControllerLogic/ListStandardSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/ListStandardSegmentLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Segments\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 use App\Classes\Modules\Segments\Services\ListsSegments;
 use App\Classes\Modules\Segments\Standards\Rules\CanListStandardSegments;
 use App\Http\Resources\SegmentResource;
@@ -11,7 +11,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListStandardSegmentLogic extends AbstractControllerLogic
+class ListStandardSegmentLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Segments/ControllerLogic/UpdateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
similarity index 95%
rename from app/Classes/Modules/Segments/ControllerLogic/UpdateSegmentLogic.php
rename to app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
index 43eaa54e..39ebbb30 100644
--- a/app/Classes/Modules/Segments/ControllerLogic/UpdateSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 
 use App\Http\Resources\SegmentResource;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 
@@ -17,7 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class UpdateSegmentLogic extends AbstractControllerLogic
+class UpdateSegmentLogic extends AbstractControllersLogic
 {
 
     /**
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegments.php b/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
similarity index 100%
rename from app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegments.php
rename to app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
index 2984dd61..5bd0e4c5 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateTransactionLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransaction;
 use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransactionDetail;
@@ -24,7 +24,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateTransactionLogic extends AbstractControllerLogic
+class CreateTransactionLogic extends AbstractControllersLogic
 {
 
 
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
index d0401218..77ecdbc9 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
@@ -2,41 +2,19 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
-use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateCompanyWallet;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\CreatesWallet;
 use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Http\Resources\WalletResource;
-/*
-use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
-use App\Classes\Modules\Accounts\Services\CreatesUser;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
-use App\Http\Resources\UserResource;
 
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
-use App\Classes\Modules\Companies\Services\CreatesCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
-use App\Classes\Modules\Contacts\Services\CreatesContact;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-
-use App\Classes\Modules\CompanyEmployees\Standards\Rules\CanCreateCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\Services\CreatesCompanyEmployee;
-use App\Classes\Modules\CompanyEmployees\DataTransferObjects\CompanyEmployeeObject;
-
-use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\Services\CreatesSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
-*/
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateWalletLogic extends AbstractControllerLogic
+class CreateWalletLogic extends AbstractControllersLogic
 {
 
 
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
index ec5c003e..71713444 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\AbstractControllersLogic;
 
 use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
@@ -40,7 +40,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class CreateWalletTransactionLogic extends AbstractControllerLogic
+class CreateWalletTransactionLogic extends AbstractControllersLogic
 {
 
 
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
index aa1a49d1..e2569918 100644
--- a/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Classes\Modules\SegmentCompanies\Standards\Rules;
+namespace App\Classes\Modules\Wallets\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
 use App\Classes\Modules\SegmentCompanies\Standards\Validators\CompanyWalletValidation;
-use App\Classes\Modules\SegmentCompanies\Standards\Validators\SegmentCompanyValidation;
 
 class CanCreateCompanyWallet extends AbstractRule
 {
@@ -42,8 +41,9 @@ class CanCreateCompanyWallet extends AbstractRule
         return $this->companyWalletValidation->validate($object);
     }
 
+
     /**
-     * @param SegmentCompanyValidation $object
+     * @param $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php
index 5bd1f698..c924574d 100644
--- a/app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php
+++ b/app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Classes\Modules\SegmentCompanies\Standards\Validators;
+namespace App\Classes\Modules\Wallets\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\CompanyEmployeeObject;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 
 class CompanyWalletValidation extends AbstractValidation
diff --git a/app/Http/Controllers/Companies/ListCompaniesController.php b/app/Http/Controllers/Companies/ListCompaniesController.php
index 17cc6caf..25b8ae76 100644
--- a/app/Http/Controllers/Companies/ListCompaniesController.php
+++ b/app/Http/Controllers/Companies/ListCompaniesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Companies;
 
-use App\Classes\Modules\Companies\ControllerLogic\ListCompaniesLogic;
+use App\Classes\Modules\Companies\ControllersLogic\ListCompaniesLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Models/Country.php b/app/Models/Country.php
index 007aed5f..b1abd046 100644
--- a/app/Models/Country.php
+++ b/app/Models/Country.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 
diff --git a/app/Models/District.php b/app/Models/District.php
index 60930f98..4cd4c7e6 100644
--- a/app/Models/District.php
+++ b/app/Models/District.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/State.php b/app/Models/State.php
index b63f7d8e..7912a1d7 100644
--- a/app/Models/State.php
+++ b/app/Models/State.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\SoftDeletes;