diff --git a/composer.json b/composer.json
index c44dd27..a478818 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "yasse/projetphp",
+    "name": "groupe3/projetphp",
     "description": "le projet php de ces mort",
     "require": {
         "smarty/smarty": "^5.7",
@@ -8,13 +8,15 @@
     },
     "autoload": {
         "psr-4": {
-            "Guill\\Guillaume\\": "src/"
+            "Controllers\\": "controllers/",
+            "Entities\\": "entities/",
+            "Models\\": "models/"
         }
     },
     "authors": [
         {
-            "name": "GuillaumeH-Cci",
-            "email": "guillaume.hess@ccicampus.fr"
+            "name": "Le Meilleur groupe",
+            "email": "pasdemail@meilleurgroupe.ccicampus"
         }
     ]
 }
diff --git a/controllers/admin_controller.php b/controllers/AdminCtrl.php
similarity index 88%
rename from controllers/admin_controller.php
rename to controllers/AdminCtrl.php
index 3b1c579..b88ebae 100644
--- a/controllers/admin_controller.php
+++ b/controllers/AdminCtrl.php
@@ -1,16 +1,13 @@
 <?php 
+    namespace Controllers;
 
-    require("./models/project_model.php");
-    require("./entities/project_entity.php");
-    require("./models/category_model.php");
-    require("./entities/category_entity.php");
-    require("./models/image_model.php");
-    require("./entities/image_entity.php");
-    require("./models/user_model.php");
-    require("./entities/user_entity.php");
-    require("./models/authorisation_model.php");
-    require("./entities/authorisation_entity.php");
-    require("mother_controller.php");
+    use Models\CategoryModel;
+    use Models\UserModel;
+    use Models\AuthorisationModel;
+
+    use Entities\Category;
+    use Entities\Authorisation;
+    use Entities\User;
 
     /**
      * Le controller de la partie accessible uniquement par l'admin
diff --git a/controllers/error_controller.php b/controllers/ErrorCtrl.php
similarity index 89%
rename from controllers/error_controller.php
rename to controllers/ErrorCtrl.php
index b7f3edb..2e69e9e 100644
--- a/controllers/error_controller.php
+++ b/controllers/ErrorCtrl.php
@@ -1,5 +1,5 @@
 <?php
-	require("mother_controller.php");
+	namespace Controllers;
 
 	/** 
 	* Le contrôleur des erreurs
diff --git a/controllers/mother_controller.php b/controllers/MotherCtrl.php
similarity index 97%
rename from controllers/mother_controller.php
rename to controllers/MotherCtrl.php
index 086177b..5097536 100644
--- a/controllers/mother_controller.php
+++ b/controllers/MotherCtrl.php
@@ -1,5 +1,6 @@
 <?php
-
+	namespace Controllers;
+	
 	use Smarty\Smarty;
 	
 	/**
diff --git a/controllers/page_controller.php b/controllers/PageCtrl.php
similarity index 93%
rename from controllers/page_controller.php
rename to controllers/PageCtrl.php
index 06f2411..9fb89e0 100644
--- a/controllers/page_controller.php
+++ b/controllers/PageCtrl.php
@@ -1,6 +1,7 @@
 <?php
 
-    require("mother_controller.php");
+	namespace Controllers;
+
 
     /**
      * Le controller de la page d'aide utilisateur
diff --git a/controllers/project_controller.php b/controllers/ProjectCtrl.php
similarity index 97%
rename from controllers/project_controller.php
rename to controllers/ProjectCtrl.php
index 8f656d3..b3dd0d1 100644
--- a/controllers/project_controller.php
+++ b/controllers/ProjectCtrl.php
@@ -1,13 +1,20 @@
 <?php
-    require("./models/project_model.php");
-    require("./entities/project_entity.php");
-    require("./models/category_model.php");
-    require("./entities/category_entity.php");
-    require("./models/image_model.php");
-    require("./entities/image_entity.php");
-    require("./models/user_model.php");
-    require("./entities/user_entity.php");
-    require("mother_controller.php");
+
+	namespace Controllers;
+
+  
+
+	use Models\ProjectModel;
+	use Models\CategoryModel;
+	use Models\ImageModel;
+	use Models\UserModel;
+
+	
+	use Entities\Project;
+	use Entities\Category;
+    use Entities\Authorisation;
+    use Entities\User;
+
     use PHPMailer\PHPMailer\PHPMailer;
 	use PHPMailer\PHPMailer\Exception;
 	use PHPMailer\PHPMailer\SMTP;
diff --git a/controllers/user_controller.php b/controllers/UserCtrl.php
similarity index 98%
rename from controllers/user_controller.php
rename to controllers/UserCtrl.php
index 2085996..13dd6a6 100644
--- a/controllers/user_controller.php
+++ b/controllers/UserCtrl.php
@@ -1,10 +1,12 @@
 <?php
 
-	require("models/user_model.php");
-	require("entities/user_entity.php");
-    require("mother_controller.php");
-	require("./models/project_model.php");
-    require("./entities/project_entity.php");
+	namespace Controllers;
+
+	use Models\UserModel;
+	use Models\ProjectModel;
+
+	use Entities\User;
+	use Entities\Project;
 
 	/**
      * Le controller de la page d'aide utilisateur
diff --git a/entities/authorisation_entity.php b/entities/Authorisation.php
similarity index 93%
rename from entities/authorisation_entity.php
rename to entities/Authorisation.php
index 712d48f..cac51b4 100644
--- a/entities/authorisation_entity.php
+++ b/entities/Authorisation.php
@@ -1,11 +1,12 @@
 <?php
-	require_once("mother_entity.php");
+	namespace Entities;
+
 	
 	/**
 	 * Classe d'un objet Authorisation
 	 * @author Laura
 	 */
-	class Authorisation extends Entity{
+	class Authorisation extends Mother{
 
         private int $_id;
 		private string $_name = '';
diff --git a/entities/category_entity.php b/entities/Category.php
similarity index 96%
rename from entities/category_entity.php
rename to entities/Category.php
index 6269f2c..9b9b749 100644
--- a/entities/category_entity.php
+++ b/entities/Category.php
@@ -1,13 +1,13 @@
 <?php
 
-require_once("mother_entity.php");
+namespace Entities;
 
 /**
  * Classe d'un objet Category
  * @author Laura
  */
 
-class Category extends Entity{
+class Category extends Mother{
 
     private ?int         $_id = null;
     protected string     $_name = '';
diff --git a/entities/image_entity.php b/entities/Image.php
similarity index 96%
rename from entities/image_entity.php
rename to entities/Image.php
index 54219b9..11dfad5 100644
--- a/entities/image_entity.php
+++ b/entities/Image.php
@@ -1,13 +1,13 @@
 <?php
 
-require_once("mother_entity.php");
+namespace Entities;
 
 
 	/**
 	 * Classe d'un objet Projet
 	 * @author Laura
 	 */
-    class Image extends Entity{
+class Image extends Mother{
 
     private int       $_id;
     private string    $_name = '';
diff --git a/entities/mother_entity.php b/entities/Mother.php
similarity index 93%
rename from entities/mother_entity.php
rename to entities/Mother.php
index 992fb89..c05ced3 100644
--- a/entities/mother_entity.php
+++ b/entities/Mother.php
@@ -1,11 +1,13 @@
 <?php
 
+    namespace Entities;
+    
     /**
      * Classe d'un Mere de tout objet 
      * @author Yass & Laura
      */
 
-    class Entity{
+    class Mother{
 
         protected string    $_prefix = '';
 
diff --git a/entities/project_entity.php b/entities/Project.php
similarity index 98%
rename from entities/project_entity.php
rename to entities/Project.php
index d94d974..26c804d 100644
--- a/entities/project_entity.php
+++ b/entities/Project.php
@@ -1,11 +1,15 @@
 <?php
-require_once("mother_entity.php");
+    namespace Entities;
+
+    use \DateTime;
+    use \IntlDateFormatter;
+
 /**
  * Classe d'un objet Projet
  * @author Yass
  */
 
-class Project extends Entity{
+class Project extends Mother{
 
     private ?int    $_id 					= null;             
     private string  $_title 				= "";
diff --git a/entities/user_entity.php b/entities/User.php
similarity index 98%
rename from entities/user_entity.php
rename to entities/User.php
index fbbf693..6f57577 100644
--- a/entities/user_entity.php
+++ b/entities/User.php
@@ -1,11 +1,12 @@
 <?php
-	require_once("mother_entity.php");
+	    namespace Entities;
+
 	
 	/**
 	 * Classe d'un objet User
 	 * @author Besnik & Laura
 	 */
-	class User extends Entity{
+	class User extends Mother{
 		private int $_id;
 		private string $_name = '';
 		private string $_firstname = '';
diff --git a/index.php b/index.php
index 4013681..0b6c7b0 100644
--- a/index.php
+++ b/index.php
@@ -1,36 +1,31 @@
 <?php
-
     session_start();
     require(__DIR__ . "/vendor/autoload.php");
 
-    //environnement
+    // Environnement
     $dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
     $dotenv->safeLoad();
 
-    $strCtrl     = $_GET['ctrl']??'project';
-    $strMethod   = $_GET['action']??'home';
+    $strCtrl   = $_GET['ctrl'] ?? 'project';
+    $strMethod = $_GET['action'] ?? 'home';
 
-    $boolError   = false;
-    $strFileName = "./controllers/".$strCtrl."_controller.php";
+    $strClassName = "Controllers\\" . ucfirst($strCtrl) . "Ctrl";
 
-    if(file_exists($strFileName)){
-        require($strFileName);
-        $strClassName = ucfirst($strCtrl)."Ctrl";
-        if(class_exists($strClassName)){
-            $objController = new $strClassName();
-            if(method_exists($objController,$strMethod)){
-                $objController->$strMethod  ();
-            }else{
-                $boolError = true;
-            }
-        }else{
+    $boolError = false;
+
+    if (class_exists($strClassName)) {
+        $objController = new $strClassName();
+
+        if (method_exists($objController, $strMethod)) {
+            $objController->$strMethod();
+        } else {
             $boolError = true;
         }
-    }else{
+    } else {
         $boolError = true;
     }
 
-    if($boolError){
-        header("Location:index.php?ctrl=error&action=error_404");
-    }
-
+    if ($boolError) {
+        header("Location: index.php?ctrl=error&action=error_404");
+        exit; 
+    }
\ No newline at end of file
diff --git a/models/authorisation_model.php b/models/AuthorisationModel.php
similarity index 85%
rename from models/authorisation_model.php
rename to models/AuthorisationModel.php
index 010660b..f98030b 100644
--- a/models/authorisation_model.php
+++ b/models/AuthorisationModel.php
@@ -1,5 +1,7 @@
 <?php
-	require_once('mother_model.php');
+	namespace Models;
+	use \PDO;
+
 
 
 	/**
@@ -7,7 +9,7 @@
 	* @author : Laura
 	*/
 	
-	class AuthorisationModel extends Connect{
+	class AuthorisationModel extends MotherModel{
 
 		public function __construct(){
 			parent::__construct();
diff --git a/models/category_model.php b/models/CategoryModel.php
similarity index 96%
rename from models/category_model.php
rename to models/CategoryModel.php
index 6c48379..2511e11 100644
--- a/models/category_model.php
+++ b/models/CategoryModel.php
@@ -1,12 +1,14 @@
 <?php
-	require_once('mother_model.php');
+	namespace Models;
+	use \PDO;
+
 	
 	/**
 	* Traitement des requêtes pour les catégories
 	* @author : Laura
 	*/
 
-	class CategoryModel extends Connect{
+	class CategoryModel extends MotherModel{
 
 		/**
 		* Fonction de récupération des catégories
diff --git a/models/image_model.php b/models/ImageModel.php
similarity index 86%
rename from models/image_model.php
rename to models/ImageModel.php
index 39e8158..c471da4 100644
--- a/models/image_model.php
+++ b/models/ImageModel.php
@@ -1,5 +1,7 @@
 <?php
-	require_once('mother_model.php');
+	namespace Models;
+
+	use \PDO;
 
 	
 /**
@@ -7,7 +9,7 @@
  * @author Laura
  */
 
-	class ImageModel extends Connect{
+	class ImageModel extends MotherModel{
 
 		/**
 		* Fonction de récupération des images
diff --git a/models/mother_model.php b/models/MotherModel.php
similarity index 79%
rename from models/mother_model.php
rename to models/MotherModel.php
index f1b1caf..df9f2f7 100644
--- a/models/mother_model.php
+++ b/models/MotherModel.php
@@ -1,12 +1,16 @@
 <?php
-	class Connect {
+	namespace Models;
+
+	use \PDO;
+
+	class MotherModel {
 		
 		protected $_db;
 
 		public function __construct(){
 			try{
 				$this->_db	= new PDO(
-								"mysql:host=boulayoune.com;dbname=projet_folliow", 
+								"mysql:host=localhost;dbname=projet_folliow", 
 								"projet_user", 
 								"F0lliowRules!",
 								array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC) 
diff --git a/models/project_model.php b/models/ProjectModel.php
similarity index 99%
rename from models/project_model.php
rename to models/ProjectModel.php
index b12bf79..a248884 100644
--- a/models/project_model.php
+++ b/models/ProjectModel.php
@@ -1,5 +1,8 @@
 <?php
-	require_once('mother_model.php');
+	namespace Models;
+
+	use \PDO;
+
 
 
 	/**
@@ -7,7 +10,7 @@
 	* @author Laura & Guillaume
 	*/
 	
-	class ProjectModel extends Connect{
+	class ProjectModel extends MotherModel{
 
 
 		/**
diff --git a/models/user_model.php b/models/UserModel.php
similarity index 99%
rename from models/user_model.php
rename to models/UserModel.php
index c91b072..4513f31 100644
--- a/models/user_model.php
+++ b/models/UserModel.php
@@ -1,5 +1,8 @@
 <?php
-	require_once('mother_model.php');
+	namespace Models;
+
+	use \PDO;
+
 
 
 	/**
@@ -7,7 +10,7 @@
 	* @author : Yasser, Guillaume & Besnik
 	*/
 
-	class UserModel extends Connect{
+	class UserModel extends MotherModel{
 
 		public function __construct(){
 			parent::__construct();
diff --git a/uploads/projects/699db11d1741e_gallery.webp b/uploads/projects/699db11d1741e_gallery.webp
deleted file mode 100644
index 88d37ae..0000000
Binary files a/uploads/projects/699db11d1741e_gallery.webp and /dev/null differ
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 5451b88..ebfd8a1 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -12,7 +12,9 @@ return array(
     'Smarty\\' => array($vendorDir . '/smarty/smarty/src'),
     'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
     'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
-    'Guill\\Guillaume\\' => array($baseDir . '/src'),
+    'Models\\' => array($baseDir . '/models'),
     'GrahamCampbell\\ResultType\\' => array($vendorDir . '/graham-campbell/result-type/src'),
+    'Entities\\' => array($baseDir . '/entities'),
     'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
+    'Controllers\\' => array($baseDir . '/controllers'),
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index a7c1951..64f2380 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -26,15 +26,26 @@ class ComposerStaticInit68f8d029d347b4c0c8cdbe33eeb96101
             'PhpOption\\' => 10,
             'PHPMailer\\PHPMailer\\' => 20,
         ),
+        'M' =>
+        array (
+            'Models\\' => 7,
+        ),
         'G' =>
         array (
-            'Guill\\Guillaume\\' => 16,
             'GrahamCampbell\\ResultType\\' => 26,
         ),
+        'E' =>
+        array (
+            'Entities\\' => 9,
+        ),
         'D' =>
         array (
             'Dotenv\\' => 7,
         ),
+        'C' =>
+        array (
+            'Controllers\\' => 12,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -62,18 +73,26 @@ class ComposerStaticInit68f8d029d347b4c0c8cdbe33eeb96101
         array (
             0 => __DIR__ . '/..' . '/phpmailer/phpmailer/src',
         ),
-        'Guill\\Guillaume\\' =>
+        'Models\\' =>
         array (
-            0 => __DIR__ . '/../..' . '/src',
+            0 => __DIR__ . '/../..' . '/models',
         ),
         'GrahamCampbell\\ResultType\\' =>
         array (
             0 => __DIR__ . '/..' . '/graham-campbell/result-type/src',
         ),
+        'Entities\\' =>
+        array (
+            0 => __DIR__ . '/../..' . '/entities',
+        ),
         'Dotenv\\' =>
         array (
             0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
         ),
+        'Controllers\\' =>
+        array (
+            0 => __DIR__ . '/../..' . '/controllers',
+        ),
     );
 
     public static $classMap = array (