From 233305ecb4b64eddc8e63d798ac255d272d735d5 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 13 Sep 2017 07:49:58 +0200
Subject: [PATCH] Change namespace of rules.

---
 .../Events/StoredJournalEventHandler.php      |  2 +-
 .../Events/UpdatedJournalEventHandler.php     |  2 +-
 app/Http/Controllers/RuleController.php       |  2 +-
 app/Import/Storage/ImportSupport.php          |  2 +-
 ...ExecuteRuleGroupOnExistingTransactions.php |  2 +-
 .../ExecuteRuleOnExistingTransactions.php     |  2 +-
 app/Rules/Uppercase.php                       | 40 -------------------
 .../Actions/ActionInterface.php               |  4 +-
 .../Actions/AddTag.php                        |  4 +-
 .../Actions/AppendDescription.php             |  4 +-
 .../Actions/ClearBudget.php                   |  4 +-
 .../Actions/ClearCategory.php                 |  4 +-
 .../Actions/PrependDescription.php            |  4 +-
 .../Actions/RemoveAllTags.php                 |  4 +-
 .../Actions/RemoveTag.php                     |  4 +-
 .../Actions/SetBudget.php                     |  4 +-
 .../Actions/SetCategory.php                   |  4 +-
 .../Actions/SetDescription.php                |  4 +-
 .../Actions/SetDestinationAccount.php         |  4 +-
 .../Actions/SetSourceAccount.php              |  4 +-
 .../Factory/ActionFactory.php                 |  8 ++--
 .../Factory/TriggerFactory.php                | 10 ++---
 app/{Rules => TransactionRules}/Processor.php | 12 +++---
 .../TransactionMatcher.php                    |  4 +-
 .../Triggers/AbstractTrigger.php              |  4 +-
 .../Triggers/AmountExactly.php                |  4 +-
 .../Triggers/AmountLess.php                   |  4 +-
 .../Triggers/AmountMore.php                   |  4 +-
 .../Triggers/BudgetIs.php                     |  4 +-
 .../Triggers/CategoryIs.php                   |  4 +-
 .../Triggers/DescriptionContains.php          |  4 +-
 .../Triggers/DescriptionEnds.php              |  4 +-
 .../Triggers/DescriptionIs.php                |  4 +-
 .../Triggers/DescriptionStarts.php            |  4 +-
 .../Triggers/FromAccountContains.php          |  4 +-
 .../Triggers/FromAccountEnds.php              |  4 +-
 .../Triggers/FromAccountIs.php                |  4 +-
 .../Triggers/FromAccountStarts.php            |  4 +-
 .../Triggers/HasAnyBudget.php                 |  4 +-
 .../Triggers/HasAnyCategory.php               |  4 +-
 .../Triggers/HasAnyTag.php                    |  4 +-
 .../Triggers/HasAttachment.php                |  2 +-
 .../Triggers/HasNoBudget.php                  |  4 +-
 .../Triggers/HasNoCategory.php                |  4 +-
 .../Triggers/HasNoTag.php                     |  4 +-
 .../Triggers/TagIs.php                        |  4 +-
 .../Triggers/ToAccountContains.php            |  4 +-
 .../Triggers/ToAccountEnds.php                |  4 +-
 .../Triggers/ToAccountIs.php                  |  4 +-
 .../Triggers/ToAccountStarts.php              |  4 +-
 .../Triggers/TransactionType.php              |  4 +-
 .../Triggers/TriggerInterface.php             |  4 +-
 .../Triggers/UserAction.php                   |  4 +-
 app/Validation/FireflyValidator.php           |  2 +-
 .../Controllers/RuleControllerTest.php        |  2 +-
 55 files changed, 108 insertions(+), 148 deletions(-)
 delete mode 100644 app/Rules/Uppercase.php
 rename app/{Rules => TransactionRules}/Actions/ActionInterface.php (88%)
 rename app/{Rules => TransactionRules}/Actions/AddTag.php (94%)
 rename app/{Rules => TransactionRules}/Actions/AppendDescription.php (92%)
 rename app/{Rules => TransactionRules}/Actions/ClearBudget.php (91%)
 rename app/{Rules => TransactionRules}/Actions/ClearCategory.php (91%)
 rename app/{Rules => TransactionRules}/Actions/PrependDescription.php (92%)
 rename app/{Rules => TransactionRules}/Actions/RemoveAllTags.php (91%)
 rename app/{Rules => TransactionRules}/Actions/RemoveTag.php (94%)
 rename app/{Rules => TransactionRules}/Actions/SetBudget.php (95%)
 rename app/{Rules => TransactionRules}/Actions/SetCategory.php (93%)
 rename app/{Rules => TransactionRules}/Actions/SetDescription.php (93%)
 rename app/{Rules => TransactionRules}/Actions/SetDestinationAccount.php (97%)
 rename app/{Rules => TransactionRules}/Actions/SetSourceAccount.php (97%)
 rename app/{Rules => TransactionRules}/Factory/ActionFactory.php (90%)
 rename app/{Rules => TransactionRules}/Factory/TriggerFactory.php (92%)
 rename app/{Rules => TransactionRules}/Processor.php (96%)
 rename app/{Rules => TransactionRules}/TransactionMatcher.php (98%)
 rename app/{Rules => TransactionRules}/Triggers/AbstractTrigger.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/AmountExactly.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/AmountLess.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/AmountMore.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/BudgetIs.php (97%)
 rename app/{Rules => TransactionRules}/Triggers/CategoryIs.php (97%)
 rename app/{Rules => TransactionRules}/Triggers/DescriptionContains.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/DescriptionEnds.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/DescriptionIs.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/DescriptionStarts.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/FromAccountContains.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/FromAccountEnds.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/FromAccountIs.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/FromAccountStarts.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/HasAnyBudget.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/HasAnyCategory.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/HasAnyTag.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/HasAttachment.php (97%)
 rename app/{Rules => TransactionRules}/Triggers/HasNoBudget.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/HasNoCategory.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/HasNoTag.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/TagIs.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/ToAccountContains.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/ToAccountEnds.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/ToAccountIs.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/ToAccountStarts.php (96%)
 rename app/{Rules => TransactionRules}/Triggers/TransactionType.php (95%)
 rename app/{Rules => TransactionRules}/Triggers/TriggerInterface.php (93%)
 rename app/{Rules => TransactionRules}/Triggers/UserAction.php (94%)

diff --git a/app/Handlers/Events/StoredJournalEventHandler.php b/app/Handlers/Events/StoredJournalEventHandler.php
index 6d266d0dda..2222bfbb64 100644
--- a/app/Handlers/Events/StoredJournalEventHandler.php
+++ b/app/Handlers/Events/StoredJournalEventHandler.php
@@ -19,7 +19,7 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
-use FireflyIII\Rules\Processor;
+use FireflyIII\TransactionRules\Processor;
 use FireflyIII\Support\Events\BillScanner;
 use Log;
 
diff --git a/app/Handlers/Events/UpdatedJournalEventHandler.php b/app/Handlers/Events/UpdatedJournalEventHandler.php
index 17303c9134..eea7c7af0c 100644
--- a/app/Handlers/Events/UpdatedJournalEventHandler.php
+++ b/app/Handlers/Events/UpdatedJournalEventHandler.php
@@ -18,7 +18,7 @@ use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\Rules\Processor;
+use FireflyIII\TransactionRules\Processor;
 use FireflyIII\Support\Events\BillScanner;
 
 /**
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 46de443874..d87d817128 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -27,7 +27,7 @@ use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\Rules\TransactionMatcher;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use Illuminate\Http\Request;
 use Preferences;
 use Response;
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index 7c2f487e48..22a2ab88ef 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Rules\Processor;
+use FireflyIII\TransactionRules\Processor;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Log;
diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
index 417895ab40..2729c9312e 100644
--- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
+++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
@@ -16,7 +16,7 @@ namespace FireflyIII\Jobs;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\RuleGroup;
-use FireflyIII\Rules\Processor;
+use FireflyIII\TransactionRules\Processor;
 use FireflyIII\User;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
diff --git a/app/Jobs/ExecuteRuleOnExistingTransactions.php b/app/Jobs/ExecuteRuleOnExistingTransactions.php
index b8f9c2bb6a..33d7ba7d34 100644
--- a/app/Jobs/ExecuteRuleOnExistingTransactions.php
+++ b/app/Jobs/ExecuteRuleOnExistingTransactions.php
@@ -14,7 +14,7 @@ namespace FireflyIII\Jobs;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Rule;
-use FireflyIII\Rules\Processor;
+use FireflyIII\TransactionRules\Processor;
 use FireflyIII\User;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
diff --git a/app/Rules/Uppercase.php b/app/Rules/Uppercase.php
deleted file mode 100644
index 6b74791de1..0000000000
--- a/app/Rules/Uppercase.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace FireflyIII\Rules;
-
-use Illuminate\Contracts\Validation\Rule;
-
-class Uppercase implements Rule
-{
-    /**
-     * Create a new rule instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
-    {
-        //
-    }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return 'The validation error message.';
-    }
-}
diff --git a/app/Rules/Actions/ActionInterface.php b/app/TransactionRules/Actions/ActionInterface.php
similarity index 88%
rename from app/Rules/Actions/ActionInterface.php
rename to app/TransactionRules/Actions/ActionInterface.php
index 7d8696f047..9753d65a0d 100644
--- a/app/Rules/Actions/ActionInterface.php
+++ b/app/TransactionRules/Actions/ActionInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -19,7 +19,7 @@ use FireflyIII\Models\TransactionJournal;
 /**
  * Interface ActionInterface
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 interface ActionInterface
 {
diff --git a/app/Rules/Actions/AddTag.php b/app/TransactionRules/Actions/AddTag.php
similarity index 94%
rename from app/Rules/Actions/AddTag.php
rename to app/TransactionRules/Actions/AddTag.php
index 38560c83aa..3a12c8c694 100644
--- a/app/Rules/Actions/AddTag.php
+++ b/app/TransactionRules/Actions/AddTag.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\RuleAction;
@@ -22,7 +22,7 @@ use Log;
 /**
  * Class AddTag
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class AddTag implements ActionInterface
 {
diff --git a/app/Rules/Actions/AppendDescription.php b/app/TransactionRules/Actions/AppendDescription.php
similarity index 92%
rename from app/Rules/Actions/AppendDescription.php
rename to app/TransactionRules/Actions/AppendDescription.php
index 0bca1c7397..1fa7134e74 100644
--- a/app/Rules/Actions/AppendDescription.php
+++ b/app/TransactionRules/Actions/AppendDescription.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class AppendDescription
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class AppendDescription implements ActionInterface
 {
diff --git a/app/Rules/Actions/ClearBudget.php b/app/TransactionRules/Actions/ClearBudget.php
similarity index 91%
rename from app/Rules/Actions/ClearBudget.php
rename to app/TransactionRules/Actions/ClearBudget.php
index 4f029089ac..7706c43152 100644
--- a/app/Rules/Actions/ClearBudget.php
+++ b/app/TransactionRules/Actions/ClearBudget.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class ClearBudget
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class ClearBudget implements ActionInterface
 {
diff --git a/app/Rules/Actions/ClearCategory.php b/app/TransactionRules/Actions/ClearCategory.php
similarity index 91%
rename from app/Rules/Actions/ClearCategory.php
rename to app/TransactionRules/Actions/ClearCategory.php
index 6eea4ce560..6e939e4501 100644
--- a/app/Rules/Actions/ClearCategory.php
+++ b/app/TransactionRules/Actions/ClearCategory.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\RuleAction;
@@ -21,7 +21,7 @@ use Log;
 /**
  * Class ClearCategory
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class ClearCategory implements ActionInterface
 {
diff --git a/app/Rules/Actions/PrependDescription.php b/app/TransactionRules/Actions/PrependDescription.php
similarity index 92%
rename from app/Rules/Actions/PrependDescription.php
rename to app/TransactionRules/Actions/PrependDescription.php
index a59b5e6172..a56634b86b 100644
--- a/app/Rules/Actions/PrependDescription.php
+++ b/app/TransactionRules/Actions/PrependDescription.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class AppendDescription
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class PrependDescription implements ActionInterface
 {
diff --git a/app/Rules/Actions/RemoveAllTags.php b/app/TransactionRules/Actions/RemoveAllTags.php
similarity index 91%
rename from app/Rules/Actions/RemoveAllTags.php
rename to app/TransactionRules/Actions/RemoveAllTags.php
index 32290d7a70..90db7bef20 100644
--- a/app/Rules/Actions/RemoveAllTags.php
+++ b/app/TransactionRules/Actions/RemoveAllTags.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\RuleAction;
@@ -21,7 +21,7 @@ use Log;
 /**
  * Class RemoveAllTags
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class RemoveAllTags implements ActionInterface
 {
diff --git a/app/Rules/Actions/RemoveTag.php b/app/TransactionRules/Actions/RemoveTag.php
similarity index 94%
rename from app/Rules/Actions/RemoveTag.php
rename to app/TransactionRules/Actions/RemoveTag.php
index 525579f0ed..6e06cffed1 100644
--- a/app/Rules/Actions/RemoveTag.php
+++ b/app/TransactionRules/Actions/RemoveTag.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\RuleAction;
@@ -22,7 +22,7 @@ use Log;
 /**
  * Class RemoveTag
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class RemoveTag implements ActionInterface
 {
diff --git a/app/Rules/Actions/SetBudget.php b/app/TransactionRules/Actions/SetBudget.php
similarity index 95%
rename from app/Rules/Actions/SetBudget.php
rename to app/TransactionRules/Actions/SetBudget.php
index 599f0214da..8723ac4fe6 100644
--- a/app/Rules/Actions/SetBudget.php
+++ b/app/TransactionRules/Actions/SetBudget.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\Budget;
@@ -24,7 +24,7 @@ use Log;
 /**
  * Class SetBudget
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class SetBudget implements ActionInterface
 {
diff --git a/app/Rules/Actions/SetCategory.php b/app/TransactionRules/Actions/SetCategory.php
similarity index 93%
rename from app/Rules/Actions/SetCategory.php
rename to app/TransactionRules/Actions/SetCategory.php
index 8b1953db5d..c32ba04c56 100644
--- a/app/Rules/Actions/SetCategory.php
+++ b/app/TransactionRules/Actions/SetCategory.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\Category;
@@ -22,7 +22,7 @@ use Log;
 /**
  * Class SetCategory
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class SetCategory implements ActionInterface
 {
diff --git a/app/Rules/Actions/SetDescription.php b/app/TransactionRules/Actions/SetDescription.php
similarity index 93%
rename from app/Rules/Actions/SetDescription.php
rename to app/TransactionRules/Actions/SetDescription.php
index fd882f405d..17c5eb1a13 100644
--- a/app/Rules/Actions/SetDescription.php
+++ b/app/TransactionRules/Actions/SetDescription.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class SetDescription
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class SetDescription implements ActionInterface
 {
diff --git a/app/Rules/Actions/SetDestinationAccount.php b/app/TransactionRules/Actions/SetDestinationAccount.php
similarity index 97%
rename from app/Rules/Actions/SetDestinationAccount.php
rename to app/TransactionRules/Actions/SetDestinationAccount.php
index 00249b2660..9646006810 100644
--- a/app/Rules/Actions/SetDestinationAccount.php
+++ b/app/TransactionRules/Actions/SetDestinationAccount.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\Account;
@@ -25,7 +25,7 @@ use Log;
 /**
  * Class SetDestinationAccount
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class SetDestinationAccount implements ActionInterface
 {
diff --git a/app/Rules/Actions/SetSourceAccount.php b/app/TransactionRules/Actions/SetSourceAccount.php
similarity index 97%
rename from app/Rules/Actions/SetSourceAccount.php
rename to app/TransactionRules/Actions/SetSourceAccount.php
index f651f0fbe1..4b27c044d2 100644
--- a/app/Rules/Actions/SetSourceAccount.php
+++ b/app/TransactionRules/Actions/SetSourceAccount.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Actions;
+namespace FireflyIII\TransactionRules\Actions;
 
 
 use FireflyIII\Models\Account;
@@ -25,7 +25,7 @@ use Log;
 /**
  * Class SetSourceAccount
  *
- * @package FireflyIII\Rules\Action
+ * @package FireflyIII\TransactionRules\Action
  */
 class SetSourceAccount implements ActionInterface
 {
diff --git a/app/Rules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php
similarity index 90%
rename from app/Rules/Factory/ActionFactory.php
rename to app/TransactionRules/Factory/ActionFactory.php
index 16d33605e3..d72942d33e 100644
--- a/app/Rules/Factory/ActionFactory.php
+++ b/app/TransactionRules/Factory/ActionFactory.php
@@ -11,25 +11,25 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Factory;
+namespace FireflyIII\TransactionRules\Factory;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\RuleAction;
-use FireflyIII\Rules\Actions\ActionInterface;
+use FireflyIII\TransactionRules\Actions\ActionInterface;
 use FireflyIII\Support\Domain;
 use Log;
 
 /**
  * Interface ActionInterface
  *
- * @package FireflyIII\Rules\Actions
+ * @package FireflyIII\TransactionRules\Actions
  */
 class ActionFactory
 {
     protected static $actionTypes = [];
 
     /**
-     * This method returns the actual implementation (Rules/Actions/[object]) for a given
+     * This method returns the actual implementation (TransactionRules/Actions/[object]) for a given
      * RuleAction (database object). If for example the database object contains action_type "change_category"
      * with value "Groceries" this method will return a corresponding SetCategory object preset
      * to "Groceries". Any transaction journal then fed to this object will have its category changed.
diff --git a/app/Rules/Factory/TriggerFactory.php b/app/TransactionRules/Factory/TriggerFactory.php
similarity index 92%
rename from app/Rules/Factory/TriggerFactory.php
rename to app/TransactionRules/Factory/TriggerFactory.php
index 9f98560f0f..1d3a5df727 100644
--- a/app/Rules/Factory/TriggerFactory.php
+++ b/app/TransactionRules/Factory/TriggerFactory.php
@@ -11,19 +11,19 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Factory;
+namespace FireflyIII\TransactionRules\Factory;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\RuleTrigger;
-use FireflyIII\Rules\Triggers\AbstractTrigger;
-use FireflyIII\Rules\Triggers\TriggerInterface;
+use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
+use FireflyIII\TransactionRules\Triggers\TriggerInterface;
 use FireflyIII\Support\Domain;
 use Log;
 
 /**
  * Interface TriggerInterface
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 class TriggerFactory
 {
@@ -31,7 +31,7 @@ class TriggerFactory
 
     /**
      * Returns the trigger for the given type and journal. This method returns the actual implementation
-     * (Rules/Triggers/[object]) for a given RuleTrigger (database object). If for example the database object
+     * (TransactionRules/Triggers/[object]) for a given RuleTrigger (database object). If for example the database object
      * contains trigger_type "description_is" with value "Rent" this method will return a corresponding
      * DescriptionIs object preset to "Rent". Any transaction journal then fed to this object will
      * be triggered if its description actually is "Rent".
diff --git a/app/Rules/Processor.php b/app/TransactionRules/Processor.php
similarity index 96%
rename from app/Rules/Processor.php
rename to app/TransactionRules/Processor.php
index 5916da22e5..449edea798 100644
--- a/app/Rules/Processor.php
+++ b/app/TransactionRules/Processor.php
@@ -11,24 +11,24 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules;
+namespace FireflyIII\TransactionRules;
 
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Rules\Actions\ActionInterface;
-use FireflyIII\Rules\Factory\ActionFactory;
-use FireflyIII\Rules\Factory\TriggerFactory;
-use FireflyIII\Rules\Triggers\AbstractTrigger;
+use FireflyIII\TransactionRules\Actions\ActionInterface;
+use FireflyIII\TransactionRules\Factory\ActionFactory;
+use FireflyIII\TransactionRules\Factory\TriggerFactory;
+use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
 use Illuminate\Support\Collection;
 use Log;
 
 /**
  * Class Processor
  *
- * @package FireflyIII\Rules
+ * @package FireflyIII\TransactionRules
  */
 final class Processor
 {
diff --git a/app/Rules/TransactionMatcher.php b/app/TransactionRules/TransactionMatcher.php
similarity index 98%
rename from app/Rules/TransactionMatcher.php
rename to app/TransactionRules/TransactionMatcher.php
index b192f64d7d..185e5fbbaa 100644
--- a/app/Rules/TransactionMatcher.php
+++ b/app/TransactionRules/TransactionMatcher.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules;
+namespace FireflyIII\TransactionRules;
 
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Rule;
@@ -25,7 +25,7 @@ use Log;
  * Class TransactionMatcher is used to find a list of
  * transaction matching a set of triggers
  *
- * @package FireflyIII\Rules
+ * @package FireflyIII\TransactionRules
  */
 class TransactionMatcher
 {
diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/TransactionRules/Triggers/AbstractTrigger.php
similarity index 96%
rename from app/Rules/Triggers/AbstractTrigger.php
rename to app/TransactionRules/Triggers/AbstractTrigger.php
index b008a1b91c..02f6426087 100644
--- a/app/Rules/Triggers/AbstractTrigger.php
+++ b/app/TransactionRules/Triggers/AbstractTrigger.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionJournal;
@@ -21,7 +21,7 @@ use FireflyIII\Models\TransactionJournal;
  *
  * Class AbstractTrigger
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 class AbstractTrigger
 {
diff --git a/app/Rules/Triggers/AmountExactly.php b/app/TransactionRules/Triggers/AmountExactly.php
similarity index 95%
rename from app/Rules/Triggers/AmountExactly.php
rename to app/TransactionRules/Triggers/AmountExactly.php
index d160f8495e..6a504bede2 100644
--- a/app/Rules/Triggers/AmountExactly.php
+++ b/app/TransactionRules/Triggers/AmountExactly.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class AmountExactly
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class AmountExactly extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/AmountLess.php b/app/TransactionRules/Triggers/AmountLess.php
similarity index 95%
rename from app/Rules/Triggers/AmountLess.php
rename to app/TransactionRules/Triggers/AmountLess.php
index 433ccb2491..8db1a7fa12 100644
--- a/app/Rules/Triggers/AmountLess.php
+++ b/app/TransactionRules/Triggers/AmountLess.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class AmountLess
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class AmountLess extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/AmountMore.php b/app/TransactionRules/Triggers/AmountMore.php
similarity index 96%
rename from app/Rules/Triggers/AmountMore.php
rename to app/TransactionRules/Triggers/AmountMore.php
index 8a7f1544b6..fa40dde155 100644
--- a/app/Rules/Triggers/AmountMore.php
+++ b/app/TransactionRules/Triggers/AmountMore.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class AmountMore
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class AmountMore extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/BudgetIs.php b/app/TransactionRules/Triggers/BudgetIs.php
similarity index 97%
rename from app/Rules/Triggers/BudgetIs.php
rename to app/TransactionRules/Triggers/BudgetIs.php
index ecc2d01b92..fa5c400cdb 100644
--- a/app/Rules/Triggers/BudgetIs.php
+++ b/app/TransactionRules/Triggers/BudgetIs.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class BudgetIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class BudgetIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/CategoryIs.php b/app/TransactionRules/Triggers/CategoryIs.php
similarity index 97%
rename from app/Rules/Triggers/CategoryIs.php
rename to app/TransactionRules/Triggers/CategoryIs.php
index caf39abaaf..c522b899f5 100644
--- a/app/Rules/Triggers/CategoryIs.php
+++ b/app/TransactionRules/Triggers/CategoryIs.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class CategoryIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class CategoryIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/DescriptionContains.php b/app/TransactionRules/Triggers/DescriptionContains.php
similarity index 96%
rename from app/Rules/Triggers/DescriptionContains.php
rename to app/TransactionRules/Triggers/DescriptionContains.php
index 45fbf08205..83814a1570 100644
--- a/app/Rules/Triggers/DescriptionContains.php
+++ b/app/TransactionRules/Triggers/DescriptionContains.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class DescriptionContains
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class DescriptionContains extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/DescriptionEnds.php b/app/TransactionRules/Triggers/DescriptionEnds.php
similarity index 96%
rename from app/Rules/Triggers/DescriptionEnds.php
rename to app/TransactionRules/Triggers/DescriptionEnds.php
index 31c8d269ea..f4358ed670 100644
--- a/app/Rules/Triggers/DescriptionEnds.php
+++ b/app/TransactionRules/Triggers/DescriptionEnds.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -19,7 +19,7 @@ use Log;
 /**
  * Class DescriptionEnds
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/DescriptionIs.php b/app/TransactionRules/Triggers/DescriptionIs.php
similarity index 95%
rename from app/Rules/Triggers/DescriptionIs.php
rename to app/TransactionRules/Triggers/DescriptionIs.php
index de471e5dc7..63d5702072 100644
--- a/app/Rules/Triggers/DescriptionIs.php
+++ b/app/TransactionRules/Triggers/DescriptionIs.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -19,7 +19,7 @@ use Log;
 /**
  * Class DescriptionIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class DescriptionIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/DescriptionStarts.php b/app/TransactionRules/Triggers/DescriptionStarts.php
similarity index 96%
rename from app/Rules/Triggers/DescriptionStarts.php
rename to app/TransactionRules/Triggers/DescriptionStarts.php
index 6bb9232fc3..d0da5ee04e 100644
--- a/app/Rules/Triggers/DescriptionStarts.php
+++ b/app/TransactionRules/Triggers/DescriptionStarts.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -19,7 +19,7 @@ use Log;
 /**
  * Class DescriptionStarts
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class DescriptionStarts extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/TransactionRules/Triggers/FromAccountContains.php
similarity index 96%
rename from app/Rules/Triggers/FromAccountContains.php
rename to app/TransactionRules/Triggers/FromAccountContains.php
index 54fef61b20..0d4dace539 100644
--- a/app/Rules/Triggers/FromAccountContains.php
+++ b/app/TransactionRules/Triggers/FromAccountContains.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class FromAccountContains
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class FromAccountContains extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/TransactionRules/Triggers/FromAccountEnds.php
similarity index 96%
rename from app/Rules/Triggers/FromAccountEnds.php
rename to app/TransactionRules/Triggers/FromAccountEnds.php
index 6121bb9580..f0215e96fb 100644
--- a/app/Rules/Triggers/FromAccountEnds.php
+++ b/app/TransactionRules/Triggers/FromAccountEnds.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class FromAccountEnds
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/TransactionRules/Triggers/FromAccountIs.php
similarity index 95%
rename from app/Rules/Triggers/FromAccountIs.php
rename to app/TransactionRules/Triggers/FromAccountIs.php
index 06339eb331..9314ef39ae 100644
--- a/app/Rules/Triggers/FromAccountIs.php
+++ b/app/TransactionRules/Triggers/FromAccountIs.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class FromAccountIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class FromAccountIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/TransactionRules/Triggers/FromAccountStarts.php
similarity index 96%
rename from app/Rules/Triggers/FromAccountStarts.php
rename to app/TransactionRules/Triggers/FromAccountStarts.php
index 52ab178289..8908785e44 100644
--- a/app/Rules/Triggers/FromAccountStarts.php
+++ b/app/TransactionRules/Triggers/FromAccountStarts.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class FromAccountStarts
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class FromAccountStarts extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasAnyBudget.php b/app/TransactionRules/Triggers/HasAnyBudget.php
similarity index 95%
rename from app/Rules/Triggers/HasAnyBudget.php
rename to app/TransactionRules/Triggers/HasAnyBudget.php
index 74d77eab01..e2bb39f2a5 100644
--- a/app/Rules/Triggers/HasAnyBudget.php
+++ b/app/TransactionRules/Triggers/HasAnyBudget.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasAnyBudget
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasAnyBudget extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasAnyCategory.php b/app/TransactionRules/Triggers/HasAnyCategory.php
similarity index 95%
rename from app/Rules/Triggers/HasAnyCategory.php
rename to app/TransactionRules/Triggers/HasAnyCategory.php
index c7902e0e95..1efe0a7315 100644
--- a/app/Rules/Triggers/HasAnyCategory.php
+++ b/app/TransactionRules/Triggers/HasAnyCategory.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasAnyCategory
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasAnyCategory extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasAnyTag.php b/app/TransactionRules/Triggers/HasAnyTag.php
similarity index 95%
rename from app/Rules/Triggers/HasAnyTag.php
rename to app/TransactionRules/Triggers/HasAnyTag.php
index a7e2ecd5bd..ffc6f94791 100644
--- a/app/Rules/Triggers/HasAnyTag.php
+++ b/app/TransactionRules/Triggers/HasAnyTag.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasAnyTag
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasAnyTag extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasAttachment.php b/app/TransactionRules/Triggers/HasAttachment.php
similarity index 97%
rename from app/Rules/Triggers/HasAttachment.php
rename to app/TransactionRules/Triggers/HasAttachment.php
index 6fc86c6a6c..9e0f04a7c3 100644
--- a/app/Rules/Triggers/HasAttachment.php
+++ b/app/TransactionRules/Triggers/HasAttachment.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Rules/Triggers/HasNoBudget.php b/app/TransactionRules/Triggers/HasNoBudget.php
similarity index 95%
rename from app/Rules/Triggers/HasNoBudget.php
rename to app/TransactionRules/Triggers/HasNoBudget.php
index 9df4143805..f64b9d359e 100644
--- a/app/Rules/Triggers/HasNoBudget.php
+++ b/app/TransactionRules/Triggers/HasNoBudget.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasNoBudget
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasNoBudget extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasNoCategory.php b/app/TransactionRules/Triggers/HasNoCategory.php
similarity index 95%
rename from app/Rules/Triggers/HasNoCategory.php
rename to app/TransactionRules/Triggers/HasNoCategory.php
index 4f6e367b30..fad320c8f5 100644
--- a/app/Rules/Triggers/HasNoCategory.php
+++ b/app/TransactionRules/Triggers/HasNoCategory.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasNoCategory
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasNoCategory extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/HasNoTag.php b/app/TransactionRules/Triggers/HasNoTag.php
similarity index 95%
rename from app/Rules/Triggers/HasNoTag.php
rename to app/TransactionRules/Triggers/HasNoTag.php
index 813aaf82ff..afa6e2afd2 100644
--- a/app/Rules/Triggers/HasNoTag.php
+++ b/app/TransactionRules/Triggers/HasNoTag.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class HasNoTag
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class HasNoTag extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/TagIs.php b/app/TransactionRules/Triggers/TagIs.php
similarity index 95%
rename from app/Rules/Triggers/TagIs.php
rename to app/TransactionRules/Triggers/TagIs.php
index 9ea19ac2ed..0d9dc9b33b 100644
--- a/app/Rules/Triggers/TagIs.php
+++ b/app/TransactionRules/Triggers/TagIs.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
 /**
  * Class TagIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class TagIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/TransactionRules/Triggers/ToAccountContains.php
similarity index 96%
rename from app/Rules/Triggers/ToAccountContains.php
rename to app/TransactionRules/Triggers/ToAccountContains.php
index 96eeb960e8..70c98559a7 100644
--- a/app/Rules/Triggers/ToAccountContains.php
+++ b/app/TransactionRules/Triggers/ToAccountContains.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class ToAccountContains
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class ToAccountContains extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/TransactionRules/Triggers/ToAccountEnds.php
similarity index 96%
rename from app/Rules/Triggers/ToAccountEnds.php
rename to app/TransactionRules/Triggers/ToAccountEnds.php
index ff5f470618..056d7bd827 100644
--- a/app/Rules/Triggers/ToAccountEnds.php
+++ b/app/TransactionRules/Triggers/ToAccountEnds.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class ToAccountEnds
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/TransactionRules/Triggers/ToAccountIs.php
similarity index 96%
rename from app/Rules/Triggers/ToAccountIs.php
rename to app/TransactionRules/Triggers/ToAccountIs.php
index fffb334153..48df49fc03 100644
--- a/app/Rules/Triggers/ToAccountIs.php
+++ b/app/TransactionRules/Triggers/ToAccountIs.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class ToAccountIs
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class ToAccountIs extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/TransactionRules/Triggers/ToAccountStarts.php
similarity index 96%
rename from app/Rules/Triggers/ToAccountStarts.php
rename to app/TransactionRules/Triggers/ToAccountStarts.php
index 05eebbe028..90e36547a8 100644
--- a/app/Rules/Triggers/ToAccountStarts.php
+++ b/app/TransactionRules/Triggers/ToAccountStarts.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
 /**
  * Class ToAccountStarts
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/TransactionType.php b/app/TransactionRules/Triggers/TransactionType.php
similarity index 95%
rename from app/Rules/Triggers/TransactionType.php
rename to app/TransactionRules/Triggers/TransactionType.php
index e6f220ffce..feff655a2d 100644
--- a/app/Rules/Triggers/TransactionType.php
+++ b/app/TransactionRules/Triggers/TransactionType.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -19,7 +19,7 @@ use Log;
 /**
  * Class TransactionType
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class TransactionType extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Rules/Triggers/TriggerInterface.php b/app/TransactionRules/Triggers/TriggerInterface.php
similarity index 93%
rename from app/Rules/Triggers/TriggerInterface.php
rename to app/TransactionRules/Triggers/TriggerInterface.php
index ac58021ddc..cb327c4880 100644
--- a/app/Rules/Triggers/TriggerInterface.php
+++ b/app/TransactionRules/Triggers/TriggerInterface.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 
 /**
  * Interface TriggerInterface
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 interface TriggerInterface
 {
diff --git a/app/Rules/Triggers/UserAction.php b/app/TransactionRules/Triggers/UserAction.php
similarity index 94%
rename from app/Rules/Triggers/UserAction.php
rename to app/TransactionRules/Triggers/UserAction.php
index fb4d6508c6..cd7a189f13 100644
--- a/app/Rules/Triggers/UserAction.php
+++ b/app/TransactionRules/Triggers/UserAction.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Rules\Triggers;
+namespace FireflyIII\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -19,7 +19,7 @@ use Log;
 /**
  * Class UserAction
  *
- * @package FireflyIII\Rules\Triggers
+ * @package FireflyIII\TransactionRules\Triggers
  */
 final class UserAction extends AbstractTrigger implements TriggerInterface
 {
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index ef16f8787b..8dc62ba0fd 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -23,7 +23,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Rules\Triggers\TriggerInterface;
+use FireflyIII\TransactionRules\Triggers\TriggerInterface;
 use FireflyIII\Services\Password\Verifier;
 use FireflyIII\User;
 use Google2FA;
diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php
index 056606971d..b3826228e5 100644
--- a/tests/Feature/Controllers/RuleControllerTest.php
+++ b/tests/Feature/Controllers/RuleControllerTest.php
@@ -18,7 +18,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\Rules\TransactionMatcher;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use Illuminate\Support\Collection;
 use Tests\TestCase;