diff --git a/app/Rules/Actions/ActionFactory.php b/app/Rules/Factory/ActionFactory.php
similarity index 95%
rename from app/Rules/Actions/ActionFactory.php
rename to app/Rules/Factory/ActionFactory.php
index 75bd45bc35..22a2a982d7 100644
--- a/app/Rules/Actions/ActionFactory.php
+++ b/app/Rules/Factory/ActionFactory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ActionFactory.php
  * Copyright (C) 2016 Robert Horlings
@@ -8,10 +7,13 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace FireflyIII\Rules\Actions;
+declare(strict_types = 1);
+
+namespace FireflyIII\Rules\Factory;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Rules\Actions\ActionInterface;
 use FireflyIII\Support\Domain;
 
 /**
diff --git a/app/Rules/Triggers/TriggerFactory.php b/app/Rules/Factory/TriggerFactory.php
similarity index 95%
rename from app/Rules/Triggers/TriggerFactory.php
rename to app/Rules/Factory/TriggerFactory.php
index 071ce1870e..6f5f560c9a 100644
--- a/app/Rules/Triggers/TriggerFactory.php
+++ b/app/Rules/Factory/TriggerFactory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TriggerFactory.php
  * Copyright (C) 2016 Robert Horlings
@@ -8,10 +7,14 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace FireflyIII\Rules\Triggers;
+declare(strict_types = 1);
+
+namespace FireflyIII\Rules\Factory;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\RuleTrigger;
+use FireflyIII\Rules\Triggers\AbstractTrigger;
+use FireflyIII\Rules\Triggers\TriggerInterface;
 use FireflyIII\Support\Domain;
 
 /**
diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php
index 69eb1f5871..02b7bac5b5 100644
--- a/app/Rules/Processor.php
+++ b/app/Rules/Processor.php
@@ -14,10 +14,10 @@ use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Rules\Actions\ActionFactory;
+use FireflyIII\Rules\Factory\ActionFactory;
 use FireflyIII\Rules\Actions\ActionInterface;
 use FireflyIII\Rules\Triggers\AbstractTrigger;
-use FireflyIII\Rules\Triggers\TriggerFactory;
+use FireflyIII\Rules\Factory\TriggerFactory;
 use Illuminate\Support\Collection;
 use Log;