diff --git a/composer.json b/composer.json
index 9ba084e910e2fdfcc62deb8b85fe81af42afaf44..23fbb3bac07f165acc7f8a4120863cd7e89da23d 100755
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
             "Action\\"        : "src/app/action/",
             "Basket\\"        : "src/app/basket/",
             "Contact\\"       : "src/app/contact/",
+            "Entity\\"        : "src/app/entity/",
             "History\\"       : "src/app/history/",
             "Parameter\\"     : "src/app/parameter/",
             "Priority\\"      : "src/app/priority/",
diff --git a/core/Controllers/StoreController.php b/core/Controllers/StoreController.php
index ae081886ba85948d934266084236969e4bf747e6..ce150e179486fe15c57e2a97b9b1d2ac13de8563 100644
--- a/core/Controllers/StoreController.php
+++ b/core/Controllers/StoreController.php
@@ -23,7 +23,7 @@ use Core\Models\DocserverTypeModel;
 use Core\Models\ResExtModel;
 use Core\Models\UserModel;
 use Core\Models\ValidatorModel;
-use Entities\Models\EntityModel;
+use Entity\models\EntityModel;
 use Resource\models\ResModel;
 use SrcCore\models\CoreConfigModel;
 
diff --git a/core/Controllers/UserController.php b/core/Controllers/UserController.php
index f1a524746ce73e6fa79ef8bf4bcce46eef3a93d1..b6e9b196c4eb9320cc0afb47d75ded4cfefe23d1 100755
--- a/core/Controllers/UserController.php
+++ b/core/Controllers/UserController.php
@@ -20,8 +20,8 @@ use Core\Models\GroupModel;
 use Core\Models\SecurityModel;
 use Core\Models\ServiceModel;
 use Core\Models\UserModel;
-use Entities\Models\EntityModel;
 use Entities\Models\ListModelsModel;
+use Entity\models\EntityModel;
 use History\controllers\HistoryController;
 use History\models\HistoryModel;
 use Psr\Http\Message\RequestInterface;
diff --git a/core/Models/UserModelAbstract.php b/core/Models/UserModelAbstract.php
index da53605d2af1aeb0c8cba9e2ba8218878e832cee..2a18a0feca84315a5a9ff4777c6dac12e085e606 100755
--- a/core/Models/UserModelAbstract.php
+++ b/core/Models/UserModelAbstract.php
@@ -15,7 +15,7 @@
 
 namespace Core\Models;
 
-use Entities\Models\EntityModel;
+use Entity\models\EntityModel;
 use History\controllers\HistoryController;
 use SrcCore\models\CoreConfigModel;
 
diff --git a/modules/entities/Controllers/EntitiesController.php b/modules/entities/Controllers/EntitiesController.php
deleted file mode 100755
index 153a19c78c9e9b526c8a201d148c97d853763b1f..0000000000000000000000000000000000000000
--- a/modules/entities/Controllers/EntitiesController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
-
-/**
-* @brief Resource Controller
-* @author dev@maarch.org
-* @ingroup core
-*/
-
-namespace Core\Controllers;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Respect\Validation\Validator;
-use Entities\Models\EntityModel;
-
-class EntitiesController
-{
-
-    
-}
diff --git a/modules/notifications/Models/NotificationModelAbstract.php b/modules/notifications/Models/NotificationModelAbstract.php
index 08193a55d5429306142e32e4c610c86379ce417b..b12bfa7ce6a66c15138936f5ea7a3a8d296ee6e0 100644
--- a/modules/notifications/Models/NotificationModelAbstract.php
+++ b/modules/notifications/Models/NotificationModelAbstract.php
@@ -17,8 +17,8 @@ namespace Notifications\Models;
 
 use Core\Models\DatabaseModel;
 use Core\Models\ValidatorModel;
+use Entity\models\EntityModel;
 use Status\models\StatusModel;
-use Entities\Models\EntityModelAbstract;
 use Core\Models\GroupModelAbstract;
 
 class NotificationModelAbstract 
@@ -315,7 +315,7 @@ class NotificationModelAbstract
 
     public static function getDiffusionTypeEntities()
     {
-        $entities = EntityModelAbstract::get();
+        $entities = EntityModel::get();
         return $entities;
     }
 
diff --git a/src/app/entity/controllers/EntityController.php b/src/app/entity/controllers/EntityController.php
new file mode 100644
index 0000000000000000000000000000000000000000..450fbfb4ceee21da8f074bdaa9d074769b764921
--- /dev/null
+++ b/src/app/entity/controllers/EntityController.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+* Copyright Maarch since 2008 under licence GPLv3.
+* See LICENCE.txt file at the root folder for more details.
+* This file is part of Maarch software.
+*
+*/
+
+/**
+* @brief Entity Controller
+* @author dev@maarch.org
+*/
+
+namespace Entity\controllers;
+
+use Core\Models\ServiceModel;
+use Respect\Validation\Validator;
+use Slim\Http\Request;
+use Slim\Http\Response;
+
+class EntityController
+{
+    public function get(Request $request, Response $response)
+    {
+        if (!ServiceModel::hasService(['id' => 'manage_entities', 'userId' => $GLOBALS['userId'], 'location' => 'entities', 'type' => 'admin'])) {
+            return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
+        }
+
+        return $response->withJson(['baskets' => BasketModel::get()]);
+    }
+}
diff --git a/modules/entities/Models/EntityModel.php b/src/app/entity/models/EntityModel.php
old mode 100755
new mode 100644
similarity index 76%
rename from modules/entities/Models/EntityModel.php
rename to src/app/entity/models/EntityModel.php
index 257177c993811808eacca20aba2e78458b76d700..ba8324757779367763ec81e9c524b004c4800515
--- a/modules/entities/Models/EntityModel.php
+++ b/src/app/entity/models/EntityModel.php
@@ -10,12 +10,10 @@
 /**
 * @brief Entity Model
 * @author dev@maarch.org
-* @ingroup entities
 */
 
-namespace Entities\Models;
+namespace Entity\models;
 
 class EntityModel extends EntityModelAbstract
 {
-    // Do your stuff in this class
 }
diff --git a/modules/entities/Models/EntityModelAbstract.php b/src/app/entity/models/EntityModelAbstract.php
old mode 100755
new mode 100644
similarity index 98%
rename from modules/entities/Models/EntityModelAbstract.php
rename to src/app/entity/models/EntityModelAbstract.php
index 7ebcf8ccbfabc8e20d5e50ce203063847ed479b9..49f5cf6c2bbbf6173258f0204eaaf5ee9182bbc3
--- a/modules/entities/Models/EntityModelAbstract.php
+++ b/src/app/entity/models/EntityModelAbstract.php
@@ -8,12 +8,11 @@
 */
 
 /**
-* @brief Entities Model
+* @brief Entity Model Abstract
 * @author dev@maarch.org
-* @ingroup entities
 */
 
-namespace Entities\Models;
+namespace Entity\models;
 
 use Core\Models\DatabaseModel;
 use Core\Models\UserModel;
diff --git a/src/core/controllers/PreparedClauseController.php b/src/core/controllers/PreparedClauseController.php
index 1711483c3a972c19e61028fe5e861d28b8423787..76d87be1d62b8c6f7cf8599f00b8c219c3ff9231 100644
--- a/src/core/controllers/PreparedClauseController.php
+++ b/src/core/controllers/PreparedClauseController.php
@@ -17,7 +17,7 @@ namespace SrcCore\controllers;
 
 use Core\Models\UserModel;
 use Core\Models\ValidatorModel;
-use Entities\Models\EntityModel;
+use Entity\models\EntityModel;
 use Resource\models\ResModel;
 
 class PreparedClauseController