diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index 54b0b0e..8a6d97d 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -1,11 +1,6 @@
 <?php
 namespace App\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use App\Repository\ActivityRepository;
-use App\Repository\ActorRepository;
-use App\Repository\TaskRepository;
 use App\Entity\ActivityEntity;
 use App\Entity\ActorEntity;
 use App\Entity\TaskEntity;
@@ -13,7 +8,12 @@
 use App\Form\Activity\ActivityDeleteForm;
 use App\Form\Activity\ActivityEditForm;
 use App\Form\Activity\ActivityFilterForm;
-use App\Form\Actors\TaskAddForm;
+use App\Form\Task\TaskAddForm;
+use App\Repository\ActivityRepository;
+use App\Repository\ActorRepository;
+use App\Repository\TaskRepository;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
 /**
diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php
index d2c414d..5ab69bc 100644
--- a/src/Controller/ActorController.php
+++ b/src/Controller/ActorController.php
@@ -1,19 +1,19 @@
 <?php
 namespace App\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use App\Form\Actors\ActorAddForm;
-use App\Repository\ActorRepository;
-use App\Repository\TaskRepository;
 use App\Entity\ActivityEntity;
 use App\Entity\ActorEntity;
 use App\Entity\TaskEntity;
+use App\Enum\StatusEnum;
+use App\Form\Actors\ActorAddForm;
 use App\Form\Actors\ActorDeleteForm;
-use Symfony\Component\Routing\Generator\UrlGenerator;
 use App\Form\Actors\ActorEditForm;
 use App\Repository\ActivityRepository;
-use App\Enum\StatusEnum;
+use App\Repository\ActorRepository;
+use App\Repository\TaskRepository;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Generator\UrlGenerator;
 
 class ActorController extends AbstractExtendedController
 {
diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php
index 398d841..fcffc0a 100644
--- a/src/Controller/TaskController.php
+++ b/src/Controller/TaskController.php
@@ -1,16 +1,16 @@
 <?php
 namespace App\Controller;
 
+use App\Entity\ActorEntity;
+use App\Entity\TaskEntity;
+use App\Form\Task\TaskAddForm;
+use App\Form\Task\TaskDeleteForm;
+use App\Form\Task\TaskEditForm;
+use App\Repository\ActorRepository;
+use App\Repository\TaskRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGenerator;
-use App\Entity\ActorEntity;
-use App\Entity\TaskEntity;
-use App\Repository\ActorRepository;
-use App\Repository\TaskRepository;
-use App\Form\Actors\TaskAddForm;
-use App\Form\Activity\TaskDeleteForm;
-use App\Form\Task\TaskEditForm;
 
 class TaskController extends AbstractExtendedController
 {
diff --git a/src/Entity/ActivityEntity.php b/src/Entity/ActivityEntity.php
index 7044071..5354845 100644
--- a/src/Entity/ActivityEntity.php
+++ b/src/Entity/ActivityEntity.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Entity;
 
-use App\Helper\StringGenerationHelper;
-use DateTime;
 use App\Enum\StatusEnum;
 use App\Exception\InvalidEnumKeyException;
+use App\Helper\StringGenerationHelper;
+use DateTime;
 
 /**
  * Entity for activities
diff --git a/src/Entity/TaskEntity.php b/src/Entity/TaskEntity.php
index e6efa18..89aa3fe 100644
--- a/src/Entity/TaskEntity.php
+++ b/src/Entity/TaskEntity.php
@@ -1,8 +1,8 @@
 <?php
 namespace App\Entity;
 
-use App\Exception\InvalidEnumKeyException;
 use App\Enum\StatusEnum;
+use App\Exception\InvalidEnumKeyException;
 use App\Helper\StringGenerationHelper;
 use DateTime;
 
diff --git a/src/Form/Activity/ActivityAddForm.php b/src/Form/Activity/ActivityAddForm.php
index bf464d1..f6dc5de 100644
--- a/src/Form/Activity/ActivityAddForm.php
+++ b/src/Form/Activity/ActivityAddForm.php
@@ -2,6 +2,7 @@
 namespace App\Form\Activity;
 
 use App\Entity\ActivityEntity;
+use App\Entity\ActorEntity;
 use App\Enum\StatusEnum;
 use App\Form\AbstractFormManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -10,7 +11,6 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use App\Entity\ActorEntity;
 
 class ActivityAddForm extends AbstractFormManager
 {
diff --git a/src/Form/Activity/ActivityDeleteForm.php b/src/Form/Activity/ActivityDeleteForm.php
index a5307ad..d9eae94 100644
--- a/src/Form/Activity/ActivityDeleteForm.php
+++ b/src/Form/Activity/ActivityDeleteForm.php
@@ -1,11 +1,11 @@
 <?php
 namespace App\Form\Activity;
 
+use App\Entity\ActivityEntity;
 use App\Form\AbstractFormManager;
+use App\Repository\ActivityRepository;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use App\Repository\ActivityRepository;
-use App\Entity\ActivityEntity;
 
 class ActivityDeleteForm extends AbstractFormManager
 {
diff --git a/src/Form/Activity/ActivityFilterForm.php b/src/Form/Activity/ActivityFilterForm.php
index ebf6f46..a9e075e 100644
--- a/src/Form/Activity/ActivityFilterForm.php
+++ b/src/Form/Activity/ActivityFilterForm.php
@@ -5,17 +5,17 @@
 use App\Entity\ActorEntity;
 use App\Enum\StatusEnum;
 use App\Form\AbstractFormManager;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use App\Repository\ActivityRepository;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\Common\Collections\Criteria;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\ResetType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 
 class ActivityFilterForm extends AbstractFormManager
 {
diff --git a/src/Form/Actors/ActorAddForm.php b/src/Form/Actors/ActorAddForm.php
index 68cf65d..1a6587a 100644
--- a/src/Form/Actors/ActorAddForm.php
+++ b/src/Form/Actors/ActorAddForm.php
@@ -1,11 +1,11 @@
 <?php
 namespace App\Form\Actors;
 
+use App\Entity\ActorEntity;
+use App\Form\AbstractFormManager;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use App\Entity\ActorEntity;
-use App\Form\AbstractFormManager;
 
 class ActorAddForm extends AbstractFormManager
 {
diff --git a/src/Form/Actors/ActorEditForm.php b/src/Form/Actors/ActorEditForm.php
index 061f36d..a2566f1 100644
--- a/src/Form/Actors/ActorEditForm.php
+++ b/src/Form/Actors/ActorEditForm.php
@@ -1,11 +1,11 @@
 <?php
 namespace App\Form\Actors;
 
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use App\Entity\ActorEntity;
 use App\Form\AbstractFormManager;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class ActorEditForm extends AbstractFormManager
 {
diff --git a/src/Form/Task/TaskAddForm.php b/src/Form/Task/TaskAddForm.php
index 49e5dfe..64d5bd0 100644
--- a/src/Form/Task/TaskAddForm.php
+++ b/src/Form/Task/TaskAddForm.php
@@ -1,7 +1,8 @@
 <?php
-namespace App\Form\Actors;
+namespace App\Form\Task;
 
 use App\Entity\ActorEntity;
+use App\Entity\TaskEntity;
 use App\Enum\StatusEnum;
 use App\Form\AbstractFormManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -10,7 +11,6 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use App\Entity\TaskEntity;
 
 class TaskAddForm extends AbstractFormManager
 {
diff --git a/src/Form/Task/TaskDeleteForm.php b/src/Form/Task/TaskDeleteForm.php
index 1e208e0..b59dd16 100644
--- a/src/Form/Task/TaskDeleteForm.php
+++ b/src/Form/Task/TaskDeleteForm.php
@@ -1,11 +1,11 @@
 <?php
-namespace App\Form\Activity;
+namespace App\Form\Task;
 
+use App\Entity\TaskEntity;
 use App\Form\AbstractFormManager;
+use App\Repository\TaskRepository;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use App\Repository\TaskRepository;
-use App\Entity\TaskEntity;
 
 class TaskDeleteForm extends AbstractFormManager
 {
diff --git a/src/Form/Task/TaskEditForm.php b/src/Form/Task/TaskEditForm.php
index 033c264..42aa9ec 100644
--- a/src/Form/Task/TaskEditForm.php
+++ b/src/Form/Task/TaskEditForm.php
@@ -2,6 +2,7 @@
 namespace App\Form\Task;
 
 use App\Entity\ActorEntity;
+use App\Entity\TaskEntity;
 use App\Enum\StatusEnum;
 use App\Form\AbstractFormManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -10,7 +11,6 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use App\Entity\TaskEntity;
 
 class TaskEditForm extends AbstractFormManager
 {
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index eba568f..4abdc95 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -1,13 +1,13 @@
 <?php
 namespace App\Repository;
 
+use App\Entity\ActorEntity;
+use App\Enum\StatusEnum;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Query\Expr\Join;
-use App\Entity\ActorEntity;
-use App\Enum\StatusEnum;
-use Doctrine\Common\Collections\Criteria;
 
 /**
  * Repository for workspaces
diff --git a/src/Repository/ActorRepository.php b/src/Repository/ActorRepository.php
index d20dae7..f2ca78a 100644
--- a/src/Repository/ActorRepository.php
+++ b/src/Repository/ActorRepository.php
@@ -1,9 +1,9 @@
 <?php
 namespace App\Repository;
 
+use App\Entity\ActorEntity;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
-use App\Entity\ActorEntity;
 
 /**
  * Repository for workspaces
diff --git a/src/Repository/TaskRepository.php b/src/Repository/TaskRepository.php
index 0f7c96e..e5a3149 100644
--- a/src/Repository/TaskRepository.php
+++ b/src/Repository/TaskRepository.php
@@ -1,9 +1,9 @@
 <?php
 namespace App\Repository;
 
+use App\Entity\TaskEntity;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
-use App\Entity\TaskEntity;
 
 class TaskRepository extends EntityRepository
 {