diff --git a/src/Factory/CompanyFactory.php b/src/Factory/CompanyFactory.php
index 62c2518..7426c1d 100644
--- a/src/Factory/CompanyFactory.php
+++ b/src/Factory/CompanyFactory.php
@@ -3,8 +3,8 @@
 namespace App\Factory;
 
 use App\DataTransferObject\CompanyDetailsDto;
-use App\Entity\Company;
-use App\Entity\User;
+use App\Entity\Company\Company;
+use App\Entity\System\User;
 
 final class CompanyFactory
 {
diff --git a/src/Factory/MessageFactory.php b/src/Factory/MessageFactory.php
index 0bfeaee..e4547e8 100644
--- a/src/Factory/MessageFactory.php
+++ b/src/Factory/MessageFactory.php
@@ -2,10 +2,10 @@
 
 namespace App\Factory;
 
-use App\Entity\MemberCase;
-use App\Entity\Messages;
-use App\Entity\User;
-use App\Enums\MessageType;
+use App\Entity\Case\MemberCase;;
+use App\Entity\System\Messages;
+use App\Entity\System\User;
+use App\Enums\System\MessageType;
 use DateTimeImmutable;
 
 class MessageFactory