diff --git a/core/src/Controller/RegistrationController.php b/core/src/Controller/Auth/RegistrationController.php
similarity index 90%
rename from core/src/Controller/RegistrationController.php
rename to core/src/Controller/Auth/RegistrationController.php
index 4ed4aab..f39f09b 100644
--- a/core/src/Controller/RegistrationController.php
+++ b/core/src/Controller/Auth/RegistrationController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Auth;
 
 use App\Entity\User;
-use App\Form\RegistrationFormType;
+use App\Form\Auth\RegistrationFormType;
 use App\Repository\UserRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -38,7 +38,7 @@ class RegistrationController extends AbstractController
             $existingUser = $userRepository->findByEmail($user->getEmail());
             if ($existingUser) {
                 $this->addFlash('error', 'این ایمیل قبلاً ثبت شده است');
-                return $this->render('registration/register.html.twig', [
+                return $this->render('auth/registration/register.html.twig', [
                     'registrationForm' => $form->createView(),
                 ]);
             }
@@ -46,7 +46,7 @@ class RegistrationController extends AbstractController
             $existingUser = $userRepository->findByMobile($user->getMobile());
             if ($existingUser) {
                 $this->addFlash('error', 'این شماره موبایل قبلاً ثبت شده است');
-                return $this->render('registration/register.html.twig', [
+                return $this->render('auth/registration/register.html.twig', [
                     'registrationForm' => $form->createView(),
                 ]);
             }
@@ -71,7 +71,7 @@ class RegistrationController extends AbstractController
             return $this->redirectToRoute('app_login');
         }
 
-        return $this->render('registration/register.html.twig', [
+        return $this->render('auth/registration/register.html.twig', [
             'registrationForm' => $form->createView(),
         ]);
     }
diff --git a/core/src/Controller/ResetPasswordController.php b/core/src/Controller/Auth/ResetPasswordController.php
similarity index 92%
rename from core/src/Controller/ResetPasswordController.php
rename to core/src/Controller/Auth/ResetPasswordController.php
index 811ed44..cfa8214 100644
--- a/core/src/Controller/ResetPasswordController.php
+++ b/core/src/Controller/Auth/ResetPasswordController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Auth;
 
 use App\Entity\User;
-use App\Form\ChangePasswordFormType;
-use App\Form\ResetPasswordRequestFormType;
+use App\Form\Auth\ChangePasswordFormType;
+use App\Form\Auth\ResetPasswordRequestFormType;
 use App\Repository\UserRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
@@ -42,7 +42,7 @@ class ResetPasswordController extends AbstractController
             );
         }
 
-        return $this->render('reset_password/request.html.twig', [
+        return $this->render('auth/reset_password/request.html.twig', [
             'requestForm' => $form->createView(),
         ]);
     }
@@ -51,7 +51,7 @@ class ResetPasswordController extends AbstractController
     public function checkEmail(): Response
     {
         // این صفحه فقط برای نمایش پیام استفاده می‌شود
-        return $this->render('reset_password/check_email.html.twig');
+        return $this->render('auth/reset_password/check_email.html.twig');
     }
 
     #[Route('/reset/{token}', name: 'app_reset_password')]
@@ -85,7 +85,7 @@ class ResetPasswordController extends AbstractController
             return $this->redirectToRoute('app_login');
         }
 
-        return $this->render('reset_password/reset.html.twig', [
+        return $this->render('auth/reset_password/reset.html.twig', [
             'resetForm' => $form->createView(),
         ]);
     }
diff --git a/core/src/Controller/SecurityController.php b/core/src/Controller/Auth/SecurityController.php
similarity index 92%
rename from core/src/Controller/SecurityController.php
rename to core/src/Controller/Auth/SecurityController.php
index 4c67e92..a311cb1 100644
--- a/core/src/Controller/SecurityController.php
+++ b/core/src/Controller/Auth/SecurityController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Auth;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,7 +20,7 @@ class SecurityController extends AbstractController
         $error = $authenticationUtils->getLastAuthenticationError();
         $lastUsername = $authenticationUtils->getLastUsername();
 
-        return $this->render('security/login.html.twig', [
+        return $this->render('auth/security/login.html.twig', [
             'last_username' => $lastUsername,
             'error' => $error,
         ]);
diff --git a/core/src/Form/ChangePasswordFormType.php b/core/src/Form/Auth/ChangePasswordFormType.php
similarity index 100%
rename from core/src/Form/ChangePasswordFormType.php
rename to core/src/Form/Auth/ChangePasswordFormType.php
diff --git a/core/src/Form/RegistrationFormType.php b/core/src/Form/Auth/RegistrationFormType.php
similarity index 100%
rename from core/src/Form/RegistrationFormType.php
rename to core/src/Form/Auth/RegistrationFormType.php
diff --git a/core/src/Form/ResetPasswordRequestFormType.php b/core/src/Form/Auth/ResetPasswordRequestFormType.php
similarity index 100%
rename from core/src/Form/ResetPasswordRequestFormType.php
rename to core/src/Form/Auth/ResetPasswordRequestFormType.php
diff --git a/core/templates/registration/register.html.twig b/core/templates/auth/registration/register.html.twig
similarity index 100%
rename from core/templates/registration/register.html.twig
rename to core/templates/auth/registration/register.html.twig
diff --git a/core/templates/reset_password/check_email.html.twig b/core/templates/auth/reset_password/check_email.html.twig
similarity index 100%
rename from core/templates/reset_password/check_email.html.twig
rename to core/templates/auth/reset_password/check_email.html.twig
diff --git a/core/templates/reset_password/email.html.twig b/core/templates/auth/reset_password/email.html.twig
similarity index 100%
rename from core/templates/reset_password/email.html.twig
rename to core/templates/auth/reset_password/email.html.twig
diff --git a/core/templates/reset_password/request.html.twig b/core/templates/auth/reset_password/request.html.twig
similarity index 100%
rename from core/templates/reset_password/request.html.twig
rename to core/templates/auth/reset_password/request.html.twig
diff --git a/core/templates/reset_password/reset.html.twig b/core/templates/auth/reset_password/reset.html.twig
similarity index 100%
rename from core/templates/reset_password/reset.html.twig
rename to core/templates/auth/reset_password/reset.html.twig
diff --git a/core/templates/security/login.html.twig b/core/templates/auth/security/login.html.twig
similarity index 100%
rename from core/templates/security/login.html.twig
rename to core/templates/auth/security/login.html.twig