diff --git a/Project/php/composer.json b/Project/php/composer.json
old mode 100644
new mode 100755
index 05b57b9..125a32b
--- a/Project/php/composer.json
+++ b/Project/php/composer.json
@@ -4,8 +4,9 @@
   },
   "autoload": {
     "psr-4": {
-      "controleur\\": "controleur/",
       "config\\": "config/",
+      "controller\\": "controller/",
+      "gateway\\": "gateway/",
       "model\\": "model/"
     }
   }
diff --git a/Project/php/composer.phar b/Project/php/composer.phar
old mode 100644
new mode 100755
diff --git a/Project/php/config/Validation.php b/Project/php/config/Validation.php
old mode 100644
new mode 100755
diff --git a/Project/php/controleur/Controleur.php b/Project/php/controller/Controleur.php
old mode 100644
new mode 100755
similarity index 95%
rename from Project/php/controleur/Controleur.php
rename to Project/php/controller/Controleur.php
index 8e4b61d..25f0889
--- a/Project/php/controleur/Controleur.php
+++ b/Project/php/controller/Controleur.php
@@ -1,7 +1,7 @@
 <?php
 namespace controleur;
 
-class Controleur
+class ControleurTmp
 {
     public function __construct()
     {
diff --git a/Project/php/model/FrontController.php b/Project/php/controller/FrontController.php
old mode 100644
new mode 100755
similarity index 100%
rename from Project/php/model/FrontController.php
rename to Project/php/controller/FrontController.php
diff --git a/Project/php/model/StudentController.php b/Project/php/controller/StudentController.php
similarity index 100%
rename from Project/php/model/StudentController.php
rename to Project/php/controller/StudentController.php
diff --git a/Project/php/model/GroupGateway.php b/Project/php/gateway/GroupGateway.php
old mode 100644
new mode 100755
similarity index 96%
rename from Project/php/model/GroupGateway.php
rename to Project/php/gateway/GroupGateway.php
index b320dd9..9cc090d
--- a/Project/php/model/GroupGateway.php
+++ b/Project/php/gateway/GroupGateway.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace model;
-use config\Connection;
-require_once('../config/Connection.php');
-require_once('Group.php');
-use PDO;
+namespace gateway;
+
 class GroupGateway
 {
     private Connection $con;
diff --git a/Project/php/model/UserGateway.php b/Project/php/gateway/UserGateway.php
similarity index 99%
rename from Project/php/model/UserGateway.php
rename to Project/php/gateway/UserGateway.php
index 01d9f9a..28a3297 100755
--- a/Project/php/model/UserGateway.php
+++ b/Project/php/gateway/UserGateway.php
@@ -1,8 +1,5 @@
 <?php
-namespace model;
-
-use config\Connection;
-use PDO;
+namespace gateway;
 
 class UserGateway
 {
diff --git a/Project/php/model/VocabularyGateway.php b/Project/php/gateway/VocabularyGateway.php
similarity index 95%
rename from Project/php/model/VocabularyGateway.php
rename to Project/php/gateway/VocabularyGateway.php
index 9b7193a..148671b 100755
--- a/Project/php/model/VocabularyGateway.php
+++ b/Project/php/gateway/VocabularyGateway.php
@@ -1,11 +1,6 @@
 <?php
-namespace model;
-use config\Connection;
-require_once('../config/Connection.php');
-require_once('Vocabulary.php');
+namespace gateway;
 
-use mysql_xdevapi\Exception;
-use PDO;
 class  VocabularyGateway
 {
     private Connection $con;
diff --git a/Project/php/model/Group.php b/Project/php/model/Group.php
index 9136987..f9e45b1 100755
--- a/Project/php/model/Group.php
+++ b/Project/php/model/Group.php
@@ -1,8 +1,6 @@
 <?php
 namespace model;
 
-use function Sodium\add;
-
 class Group
 {
     protected int $id;
diff --git a/Project/php/model/MdlStudent.php b/Project/php/model/MdlStudent.php
index ee61eee..e05230d 100755
--- a/Project/php/model/MdlStudent.php
+++ b/Project/php/model/MdlStudent.php
@@ -1,9 +1,6 @@
 <?php
 
 namespace model;
-use config\Connection;
-use http\Exception;
-use model\UserGateway;
 
 class MdlStudent
 {