diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index a89a879923..f688553c60 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -30,7 +30,7 @@ use Alchemy\Phrasea\Controller\Admin\Users;
 use Alchemy\Phrasea\Controller\Client\Baskets as ClientBasket;
 use Alchemy\Phrasea\Controller\Client\Root as ClientRoot;
 use Alchemy\Phrasea\Controller\Minifier;
-use Alchemy\Phrasea\Controller\Prod\Basket;
+use Alchemy\Phrasea\Controller\Prod\BasketController;
 use Alchemy\Phrasea\Controller\Prod\Bridge;
 use Alchemy\Phrasea\Controller\Prod\Download;
 use Alchemy\Phrasea\Controller\Prod\DoDownload;
@@ -787,7 +787,7 @@ class Application extends SilexApplication
 
         $this->mount('/prod/query/', new Query());
         $this->mount('/prod/order/', new Order());
-        $this->mount('/prod/baskets', new Basket());
+        $this->mount('/prod/baskets', new BasketController());
         $this->mount('/prod/download', new Download());
         $this->mount('/prod/story', new Story());
         $this->mount('/prod/WorkZone', new WorkZone());
diff --git a/lib/Alchemy/Phrasea/Authentication/Authenticator.php b/lib/Alchemy/Phrasea/Authentication/Authenticator.php
index 0874804dde..1026f6e35b 100644
--- a/lib/Alchemy/Phrasea/Authentication/Authenticator.php
+++ b/lib/Alchemy/Phrasea/Authentication/Authenticator.php
@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Browser;
 use Doctrine\ORM\EntityManager;
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -88,7 +88,7 @@ class Authenticator
 
     public function refreshAccount(Session $session)
     {
-        if (!$this->em->getRepository('Entities\Session')->findOneBy(array('id' => $session->getId()))) {
+        if (!$this->em->getRepository('Alchemy\Phrasea\Model\Entities\Session')->findOneBy(array('id' => $session->getId()))) {
             throw new RuntimeException('Unable to refresh the session, it does not exist anymore');
         }
 
diff --git a/lib/Alchemy/Phrasea/Authentication/Manager.php b/lib/Alchemy/Phrasea/Authentication/Manager.php
index 3795c99cc0..ab5e7f0c0b 100644
--- a/lib/Alchemy/Phrasea/Authentication/Manager.php
+++ b/lib/Alchemy/Phrasea/Authentication/Manager.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Authentication;
 
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 
 class Manager
 {
diff --git a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
index dd2c1bf359..5b52ff66d4 100644
--- a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
+++ b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
@@ -13,7 +13,7 @@ namespace Alchemy\Phrasea\Authentication\PersistentCookie;
 
 use Alchemy\Phrasea\Authentication\Phrasea\PasswordEncoder;
 use Doctrine\ORM\EntityManager;
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 
 class Manager
 {
@@ -38,7 +38,7 @@ class Manager
     public function getSession($cookieValue)
     {
         $session = $this->em
-            ->getRepository('Entities\Session')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Session')
             ->findOneBy(array('token' => $cookieValue));
 
         if (!$session) {
diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
index ef557949d0..611a1816a9 100644
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Authentication\Phrasea;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Authentication\Exception\RequireCaptchaException;
 use Doctrine\ORM\EntityManager;
-use Entities\AuthFailure;
+use Alchemy\Phrasea\Model\Entities\AuthFailure;
 use Neutron\ReCaptcha\ReCaptcha;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -80,7 +80,7 @@ class FailureManager
     public function checkFailures($username, Request $request)
     {
         $failures = $this->em
-            ->getRepository('Entities\AuthFailure')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
             ->findLockedFailuresMatching($username, $request->getClientIp());
 
         if (0 === count($failures)) {
@@ -109,7 +109,7 @@ class FailureManager
     private function removeOldFailures()
     {
         $failures = $this->em
-            ->getRepository('Entities\AuthFailure')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
             ->findOldFailures('-2 months');
 
         if (0 < count($failures)) {
diff --git a/lib/Alchemy/Phrasea/Border/Manager.php b/lib/Alchemy/Phrasea/Border/Manager.php
index f28161219b..c07ccf6e1f 100644
--- a/lib/Alchemy/Phrasea/Border/Manager.php
+++ b/lib/Alchemy/Phrasea/Border/Manager.php
@@ -28,9 +28,10 @@ use Alchemy\Phrasea\Metadata\Tag\TfRecordid;
 use Alchemy\Phrasea\Metadata\Tag\TfSize;
 use Alchemy\Phrasea\Metadata\Tag\TfWidth;
 use Alchemy\Phrasea\Border\Attribute\Metadata as MetadataAttr;
-use Entities\LazaretAttribute;
-use Entities\LazaretFile;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretAttribute;
+use Alchemy\Phrasea\Model\Entities\LazaretCheck;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use MediaAlchemyst\Exception\ExceptionInterface as MediaAlchemystException;
 use MediaAlchemyst\Specification\Image as ImageSpec;
 use PHPExiftool\Driver\Metadata\Metadata;
@@ -428,7 +429,8 @@ class Manager
      * @param  Visa                  $visa    The visa related to the package file
      * @param  LazaretSession        $session The current LazaretSession
      * @param  Boolean               $forced  True if the file has been forced to quarantine
-     * @return \Entities\LazaretFile
+     *
+     * @return LazaretFile
      */
     protected function createLazaret(File $file, Visa $visa, LazaretSession $session, $forced)
     {
@@ -486,7 +488,7 @@ class Manager
         foreach ($visa->getResponses() as $response) {
             if ( ! $response->isOk()) {
 
-                $check = new \Entities\LazaretCheck();
+                $check = new LazaretCheck();
                 $check->setCheckClassname(get_class($response->getChecker()));
                 $check->setLazaretFile($lazaretFile);
 
diff --git a/lib/Alchemy/Phrasea/Command/RecordAdd.php b/lib/Alchemy/Phrasea/Command/RecordAdd.php
index ba5184266b..a56af11811 100644
--- a/lib/Alchemy/Phrasea/Command/RecordAdd.php
+++ b/lib/Alchemy/Phrasea/Command/RecordAdd.php
@@ -14,8 +14,8 @@ namespace Alchemy\Phrasea\Command;
 use Alchemy\Phrasea\Command\Command;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager;
-use Entities\LazaretFile;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
index 06faee873c..4b75e35ca7 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
@@ -35,7 +35,7 @@ class ConnectedUsers implements ControllerProviderInterface
 
     public function listConnectedUsers(Application $app, Request $request)
     {
-        $dql = 'SELECT s FROM Entities\Session s
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s
             WHERE
                 s.updated > :date
             ORDER BY s.updated DESC';
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
index f67008ce19..dff13e1485 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
-use Entities\Feed;
-use Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -37,7 +37,7 @@ class Publications implements ControllerProviderInterface
         });
 
         $controllers->get('/list/', function(PhraseaApplication $app) {
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser(
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(
                 $app['authentication']->getUser()
             );
 
@@ -79,7 +79,7 @@ class Publications implements ControllerProviderInterface
         })->bind('admin_feeds_create');
 
         $controllers->get('/feed/{id}/', function(PhraseaApplication $app, Request $request, $id) {
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             return $app['twig']
                     ->render('admin/publications/fiche.html.twig', array('feed'  => $feed, 'error' => $app['request']->query->get('error')));
@@ -93,7 +93,7 @@ class Publications implements ControllerProviderInterface
                 $app->abort(400, "Bad request");
             }
 
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             try {
                 $collection = \collection::get_from_base_id($app, $request->request->get('base_id'));
@@ -109,7 +109,7 @@ class Publications implements ControllerProviderInterface
 
             return $app->redirectPath('admin_feeds_list');
         })->before(function(Request $request) use ($app) {
-            $feed = $app["EM"]->find('Entities\Feed', $request->attributes->get('id'));
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $request->attributes->get('id'));
 
             if (!$feed->isOwner($app['authentication']->getUser())) {
                 return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' =>  _('You are not the owner of this feed, you can not edit it')));
@@ -123,7 +123,7 @@ class Publications implements ControllerProviderInterface
                 'success' => false,
                 'message' => '',
             );
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
@@ -197,7 +197,7 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
                 $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app);
-                $feed = $app["EM"]->find('Entities\Feed', $id);
+                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
                 $publisher = new FeedPublisher();
                 $publisher->setUsrId($user->get_id());
@@ -222,9 +222,9 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
 
-                $feed = $app["EM"]->find('Entities\Feed', $id);
+                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
-                $publisher = $app["EM"]->find('Entities\FeedPublisher', $request->request->get('publisher_id'));
+                $publisher = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedPublisher', $request->request->get('publisher_id'));
                 if (null === $publisher) {
                     $app->abort(404, "Feed Publisher not found");
                 }
@@ -246,7 +246,7 @@ class Publications implements ControllerProviderInterface
             ->assert('id', '\d+');
 
         $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) {
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404);
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
index d8bb16ce0f..9bcf8f05a3 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Helper\User as UserHelper;
-use Entities\FtpCredential;
+use Alchemy\Phrasea\Model\Entities\FtpCredential;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
index 2916ef8695..f935176aac 100644
--- a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
+++ b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
@@ -11,8 +11,8 @@
 
 namespace Alchemy\Phrasea\Controller\Client;
 
-use Entities\Basket;
-use Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Doctrine\Common\Collections\ArrayCollection;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
@@ -139,7 +139,7 @@ class Baskets implements ControllerProviderInterface
     public function deleteBasketElement(Application $app, Request $request)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
             $basketElement = $repository->findUserElement($request->request->get('p0'), $app['authentication']->getUser());
             $app['EM']->remove($basketElement);
             $app['EM']->flush();
@@ -162,7 +162,7 @@ class Baskets implements ControllerProviderInterface
     public function deleteBasket(Application $app, Request $request)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
             /* @var $repository \Repositories\BasketRepository */
             $basket = $repository->findUserBasket($app, $request->request->get('courChuId'), $app['authentication']->getUser(), true);
 
@@ -213,7 +213,7 @@ class Baskets implements ControllerProviderInterface
      */
     public function addElementToBasket(Application $app, Request $request)
     {
-        $repository = $app['EM']->getRepository('\Entities\Basket');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
         /* @var $repository \Repositories\BasketRepository */
         $basket = $repository->findUserBasket($app, $request->request->get('courChuId'), $app['authentication']->getUser(), true);
 
@@ -249,7 +249,7 @@ class Baskets implements ControllerProviderInterface
     public function getBaskets(Application $app, Request $request)
     {
         $selectedBasketId = trim($request->get('courChuId', ''));
-        $baskets = new ArrayCollection($app['EM']->getRepository('\Entities\Basket')->findActiveByUser($app['authentication']->getUser()));
+        $baskets = new ArrayCollection($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findActiveByUser($app['authentication']->getUser()));
         $selectedBasket = null;
 
         if ('' === $selectedBasketId && $baskets->count() > 0) {
@@ -257,7 +257,7 @@ class Baskets implements ControllerProviderInterface
         }
 
         if ('' !== $selectedBasketId) {
-            $selectedBasket = $app['EM']->getRepository('\Entities\Basket')->findUserBasket($app, $selectedBasketId, $app['authentication']->getUser(), true);
+            $selectedBasket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findUserBasket($app, $selectedBasketId, $app['authentication']->getUser(), true);
         }
 
         $basketCollections = $baskets->partition(function($key, $basket) {
@@ -283,7 +283,7 @@ class Baskets implements ControllerProviderInterface
     public function checkBaskets(Application $app, Request $request)
     {
         $noview = 0;
-        $repository = $app['EM']->getRepository('\Entities\Basket');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
         $baskets = $repository->findActiveByUser($app['authentication']->getUser());
diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php
index 0e40bf93a0..41503b7c9e 100644
--- a/lib/Alchemy/Phrasea/Controller/Client/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php
@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Controller\Client;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Alchemy\Phrasea\Exception\SessionNotFound;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\Finder\Finder;
diff --git a/lib/Alchemy/Phrasea/Controller/Datafiles.php b/lib/Alchemy/Phrasea/Controller/Datafiles.php
index 628b763580..9499c71152 100644
--- a/lib/Alchemy/Phrasea/Controller/Datafiles.php
+++ b/lib/Alchemy/Phrasea/Controller/Datafiles.php
@@ -85,7 +85,7 @@ class Datafiles extends AbstractDelivery
 
                 if ($watermark && !$all_access) {
 
-                    $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                    $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                     /* @var $repository \Repositories\BasketElementRepository */
 
diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php
index 440be22108..c866ee0f0b 100644
--- a/lib/Alchemy/Phrasea/Controller/Lightbox.php
+++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php
@@ -11,6 +11,8 @@
 
 namespace Alchemy\Phrasea\Controller;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Alchemy\Phrasea\Exception\SessionNotFound;
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Silex\ControllerProviderInterface;
@@ -69,7 +71,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
 
@@ -99,7 +101,7 @@ class Lightbox implements ControllerProviderInterface
             }
 
             $basketElement = $app['EM']
-                ->getRepository('\Entities\BasketElement')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
                 ->findUserElement($sselcont_id, $app['authentication']->getUser());
 
             $parameters = array(
@@ -114,7 +116,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->get('/ajax/LOAD_BASKET_ELEMENT/{sselcont_id}/', function(SilexApplication $app, $sselcont_id) {
             /* @var $repository \Repositories\BasketElementRepository */
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
             $BasketElement = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -160,7 +162,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) {
 
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
             $item = $entry->getItem($item_id);
 
             if ($app['browser']->isMobile()) {
@@ -205,7 +207,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
@@ -259,7 +261,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
@@ -313,7 +315,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $feed_entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id);
+            $feed_entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
 
             $template = 'lightbox/feed.html.twig';
 
@@ -344,7 +346,7 @@ class Lightbox implements ControllerProviderInterface
 
             $template = 'lightbox/basket_content_report.html.twig';
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket = $repository->findUserBasket(
@@ -372,7 +374,7 @@ class Lightbox implements ControllerProviderInterface
             }
 
             /* @var $repository \Repositories\BasketElementRepository */
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
             $basket_element = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -419,14 +421,14 @@ class Lightbox implements ControllerProviderInterface
                     'datas'      => _('Erreur lors de la mise a jour des donnes ')
                 );
 
-                $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                 /* @var $repository \Repositories\BasketElementRepository */
                 $basket_element = $repository->findUserElement(
                     $sselcont_id
                     , $app['authentication']->getUser()
                 );
-                /* @var $basket_element \Entities\BasketElement */
+                /* @var $basket_element BasketElement */
                 $validationDatas = $basket_element->getUserValidationDatas($app['authentication']->getUser(), $app);
 
                 if (!$basket_element->getBasket()
@@ -466,7 +468,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->post('/ajax/SET_RELEASE/{ssel_id}/', function(SilexApplication $app, $ssel_id) {
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $datas = array('error' => true, 'datas' => '');
 
@@ -487,7 +489,7 @@ class Lightbox implements ControllerProviderInterface
                 }
 
                 $agreed = false;
-                /* @var $basket \Entities\Basket */
+                /* @var $basket Basket */
                 foreach ($basket->getElements() as $element) {
                     if (null !== $element->getUserValidationDatas($app['authentication']->getUser(), $app)->getAgreement()) {
                         $agreed = true;
@@ -498,7 +500,7 @@ class Lightbox implements ControllerProviderInterface
                     throw new ControllerException(_('You have to give your feedback at least on one document to send a report'));
                 }
 
-                /* @var $basket \Entities\Basket */
+                /* @var $basket Basket */
                 $participant = $basket->getValidation()->getParticipant($app['authentication']->getUser(), $app);
 
                 $expires = new \DateTime('+10 days');
diff --git a/lib/Alchemy/Phrasea/Controller/Permalink.php b/lib/Alchemy/Phrasea/Controller/Permalink.php
index 5464d7a154..4562f631dd 100644
--- a/lib/Alchemy/Phrasea/Controller/Permalink.php
+++ b/lib/Alchemy/Phrasea/Controller/Permalink.php
@@ -32,7 +32,7 @@ class Permalink extends AbstractDelivery
         $that = $this;
 
         $retrieveRecord = function ($app, $databox, $token, $record_id, $subdef) {
-            if (in_array($subdef, array(\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL)) && $app['EM']->getRepository('Entities\FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
+            if (in_array($subdef, array(\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL)) && $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
                 $record = $databox->get_record($record_id);
             } else {
                 $record = \media_Permalink_Adapter::challenge_token($app, $databox, $token, $record_id, $subdef);
@@ -75,7 +75,7 @@ class Permalink extends AbstractDelivery
 
                 if ($watermark) {
 
-                    $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                    $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                     if (count($repository->findReceivedValidationElementsByRecord($record, $user)) > 0) {
                         $watermark = false;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Basket.php b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
similarity index 91%
rename from lib/Alchemy/Phrasea/Controller/Prod/Basket.php
rename to lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
index ad7b04ed57..a34b46f557 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Basket.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
@@ -12,9 +12,9 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Entities\Basket as BasketEntity;
-use Entities\BasketElement;
-use Entities\ValidationData;
+use Alchemy\Phrasea\Model\Entities\Basket as BasketEntity;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\ValidationData;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,7 +26,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-class Basket implements ControllerProviderInterface
+class BasketController implements ControllerProviderInterface
 {
 
     public function connect(Application $app)
@@ -139,7 +139,7 @@ class Basket implements ControllerProviderInterface
 
     public function displayBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         if ($basket->getIsRead() === false) {
@@ -214,7 +214,7 @@ class Basket implements ControllerProviderInterface
 
     public function deleteBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $app['EM']->remove($basket);
@@ -234,11 +234,11 @@ class Basket implements ControllerProviderInterface
 
     public function removeBasketElement(Application $app, Request $request, $basket_id, $basket_element_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         foreach ($basket->getElements() as $basket_element) {
-            /* @var $basket_element \Entities\BasketElement */
+            /* @var $basket_element BasketElement */
             if ($basket_element->getId() == $basket_element_id) {
                 $app['EM']->remove($basket_element);
             }
@@ -263,7 +263,7 @@ class Basket implements ControllerProviderInterface
         $success = false;
 
         try {
-            $basket = $app['EM']->getRepository('\Entities\Basket')
+            $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                 ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
             $basket->setName($request->request->get('name', ''));
@@ -298,7 +298,7 @@ class Basket implements ControllerProviderInterface
     public function displayUpdateForm(Application $app, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         return $app['twig']->render('prod/Baskets/Update.html.twig', array('basket' => $basket));
@@ -307,7 +307,7 @@ class Basket implements ControllerProviderInterface
     public function displayReorderForm(Application $app, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         return $app['twig']->render('prod/Baskets/Reorder.html.twig', array('basket' => $basket));
@@ -317,12 +317,12 @@ class Basket implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => _('An error occured'));
         try {
-            $basket = $app['EM']->getRepository('\Entities\Basket')
+            $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                 ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
             $order = $app['request']->request->get('element');
 
-            /* @var $basket \Entities\Basket */
+            /* @var $basket BasketEntity */
             foreach ($basket->getElements() as $basketElement) {
                 if (isset($order[$basketElement->getId()])) {
                     $basketElement->setOrd($order[$basketElement->getId()]);
@@ -342,7 +342,7 @@ class Basket implements ControllerProviderInterface
 
     public function archiveBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $archive_status = (Boolean) $request->query->get('archive');
@@ -373,7 +373,7 @@ class Basket implements ControllerProviderInterface
 
     public function addElements(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $n = 0;
@@ -424,14 +424,14 @@ class Basket implements ControllerProviderInterface
 
     public function stealElements(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $n = 0;
 
         foreach ($request->request->get('elements') as $bask_element_id) {
             try {
-                $basket_element = $app['EM']->getRepository('\Entities\BasketElement')
+                $basket_element = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
                     ->findUserElement($bask_element_id, $app['authentication']->getUser());
             } catch (\Exception $e) {
                 continue;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
index 84f68e14e9..6283003c6d 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
@@ -15,8 +15,8 @@ use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator;
 use Alchemy\Phrasea\Feed\Link\FeedLinkGenerator;
-use Entities\FeedEntry;
-use Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -43,7 +43,7 @@ class Feed implements ControllerProviderInterface
          * I got a selection of docs, which publications are available forthese docs ?
          */
         $controllers->post('/requestavailable/', function(Application $app, Request $request) {
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
             $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub'));
 
             return $app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds' => $feeds));
@@ -53,13 +53,13 @@ class Feed implements ControllerProviderInterface
          * I've selected a publication for my docs, let's publish them
          */
         $controllers->post('/entry/create/', function(Application $app, Request $request) {
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($request->request->get('feed_id'));
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($request->request->get('feed_id'));
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
             }
 
-            $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()));
+            $publisher = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()));
 
             if ('' === $title = trim($request->request->get('title', ''))) {
                 $app->abort(400, "Bad request");
@@ -105,13 +105,13 @@ class Feed implements ControllerProviderInterface
             });
 
         $controllers->get('/entry/{id}/edit/', function(Application $app, Request $request, $id) {
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (!$entry->isPublisher($app['authentication']->getUser())) {
                 throw new AccessDeniedHttpException();
             }
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds));
 
@@ -125,7 +125,7 @@ class Feed implements ControllerProviderInterface
 
         $controllers->post('/entry/{id}/update/', function(Application $app, Request $request, $id) {
             $datas = array('error' => true, 'message' => '', 'datas' => '');
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -146,7 +146,7 @@ class Feed implements ControllerProviderInterface
             $new_feed_id = $request->request->get('feed_id', $currentFeedId);
             if ($currentFeedId !== (int) $new_feed_id) {
 
-                $new_feed = $app['EM']->getRepository('Entities\Feed')->find($new_feed_id);
+                $new_feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($new_feed_id);
 
                 if ($new_feed === null) {
                     $app->abort(404, 'Feed not found');
@@ -165,7 +165,7 @@ class Feed implements ControllerProviderInterface
                 if (count($item_sort_datas) != 2) {
                     continue;
                 }
-                $item = $app['EM']->getRepository('Entities\FeedItem')->find($item_sort_datas[0]);
+                $item = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item_sort_datas[0]);
                 $item->setOrd($item_sort_datas[1]);
                 $app['EM']->persist($item);
             }
@@ -189,7 +189,7 @@ class Feed implements ControllerProviderInterface
         $controllers->post('/entry/{id}/delete/', function(Application $app, Request $request, $id) {
             $datas = array('error' => true, 'message' => '');
 
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -213,7 +213,7 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array(
                 'feeds' => $feeds,
@@ -228,11 +228,11 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page));
 
@@ -244,7 +244,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/aggregated/', function(Application $app, Request $request) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $link = $app['feed.aggregate-link-generator']->generate(new Aggregate($app['EM'], $feeds),
                 $app['authentication']->getUser(),
@@ -265,7 +265,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/{id}/', function(Application $app, Request $request, $id) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
index 4497f3981b..bd4d1831a3 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Border;
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 use Alchemy\Phrasea\Http\DeliverDataInterface;
@@ -180,7 +180,7 @@ class Lazaret implements ControllerProviderInterface
         $lazaretFiles = null;
 
         if (count($baseIds) > 0) {
-            $lazaretRepository = $app['EM']->getRepository('Entities\LazaretFile');
+            $lazaretRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile');
 
             $lazaretFiles = $lazaretRepository->findPerPage(
                 $baseIds, $request->query->get('offset', 0), $request->query->get('limit', 10)
@@ -205,9 +205,9 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -254,9 +254,9 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -363,8 +363,8 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
-        /* @var $lazaretFile \Entities\LazaretFile */
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -410,7 +410,7 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFiles = $app['EM']->getRepository('Entities\LazaretFile')->findAll();
+        $lazaretFiles = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile')->findAll();
 
         $app['EM']->beginTransaction();
 
@@ -448,9 +448,9 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -519,9 +519,9 @@ class Lazaret implements ControllerProviderInterface
      */
     public function thumbnailElement(Application $app, Request $request, $file_id)
     {
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             return new Response(null, 404);
         }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Order.php b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
index 562c48b0b6..8c16a9d455 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Order.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
@@ -13,10 +13,10 @@ namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\Basket;
-use Entities\BasketElement;
-use Entities\Order as OrderEntity;
-use Entities\OrderElement;
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\Order as OrderEntity;
+use Alchemy\Phrasea\Model\Entities\OrderElement;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -261,8 +261,8 @@ class Order implements ControllerProviderInterface
 
         $baseIds = array_keys($app['authentication']->getUser()->ACL()->get_granted_base(array('order_master')));
 
-        $ordersList = $app['EM']->getRepository('Entities\Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
-        $total = $app['EM']->getRepository('Entities\Order')->countTotalOrders($baseIds);
+        $ordersList = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
+        $total = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->countTotalOrders($baseIds);
 
         return $app['twig']->render('prod/orders/order_box.html.twig', array(
             'page'         => $page,
@@ -284,7 +284,7 @@ class Order implements ControllerProviderInterface
      */
     public function displayOneOrder(Application $app, Request $request, $order_id)
     {
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -305,7 +305,7 @@ class Order implements ControllerProviderInterface
     public function sendOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -392,7 +392,7 @@ class Order implements ControllerProviderInterface
     public function denyOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
index 1bd2d499be..6614274c69 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
@@ -11,6 +11,13 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\UsrList;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry;
+use Alchemy\Phrasea\Model\Entities\ValidationSession;
+use Alchemy\Phrasea\Model\Entities\ValidationData;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
@@ -48,11 +55,11 @@ class Push implements ControllerProviderInterface
     {
         $userFormatter = $this->getUserFormatter();
 
-        return function(\Entities\UsrList $List) use ($userFormatter, $app) {
+        return function(UsrList $List) use ($userFormatter, $app) {
             $entries = array();
 
             foreach ($List->getEntries() as $entry) {
-                /* @var $entry \Entities\UsrListEntry */
+                /* @var $entry UsrListEntry */
                 $entries[] = array(
                     'Id'   => $entry->getId(),
                     'User' => $userFormatter($entry->getUser($app))
@@ -113,7 +120,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/sendform/', function(Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -131,7 +138,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/validateform/', function(Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -177,7 +184,7 @@ class Push implements ControllerProviderInterface
                         throw new ControllerException(sprintf(_('Unknown user %d'), $receiver['usr_id']));
                     }
 
-                    $Basket = new \Entities\Basket();
+                    $Basket = new Basket();
                     $Basket->setName($push_name);
                     $Basket->setDescription($push_description);
                     $Basket->setOwner($user_receiver);
@@ -187,7 +194,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Basket);
 
                     foreach ($pusher->get_elements() as $element) {
-                        $BasketElement = new \Entities\BasketElement();
+                        $BasketElement = new BasketElement();
                         $BasketElement->setRecord($element);
                         $BasketElement->setBasket($Basket);
 
@@ -274,7 +281,7 @@ class Push implements ControllerProviderInterface
             try {
                 $pusher = new RecordHelper\Push($app, $app['request']);
 
-                $repository = $app['EM']->getRepository('\Entities\Basket');
+                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
                 $validation_name = $request->request->get('name', sprintf(_('Validation from %s'), $app['authentication']->getUser()->get_display_name()));
                 $validation_description = $request->request->get('validation_description');
@@ -292,7 +299,7 @@ class Push implements ControllerProviderInterface
                 if ($pusher->is_basket()) {
                     $Basket = $pusher->get_original_basket();
                 } else {
-                    $Basket = new \Entities\Basket();
+                    $Basket = new Basket();
                     $Basket->setName($validation_name);
                     $Basket->setDescription($validation_description);
                     $Basket->setOwner($app['authentication']->getUser());
@@ -301,7 +308,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Basket);
 
                     foreach ($pusher->get_elements() as $element) {
-                        $BasketElement = new \Entities\BasketElement();
+                        $BasketElement = new BasketElement();
                         $BasketElement->setRecord($element);
                         $BasketElement->setBasket($Basket);
 
@@ -315,7 +322,7 @@ class Push implements ControllerProviderInterface
                 $app['EM']->refresh($Basket);
 
                 if (!$Basket->getValidation()) {
-                    $Validation = new \Entities\ValidationSession();
+                    $Validation = new ValidationSession();
                     $Validation->setInitiator($app['authentication']->getUser());
                     $Validation->setBasket($Basket);
 
@@ -368,7 +375,7 @@ class Push implements ControllerProviderInterface
 
                     }
 
-                    $Participant = new \Entities\ValidationParticipant();
+                    $Participant = new ValidationParticipant();
                     $Participant->setUser($participant_user);
                     $Participant->setSession($Validation);
 
@@ -378,7 +385,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Participant);
 
                     foreach ($Basket->getElements() as $BasketElement) {
-                        $ValidationData = new \Entities\ValidationData();
+                        $ValidationData = new ValidationData();
                         $ValidationData->setParticipant($Participant);
                         $ValidationData->setBasketElement($BasketElement);
                         $BasketElement->addValidationData($ValidationData);
@@ -490,7 +497,7 @@ class Push implements ControllerProviderInterface
         $controllers->get('/list/{list_id}/', function(Application $app, $list_id) use ($listFormatter) {
             $datas = null;
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -590,7 +597,7 @@ class Push implements ControllerProviderInterface
                     ->limit(0, 50)
                     ->execute()->get_results();
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $lists = $repository->findUserListLike($app['authentication']->getUser(), $request->query->get('query'));
 
@@ -613,7 +620,7 @@ class Push implements ControllerProviderInterface
 
         $controllers->match('/edit-list/{list_id}/', function(Application $app, Request $request, $list_id) {
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php
index 1a62f66f78..a2f4f6a951 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Query.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Query.php
@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Records.php b/lib/Alchemy/Phrasea/Controller/Prod/Records.php
index 480e791fb4..f272df98a5 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Records.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Records.php
@@ -204,8 +204,8 @@ class Records implements ControllerProviderInterface
             'candeleterecord'
         ));
 
-        $basketElementsRepository = $app['EM']->getRepository('\Entities\BasketElement');
-        $StoryWZRepository = $app['EM']->getRepository('\Entities\StoryWZ');
+        $basketElementsRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+        $StoryWZRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $deleted = array();
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
index f457634755..406db1bc2e 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
@@ -73,7 +73,7 @@ class Root implements ControllerProviderInterface
                 $cssfile = '000000';
             }
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
             $aggregate = Aggregate::createFromUser($app['EM'], $app['authentication']->getUser());
 
             $thjslist = "";
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Story.php b/lib/Alchemy/Phrasea/Controller/Prod/Story.php
index 7661a2d360..383c026031 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Story.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Story.php
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Alchemy\Phrasea\Controller\RecordsRequest;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -79,7 +80,7 @@ class Story implements ControllerProviderInterface
 
             $Story->set_metadatas($metadatas)->rebuild_subdefs();
 
-            $StoryWZ = new \Entities\StoryWZ();
+            $StoryWZ = new StoryWZ();
             $StoryWZ->setUser($app['authentication']->getUser());
             $StoryWZ->setRecord($Story);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php b/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
index 2109de6607..9dbc9e5cef 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
@@ -80,7 +80,7 @@ class Tooltip implements ControllerProviderInterface
 
     public function displayBasket(Application $app, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         return $app['twig']->render('prod/Tooltip/Basket.html.twig', array('basket' => $basket));
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
index b393431bf8..7567706cba 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Attribute\Status;
 use DataURI\Parser;
 use DataURI\Exception\Exception as DataUriException;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
index 7462ad9ef2..b65c331900 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\UsrList;
-use Entities\UsrListEntry;
-use Entities\UsrListOwner;
+use Alchemy\Phrasea\Model\Entities\UsrList;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry;
+use Alchemy\Phrasea\Model\Entities\UsrListOwner;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
@@ -110,7 +110,7 @@ class UsrLists implements ControllerProviderInterface
         $lists = new ArrayCollection();
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $lists = $repository->findUserLists($app['authentication']->getUser());
 
@@ -142,7 +142,7 @@ class UsrLists implements ControllerProviderInterface
                     );
                 }
 
-                /* @var $list \Entities\UsrList */
+                /* @var $list UsrList */
                 $result[] = array(
                     'name'    => $list->getName(),
                     'created' => $list->getCreated()->format(DATE_ATOM),
@@ -223,7 +223,7 @@ class UsrLists implements ControllerProviderInterface
 
     public function displayList(Application $app, Request $request, $list_id)
     {
-        $repository = $app['EM']->getRepository('\Entities\UsrList');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -281,7 +281,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException(_('List name is required'));
             }
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -312,7 +312,7 @@ class UsrLists implements ControllerProviderInterface
     public function removeList(Application $app, $list_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -346,16 +346,16 @@ class UsrLists implements ControllerProviderInterface
     public function removeUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
             }
 
-            $entry_repository = $app['EM']->getRepository('\Entities\UsrListEntry');
+            $entry_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListEntry');
 
             $user_entry = $entry_repository->findEntryByListAndUsrId($list, $usr_id);
 
@@ -389,10 +389,10 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException('Invalid or missing parameter usr_ids');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
@@ -453,10 +453,10 @@ class UsrLists implements ControllerProviderInterface
         $list = null;
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_ADMIN) {
                 $list = null;
@@ -483,10 +483,10 @@ class UsrLists implements ControllerProviderInterface
             throw new BadRequestHttpException('Role is invalid');
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
@@ -539,16 +539,16 @@ class UsrLists implements ControllerProviderInterface
     public function unshareWithUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_ADMIN) {
                 throw new \Exception(_('You are not authorized to do this'));
             }
 
-            $owners_repository = $app['EM']->getRepository('\Entities\UsrListOwner');
+            $owners_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListOwner');
 
             $owner = $owners_repository->findByListAndUsrId($list, $usr_id);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
index 89b5ce7c6f..7eaf1f4c9d 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\StoryWZ;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -80,7 +80,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $request = $app['request'];
 
-        $BasketRepo = $app['EM']->getRepository('\Entities\Basket');
+        $BasketRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         $Page = (int) $request->query->get('Page', 0);
 
@@ -115,7 +115,7 @@ class WorkZone implements ControllerProviderInterface
     public function browseBasket(Application $app, Request $request, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         return $app['twig']->render('prod/WorkZone/Browser/Basket.html.twig', array('Basket' => $basket));
@@ -127,7 +127,7 @@ class WorkZone implements ControllerProviderInterface
             throw new BadRequestHttpException('Missing parameters stories');
         }
 
-        $StoryWZRepo = $app['EM']->getRepository('\Entities\StoryWZ');
+        $StoryWZRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $alreadyFixed = $done = 0;
 
@@ -202,7 +202,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $Story = new \record_adapter($app, $sbas_id, $record_id);
 
-        $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         /* @var $repository \Repositories\StoryWZRepository */
         $StoryWZ = $repository->findUserStory($app, $app['authentication']->getUser(), $Story);
diff --git a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
index 0d74e3aa1f..1a78fef26a 100644
--- a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
+++ b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpFoundation\Request;
@@ -206,7 +206,7 @@ class RecordsRequest extends ArrayCollection
         $basket = null;
 
         if ($request->get('ssel')) {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($app, $request->get('ssel'), $app['authentication']->getUser(), false);
 
@@ -214,7 +214,7 @@ class RecordsRequest extends ArrayCollection
                 $received[$basket_element->getRecord($app)->get_serialize_key()] = $basket_element->getRecord($app);
             }
         } elseif ($request->get('story')) {
-            $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
             $storyWZ = $repository->findByUserAndId(
                 $app, $app['authentication']->getUser()
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php
index 9c027fe026..51cbfc1298 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Account.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php
@@ -269,7 +269,7 @@ class Account implements ControllerProviderInterface
      */
     public function accountSessionsAccess(Application $app, Request $request)
     {
-        $dql = 'SELECT s FROM Entities\Session s
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s
             WHERE s.usr_id = :usr_id
             ORDER BY s.created DESC';
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php
index 2266c4ef76..a01d53195f 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Login.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php
@@ -23,6 +23,8 @@ use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Exception\FormProcessingException;
 use Alchemy\Phrasea\Exception\RuntimeException;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
+use Alchemy\Phrasea\Model\Entities\UsrAuthProvider;
 use Alchemy\Phrasea\Notification\Receiver;
 use Alchemy\Phrasea\Notification\Mail\MailRequestPasswordUpdate;
 use Alchemy\Phrasea\Notification\Mail\MailRequestEmailConfirmation;
@@ -35,7 +37,6 @@ use Alchemy\Phrasea\Form\Login\PhraseaForgotPasswordForm;
 use Alchemy\Phrasea\Form\Login\PhraseaRecoverPasswordForm;
 use Alchemy\Phrasea\Form\Login\PhraseaRegisterForm;
 use Doctrine\ORM\EntityManager;
-use Entities\UsrAuthProvider;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -51,7 +52,7 @@ class Login implements ControllerProviderInterface
     {
         $items = array();
 
-        foreach($app['EM']->getRepository('Entities\FeedItem')->loadLatest($app, 20) as $item) {
+        foreach($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest($app, 20) as $item) {
             $record = $item->getRecord($app);
             $preview = $record->get_subdef('preview');
             $permalink = $preview->get_permalink();
@@ -281,7 +282,7 @@ class Login implements ControllerProviderInterface
                 }
 
                 $userAuthProvider = $app['EM']
-                    ->getRepository('Entities\UsrAuthProvider')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
                     ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
                 if (null !== $userAuthProvider) {
@@ -739,7 +740,7 @@ class Login implements ControllerProviderInterface
             $app->addFlash('error', _('login::erreur: No available connection - Please contact sys-admin'));
         }
 
-        $feeds = $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
+        $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
 
         $form = $app->form(new PhraseaAuthenticationForm());
         $form->setData(array(
@@ -831,10 +832,10 @@ class Login implements ControllerProviderInterface
         $date = new \DateTime('+' . (int) $app['phraseanet.registry']->get('GV_validation_reminder') . ' days');
 
         foreach ($app['EM']
-            ->getRepository('Entities\ValidationParticipant')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\ValidationParticipant')
             ->findNotConfirmedAndNotRemindedParticipantsByExpireDate($date) as $participant) {
 
-            /* @var $participant \Entities\ValidationParticipant */
+            /* @var $participant ValidationParticipant */
 
             $validationSession = $participant->getSession();
             $participantId = $participant->getUsrId();
@@ -904,7 +905,7 @@ class Login implements ControllerProviderInterface
         }
 
         $userAuthProvider = $app['EM']
-            ->getRepository('Entities\UsrAuthProvider')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
         if (null !== $userAuthProvider) {
@@ -1037,7 +1038,7 @@ class Login implements ControllerProviderInterface
             if (!$user->is_guest() && $request->cookies->has('invite-usr_id')) {
                 if ($user->get_id() != $inviteUsrId = $request->cookies->get('invite-usr_id')) {
 
-                    $repo = $app['EM']->getRepository('Entities\Basket');
+                    $repo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
                     $baskets = $repo->findBy(array('usr_id' => $inviteUsrId));
 
                     foreach ($baskets as $basket) {
diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
index 4edc13333e..eda1505d53 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Root;
 
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
@@ -29,7 +29,7 @@ class RSSFeeds implements ControllerProviderInterface
         $controllers = $app['controllers_factory'];
 
         $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) {
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
 
             if (null === $feed) {
                 $app->abort(404, 'Feed not found');
@@ -51,7 +51,7 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) {
-            $token = $app["EM"]->find('Entities\FeedToken', $id);
+            $token = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedToken', $id);
 
             $request = $app['request'];
 
@@ -66,11 +66,11 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) {
-            $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token));
+            $token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(array("value" => $token));
 
             $user = \User_Adapter::getInstance($token->getUsrId(), $app);
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($user);
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($user);
 
             $aggregate = new Aggregate($app['EM'], $feeds, $token);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Session.php b/lib/Alchemy/Phrasea/Controller/Root/Session.php
index a9d9ae7641..25851daa62 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Session.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Session.php
@@ -11,6 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Root;
 
+use Alchemy\Phrasea\Model\Entities\SessionModule;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -92,11 +93,11 @@ class Session implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $session = $app['EM']->find('Entities\Session', $app['session']->get('session_id'));
+        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $app['session']->get('session_id'));
         $session->setUpdated(new \DateTime());
 
         if (!$session->hasModuleId($moduleId)) {
-            $module = new \Entities\SessionModule();
+            $module = new SessionModule();
             $module->setModuleId($moduleId);
             $module->setSession($session);
             $app['EM']->persist($module);
@@ -113,7 +114,7 @@ class Session implements ControllerProviderInterface
             'notifications' => $app['events-manager']->get_notifications()
         ));
 
-        $baskets = $app['EM']->getRepository('\Entities\Basket')->findUnreadActiveByUser($app['authentication']->getUser());
+        $baskets = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findUnreadActiveByUser($app['authentication']->getUser());
 
         foreach ($baskets as $basket) {
             $ret['changed'][] = $basket->getId();
@@ -143,7 +144,7 @@ class Session implements ControllerProviderInterface
      */
     public function deleteSession(Application $app, Request $request, $id)
     {
-        $session = $app['EM']->find('Entities\Session', $id);
+        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $id);
 
         if (null === $session) {
             $app->abort(404, 'Unknown session');
diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
index 5d5106c866..5eb8e39b49 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
@@ -63,10 +63,10 @@ class ORMServiceProvider implements ServiceProviderInterface
 
             $annotationDriver = new AnnotationDriver(
                 $annotationReader,
-                array($app['root.path'].'/lib/Doctrine/Entities')
+                array($app['root.path'].'/lib/Alchemy/Phrasea/Model/Entities')
             );
 
-            $driverChain->addDriver($annotationDriver, 'Entities');
+            $driverChain->addDriver($annotationDriver, 'Alchemy\Phrasea\Model\Entities');
 
             return $driverChain;
         });
diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php
index 8352a7ca7a..aee3f80c4c 100644
--- a/lib/Alchemy/Phrasea/Feed/Aggregate.php
+++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php
@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Feed;
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\LogicException;
 use Doctrine\ORM\EntityManager;
-use Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
 
 class Aggregate implements FeedInterface
 {
@@ -76,8 +76,8 @@ class Aggregate implements FeedInterface
      */
     public static function createFromUser(EntityManager $em, \User_Adapter $user)
     {
-        $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user);
-        $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usrId' => $user->get_id()));
+        $feeds = $em->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($user);
+        $token = $em->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(array('usrId' => $user->get_id()));
 
         return new static($em, $feeds, $token);
     }
@@ -92,7 +92,7 @@ class Aggregate implements FeedInterface
      */
     public static function create(Application $app, array $feed_ids)
     {
-        $feeds = $this->em->getRepository('Entities\Feed')->findByIds($feed_ids);
+        $feeds = $this->em->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findByIds($feed_ids);
 
         return new static($app, $feeds);
     }
@@ -119,7 +119,7 @@ class Aggregate implements FeedInterface
             $feedIds[] = $feed->getId();
         }
 
-        return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
+        return $this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
     }
 
     /**
@@ -205,7 +205,7 @@ class Aggregate implements FeedInterface
                 $feedIds[] = $feed->getId();
             }
 
-            return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds));
+            return count($this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds));
         }
 
         return 0;
@@ -237,6 +237,6 @@ class Aggregate implements FeedInterface
      */
     public static function getPublic(Application $app)
     {
-        return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')));
+        return new static($app['EM'], $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')));
     }
 }
diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php
index ac4b1a0be7..91b7dece6d 100644
--- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php
+++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php
@@ -12,6 +12,7 @@
 namespace Alchemy\Phrasea\Feed;
 
 use Alchemy\Phrasea\Feed\Aggregate;
+use Alchemy\Phrasea\Model\Entities\Feed;
 
 /**
  * AggregateToken
@@ -63,10 +64,10 @@ class AggregateToken
     /**
      * Set feed
      *
-     * @param  Aggregate      $feed
+     * @param  Feed           $feed
      * @return AggregateToken
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->aggregatedFeed = $feed;
 
diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
index e25fe4102b..851121d921 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
@@ -6,7 +6,7 @@ use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\Feed\FeedInterface;
 use Alchemy\Phrasea\Feed\Link\FeedLink;
-use Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
@@ -122,7 +122,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
     private function getAggregateToken(\User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Entities\AggregateToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
             ->findOneBy(array('usrId' => $user->get_id()));
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
index a25f350cc1..001465813f 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
@@ -14,8 +14,8 @@ namespace Alchemy\Phrasea\Feed\Link;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Feed\FeedInterface;
 use Doctrine\ORM\EntityManager;
-use Entities\Feed;
-use Entities\FeedToken;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedToken;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
 class FeedLinkGenerator implements LinkGeneratorInterface
@@ -138,7 +138,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
     private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Entities\FeedToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
             ->findOneBy(array('usrId' => $user->get_id(), 'feed' => $feed->getId()));
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Helper/Record/Helper.php b/lib/Alchemy/Phrasea/Helper/Record/Helper.php
index 4607f68700..d998003859 100644
--- a/lib/Alchemy/Phrasea/Helper/Record/Helper.php
+++ b/lib/Alchemy/Phrasea/Helper/Record/Helper.php
@@ -12,6 +12,7 @@
 namespace Alchemy\Phrasea\Helper\Record;
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -94,8 +95,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
     protected $is_basket = false;
 
     /**
-     *
-     * @var \Entities\Basket
+     * @var Basket
      */
     protected $original_basket;
 
@@ -113,7 +113,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
         $this->selection = new \set_selection($app);
 
         if (trim($Request->get('ssel')) !== '') {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $$repository \Repositories\BasketRepository */
             $Basket = $repository->findUserBasket($this->app, $Request->get('ssel'), $app['authentication']->getUser(), false);
@@ -123,7 +123,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
             $this->is_basket = true;
             $this->original_basket = $Basket;
         } elseif (trim($Request->get('story')) !== '') {
-            $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
             $storyWZ = $repository->findByUserAndId($app, $app['authentication']->getUser(), $Request->get('story'));
 
@@ -154,7 +154,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
     /**
      * If the original selection was a basket, returns the basket object
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function get_original_basket()
     {
diff --git a/lib/Alchemy/Phrasea/Helper/WorkZone.php b/lib/Alchemy/Phrasea/Helper/WorkZone.php
index aaa444a2e7..4585f6b1d5 100644
--- a/lib/Alchemy/Phrasea/Helper/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Helper/WorkZone.php
@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Helper;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\Basket as BasketEntity;
+use Alchemy\Phrasea\Model\Entities\Basket as BasketEntity;
 
 /**
  *
@@ -42,7 +42,7 @@ class WorkZone extends Helper
     public function getContent($sort)
     {
         /* @var $repo_baskets \Doctrine\Repositories\BasketRepository */
-        $repo_baskets = $this->app['EM']->getRepository('Entities\Basket');
+        $repo_baskets = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         $sort = in_array($sort, array('date', 'name')) ? $sort : 'name';
 
@@ -65,7 +65,7 @@ class WorkZone extends Helper
         $validations = $repo_baskets->findActiveValidationByUser($this->app['authentication']->getUser(), $sort);
 
         /* @var $repo_stories \Doctrine\Repositories\StoryWZRepository */
-        $repo_stories = $this->app['EM']->getRepository('Entities\StoryWZ');
+        $repo_stories = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $stories = $repo_stories->findByUser($this->app, $this->app['authentication']->getUser(), $sort);
 
diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Alchemy/Phrasea/Model/Entities/AggregateToken.php
similarity index 97%
rename from lib/Doctrine/Entities/AggregateToken.php
rename to lib/Alchemy/Phrasea/Model/Entities/AggregateToken.php
index 8df663d323..e806367169 100644
--- a/lib/Doctrine/Entities/AggregateToken.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/AggregateToken.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
diff --git a/lib/Doctrine/Entities/AuthFailure.php b/lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
similarity index 98%
rename from lib/Doctrine/Entities/AuthFailure.php
rename to lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
index a4eb789034..8d4e1b7aba 100644
--- a/lib/Doctrine/Entities/AuthFailure.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
diff --git a/lib/Doctrine/Entities/Basket.php b/lib/Alchemy/Phrasea/Model/Entities/Basket.php
similarity index 94%
rename from lib/Doctrine/Entities/Basket.php
rename to lib/Alchemy/Phrasea/Model/Entities/Basket.php
index 421d5f54ac..afd7795d61 100644
--- a/lib/Doctrine/Entities/Basket.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Basket.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -319,10 +319,10 @@ class Basket
     /**
      * Set validation
      *
-     * @param  \Entities\ValidationSession $validation
+     * @param  ValidationSession $validation
      * @return Basket
      */
-    public function setValidation(\Entities\ValidationSession $validation = null)
+    public function setValidation(ValidationSession $validation = null)
     {
         $this->validation = $validation;
 
@@ -332,7 +332,7 @@ class Basket
     /**
      * Get validation
      *
-     * @return \Entities\ValidationSession
+     * @return ValidationSession
      */
     public function getValidation()
     {
@@ -342,10 +342,10 @@ class Basket
     /**
      * Add elements
      *
-     * @param  \Entities\BasketElement $elements
+     * @param  BasketElement $elements
      * @return Basket
      */
-    public function addElement(\Entities\BasketElement $elements)
+    public function addElement(BasketElement $elements)
     {
         $this->elements[] = $elements;
 
@@ -355,9 +355,9 @@ class Basket
     /**
      * Remove elements
      *
-     * @param \Entities\BasketElement $elements
+     * @param BasketElement $elements
      */
-    public function removeElement(\Entities\BasketElement $elements)
+    public function removeElement(BasketElement $elements)
     {
         $this->elements->removeElement($elements);
     }
@@ -365,10 +365,10 @@ class Basket
     /**
      * Set order
      *
-     * @param  \Entities\Order $order
+     * @param  Order $order
      * @return Basket
      */
-    public function setOrder(\Entities\Order $order = null)
+    public function setOrder(Order $order = null)
     {
         $this->order = $order;
 
@@ -378,7 +378,7 @@ class Basket
     /**
      * Get order
      *
-     * @return \Entities\Order
+     * @return Order
      */
     public function getOrder()
     {
diff --git a/lib/Doctrine/Entities/BasketElement.php b/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
similarity index 91%
rename from lib/Doctrine/Entities/BasketElement.php
rename to lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
index f47fe5d927..ad0616475f 100644
--- a/lib/Doctrine/Entities/BasketElement.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -214,10 +214,10 @@ class BasketElement
     /**
      * Add validation_datas
      *
-     * @param  \Entities\ValidationData $validationDatas
+     * @param  ValidationData $validationDatas
      * @return BasketElement
      */
-    public function addValidationData(\Entities\ValidationData $validationDatas)
+    public function addValidationData(ValidationData $validationDatas)
     {
         $this->validation_datas[] = $validationDatas;
 
@@ -227,9 +227,9 @@ class BasketElement
     /**
      * Remove validation_datas
      *
-     * @param \Entities\ValidationData $validationDatas
+     * @param ValidationData $validationDatas
      */
-    public function removeValidationData(\Entities\ValidationData $validationDatas)
+    public function removeValidationData(ValidationData $validationDatas)
     {
         $this->validation_datas->removeElement($validationDatas);
     }
@@ -247,10 +247,10 @@ class BasketElement
     /**
      * Set basket
      *
-     * @param  \Entities\Basket $basket
+     * @param  Basket $basket
      * @return BasketElement
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -260,7 +260,7 @@ class BasketElement
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {
@@ -278,7 +278,7 @@ class BasketElement
     /**
      *
      * @param  \User_Adapter            $user
-     * @return \Entities\ValidationData
+     * @return ValidationData
      */
     public function getUserValidationDatas(\User_Adapter $user, Application $app)
     {
diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Alchemy/Phrasea/Model/Entities/Feed.php
similarity index 92%
rename from lib/Doctrine/Entities/Feed.php
rename to lib/Alchemy/Phrasea/Model/Entities/Feed.php
index 2da4754ddb..1da1475daa 100644
--- a/lib/Doctrine/Entities/Feed.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Feed.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Feed\FeedInterface;
@@ -196,10 +196,10 @@ class Feed implements FeedInterface
     /**
      * Add publishers
      *
-     * @param  \Entities\FeedPublisher $publishers
+     * @param  FeedPublisher $publishers
      * @return Feed
      */
-    public function addPublisher(\Entities\FeedPublisher $publishers)
+    public function addPublisher(FeedPublisher $publishers)
     {
         $this->publishers[] = $publishers;
 
@@ -209,9 +209,9 @@ class Feed implements FeedInterface
     /**
      * Remove publishers
      *
-     * @param \Entities\FeedPublisher $publishers
+     * @param FeedPublisher $publishers
      */
-    public function removePublisher(\Entities\FeedPublisher $publishers)
+    public function removePublisher(FeedPublisher $publishers)
     {
         $this->publishers->removeElement($publishers);
     }
@@ -229,10 +229,10 @@ class Feed implements FeedInterface
     /**
      * Add entries
      *
-     * @param  \Entities\FeedEntry $entries
+     * @param  FeedEntry $entries
      * @return Feed
      */
-    public function addEntry(\Entities\FeedEntry $entries)
+    public function addEntry(FeedEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -242,9 +242,9 @@ class Feed implements FeedInterface
     /**
      * Remove entries
      *
-     * @param \Entities\FeedEntry $entries
+     * @param FeedEntry $entries
      */
-    public function removeEntry(\Entities\FeedEntry $entries)
+    public function removeEntry(FeedEntry $entries)
     {
         $this->entries->removeElement($entries);
     }
@@ -470,10 +470,10 @@ class Feed implements FeedInterface
     /**
      * Add tokens
      *
-     * @param  \Entities\FeedToken $tokens
+     * @param  FeedToken $tokens
      * @return Feed
      */
-    public function addToken(\Entities\FeedToken $tokens)
+    public function addToken(FeedToken $tokens)
     {
         $this->tokens[] = $tokens;
 
@@ -483,9 +483,9 @@ class Feed implements FeedInterface
     /**
      * Remove tokens
      *
-     * @param \Entities\FeedToken $tokens
+     * @param FeedToken $tokens
      */
-    public function removeToken(\Entities\FeedToken $tokens)
+    public function removeToken(FeedToken $tokens)
     {
         $this->tokens->removeElement($tokens);
     }
@@ -503,10 +503,10 @@ class Feed implements FeedInterface
     /**
      * Add entries
      *
-     * @param  \Entities\FeedEntry $entries
+     * @param  FeedEntry $entries
      * @return Feed
      */
-    public function addEntrie(\Entities\FeedEntry $entries)
+    public function addEntrie(FeedEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -516,9 +516,9 @@ class Feed implements FeedInterface
     /**
      * Remove entries
      *
-     * @param \Entities\FeedEntry $entries
+     * @param FeedEntry $entries
      */
-    public function removeEntrie(\Entities\FeedEntry $entries)
+    public function removeEntrie(FeedEntry $entries)
     {
         $this->entries->removeElement($entries);
     }
diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
similarity index 92%
rename from lib/Doctrine/Entities/FeedEntry.php
rename to lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
index b35c9d777c..818e5d66b9 100644
--- a/lib/Doctrine/Entities/FeedEntry.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -236,10 +236,10 @@ class FeedEntry
     /**
      * Add items
      *
-     * @param  \Entities\FeedItem $items
+     * @param  FeedItem $items
      * @return FeedEntry
      */
-    public function addItem(\Entities\FeedItem $items)
+    public function addItem(FeedItem $items)
     {
         $this->items[] = $items;
 
@@ -249,9 +249,9 @@ class FeedEntry
     /**
      * Remove items
      *
-     * @param \Entities\FeedItem $items
+     * @param FeedItem $items
      */
-    public function removeItem(\Entities\FeedItem $items)
+    public function removeItem(FeedItem $items)
     {
         $this->items->removeElement($items);
     }
@@ -269,10 +269,10 @@ class FeedEntry
     /**
      * Set publisher
      *
-     * @param  \Entities\FeedPublisher $publisher
+     * @param  FeedPublisher $publisher
      * @return FeedEntry
      */
-    public function setPublisher(\Entities\FeedPublisher $publisher = null)
+    public function setPublisher(FeedPublisher $publisher = null)
     {
         $this->publisher = $publisher;
 
@@ -282,7 +282,7 @@ class FeedEntry
     /**
      * Get publisher
      *
-     * @return \Entities\FeedPublisher
+     * @return FeedPublisher
      */
     public function getPublisher()
     {
@@ -292,10 +292,10 @@ class FeedEntry
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedEntry
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -305,7 +305,7 @@ class FeedEntry
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {
diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Alchemy/Phrasea/Model/Entities/FeedItem.php
similarity index 96%
rename from lib/Doctrine/Entities/FeedItem.php
rename to lib/Alchemy/Phrasea/Model/Entities/FeedItem.php
index 8c8bc27a3b..d20974dd92 100644
--- a/lib/Doctrine/Entities/FeedItem.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FeedItem.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 
@@ -122,10 +122,10 @@ class FeedItem
     /**
      * Set entry
      *
-     * @param  \Entities\FeedEntry $entry
+     * @param  FeedEntry $entry
      * @return FeedItem
      */
-    public function setEntry(\Entities\FeedEntry $entry = null)
+    public function setEntry(FeedEntry $entry = null)
     {
         $this->entry = $entry;
 
@@ -135,7 +135,7 @@ class FeedItem
     /**
      * Get entry
      *
-     * @return \Entities\FeedEntry
+     * @return FeedEntry
      */
     public function getEntry()
     {
diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Alchemy/Phrasea/Model/Entities/FeedPublisher.php
similarity index 95%
rename from lib/Doctrine/Entities/FeedPublisher.php
rename to lib/Alchemy/Phrasea/Model/Entities/FeedPublisher.php
index 7ae8294dea..92376eaf74 100644
--- a/lib/Doctrine/Entities/FeedPublisher.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FeedPublisher.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -109,10 +109,10 @@ class FeedPublisher
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedPublisher
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -122,7 +122,7 @@ class FeedPublisher
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {
diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Alchemy/Phrasea/Model/Entities/FeedToken.php
similarity index 93%
rename from lib/Doctrine/Entities/FeedToken.php
rename to lib/Alchemy/Phrasea/Model/Entities/FeedToken.php
index 6c3dad8352..f0a01cb4b8 100644
--- a/lib/Doctrine/Entities/FeedToken.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FeedToken.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -79,10 +79,10 @@ class FeedToken
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedToken
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -92,7 +92,7 @@ class FeedToken
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {
diff --git a/lib/Doctrine/Entities/FtpCredential.php b/lib/Alchemy/Phrasea/Model/Entities/FtpCredential.php
similarity index 99%
rename from lib/Doctrine/Entities/FtpCredential.php
rename to lib/Alchemy/Phrasea/Model/Entities/FtpCredential.php
index b430914704..ebc7ab4864 100644
--- a/lib/Doctrine/Entities/FtpCredential.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FtpCredential.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
diff --git a/lib/Doctrine/Entities/FtpExport.php b/lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
similarity index 98%
rename from lib/Doctrine/Entities/FtpExport.php
rename to lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
index 63cc9dbd53..2e19b21e87 100644
--- a/lib/Doctrine/Entities/FtpExport.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -145,7 +145,7 @@ class FtpExport
      * Set crash
      *
      * @param  integer   $crash
-     * 
+     *
      * @return FtpExport
      */
     public function setCrash($crash)
@@ -181,7 +181,7 @@ class FtpExport
      * Set nbretry
      *
      * @param  integer   $nbretry
-     * 
+     *
      * @return FtpExport
      */
     public function setNbretry($nbretry)
@@ -205,7 +205,7 @@ class FtpExport
      * Set mail
      *
      * @param  string    $mail
-     * 
+     *
      * @return FtpExport
      */
     public function setMail($mail)
@@ -229,7 +229,7 @@ class FtpExport
      * Set addr
      *
      * @param  string    $addr
-     * 
+     *
      * @return FtpExport
      */
     public function setAddr($addr)
@@ -253,7 +253,7 @@ class FtpExport
      * Set ssl
      *
      * @param  boolean   $ssl
-     * 
+     *
      * @return FtpExport
      */
     public function setSsl($ssl)
@@ -277,7 +277,7 @@ class FtpExport
      * Set login
      *
      * @param  string    $login
-     * 
+     *
      * @return FtpExport
      */
     public function setLogin($login)
@@ -301,7 +301,7 @@ class FtpExport
      * Set pwd
      *
      * @param  string    $pwd
-     * 
+     *
      * @return FtpExport
      */
     public function setPwd($pwd)
@@ -325,7 +325,7 @@ class FtpExport
      * Set passif
      *
      * @param  boolean   $passif
-     * 
+     *
      * @return FtpExport
      */
     public function setPassif($passif)
@@ -349,7 +349,7 @@ class FtpExport
      * Set destfolder
      *
      * @param  string    $destfolder
-     * 
+     *
      * @return FtpExport
      */
     public function setDestfolder($destfolder)
@@ -373,7 +373,7 @@ class FtpExport
      * Set sendermail
      *
      * @param  string    $sendermail
-     * 
+     *
      * @return FtpExport
      */
     public function setSendermail($sendermail)
@@ -397,7 +397,7 @@ class FtpExport
      * Set textMailSender
      *
      * @param  string    $textMailSender
-     * 
+     *
      * @return FtpExport
      */
     public function setTextMailSender($textMailSender)
@@ -421,7 +421,7 @@ class FtpExport
      * Set textMailReceiver
      *
      * @param  string    $textMailReceiver
-     * 
+     *
      * @return FtpExport
      */
     public function setTextMailReceiver($textMailReceiver)
@@ -445,7 +445,7 @@ class FtpExport
      * Set usrId
      *
      * @param  integer   $usrId
-     * 
+     *
      * @return FtpExport
      */
     public function setUsrId($usrId)
@@ -479,7 +479,7 @@ class FtpExport
      * Set user
      *
      * @param  \User_Adapter $user
-     * 
+     *
      * @return FtpExport
      */
     public function setUser(\User_Adapter $user)
@@ -493,7 +493,7 @@ class FtpExport
      * Set foldertocreate
      *
      * @param  string    $foldertocreate
-     * 
+     *
      * @return FtpExport
      */
     public function setFoldertocreate($foldertocreate)
@@ -517,7 +517,7 @@ class FtpExport
      * Set logfile
      *
      * @param  boolean   $logfile
-     * 
+     *
      * @return FtpExport
      */
     public function setLogfile($logfile)
@@ -541,7 +541,7 @@ class FtpExport
      * Set created
      *
      * @param  \DateTime $created
-     * 
+     *
      * @return FtpExport
      */
     public function setCreated(\DateTime $created)
@@ -565,7 +565,7 @@ class FtpExport
      * Set updated
      *
      * @param  \DateTime $updated
-     * 
+     *
      * @return FtpExport
      */
     public function setUpdated(\DateTime $updated)
@@ -589,7 +589,7 @@ class FtpExport
      * Add elements
      *
      * @param  FtpExportElement $elements
-     * 
+     *
      * @return FtpExport
      */
     public function addElement(FtpExportElement $elements)
@@ -603,13 +603,13 @@ class FtpExport
      * Remove elements
      *
      * @param FtpExportElement $elements
-     * 
+     *
      * @return FtpExport
      */
     public function removeElement(FtpExportElement $elements)
     {
         $this->elements->removeElement($elements);
-        
+
         return $this;
     }
 
diff --git a/lib/Doctrine/Entities/FtpExportElement.php b/lib/Alchemy/Phrasea/Model/Entities/FtpExportElement.php
similarity index 99%
rename from lib/Doctrine/Entities/FtpExportElement.php
rename to lib/Alchemy/Phrasea/Model/Entities/FtpExportElement.php
index e4f0493950..d5a112b86d 100644
--- a/lib/Doctrine/Entities/FtpExportElement.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/FtpExportElement.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
diff --git a/lib/Doctrine/Entities/LazaretAttribute.php b/lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
similarity index 94%
rename from lib/Doctrine/Entities/LazaretAttribute.php
rename to lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
index 5adc344c1e..7b2187abc3 100644
--- a/lib/Doctrine/Entities/LazaretAttribute.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -160,10 +160,10 @@ class LazaretAttribute
     /**
      * Set lazaretFile
      *
-     * @param  \Entities\LazaretFile $lazaretFile
+     * @param  LazaretFile $lazaretFile
      * @return LazaretAttribute
      */
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
+    public function setLazaretFile(LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
 
@@ -173,7 +173,7 @@ class LazaretAttribute
     /**
      * Get lazaretFile
      *
-     * @return \Entities\LazaretFile
+     * @return LazaretFile
      */
     public function getLazaretFile()
     {
diff --git a/lib/Doctrine/Entities/LazaretCheck.php b/lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
similarity index 91%
rename from lib/Doctrine/Entities/LazaretCheck.php
rename to lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
index 8a8caa338c..668b7f5fb2 100644
--- a/lib/Doctrine/Entities/LazaretCheck.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -73,10 +73,10 @@ class LazaretCheck
     /**
      * Set lazaretFile
      *
-     * @param  \Entities\LazaretFile $lazaretFile
+     * @param  LazaretFile $lazaretFile
      * @return LazaretCheck
      */
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
+    public function setLazaretFile(LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
 
@@ -86,7 +86,7 @@ class LazaretCheck
     /**
      * Get lazaretFile
      *
-     * @return \Entities\LazaretFile
+     * @return LazaretFile
      */
     public function getLazaretFile()
     {
diff --git a/lib/Doctrine/Entities/LazaretFile.php b/lib/Alchemy/Phrasea/Model/Entities/LazaretFile.php
similarity index 92%
rename from lib/Doctrine/Entities/LazaretFile.php
rename to lib/Alchemy/Phrasea/Model/Entities/LazaretFile.php
index 9e99a48f6f..2072034cda 100644
--- a/lib/Doctrine/Entities/LazaretFile.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/LazaretFile.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -332,10 +332,10 @@ class LazaretFile
     /**
      * Add attributes
      *
-     * @param  \Entities\LazaretAttribute $attributes
+     * @param  LazaretAttribute $attributes
      * @return LazaretFile
      */
-    public function addAttribute(\Entities\LazaretAttribute $attributes)
+    public function addAttribute(LazaretAttribute $attributes)
     {
         $this->attributes[] = $attributes;
 
@@ -345,9 +345,9 @@ class LazaretFile
     /**
      * Remove attributes
      *
-     * @param \Entities\LazaretAttribute $attributes
+     * @param LazaretAttribute $attributes
      */
-    public function removeAttribute(\Entities\LazaretAttribute $attributes)
+    public function removeAttribute(LazaretAttribute $attributes)
     {
         $this->attributes->removeElement($attributes);
     }
@@ -365,10 +365,10 @@ class LazaretFile
     /**
      * Add checks
      *
-     * @param  \Entities\LazaretCheck $checks
+     * @param  LazaretCheck $checks
      * @return LazaretFile
      */
-    public function addCheck(\Entities\LazaretCheck $checks)
+    public function addCheck(LazaretCheck $checks)
     {
         $this->checks[] = $checks;
 
@@ -378,9 +378,9 @@ class LazaretFile
     /**
      * Remove checks
      *
-     * @param \Entities\LazaretCheck $checks
+     * @param LazaretCheck $checks
      */
-    public function removeCheck(\Entities\LazaretCheck $checks)
+    public function removeCheck(LazaretCheck $checks)
     {
         $this->checks->removeElement($checks);
     }
@@ -398,10 +398,10 @@ class LazaretFile
     /**
      * Set session
      *
-     * @param  \Entities\LazaretSession $session
+     * @param  LazaretSession $session
      * @return LazaretFile
      */
-    public function setSession(\Entities\LazaretSession $session = null)
+    public function setSession(LazaretSession $session = null)
     {
         $this->session = $session;
 
@@ -411,7 +411,7 @@ class LazaretFile
     /**
      * Get session
      *
-     * @return \Entities\LazaretSession
+     * @return LazaretSession
      */
     public function getSession()
     {
diff --git a/lib/Doctrine/Entities/LazaretSession.php b/lib/Alchemy/Phrasea/Model/Entities/LazaretSession.php
similarity index 93%
rename from lib/Doctrine/Entities/LazaretSession.php
rename to lib/Alchemy/Phrasea/Model/Entities/LazaretSession.php
index 5196eab723..b5674ec0f3 100644
--- a/lib/Doctrine/Entities/LazaretSession.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/LazaretSession.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -159,10 +159,10 @@ class LazaretSession
     /**
      * Add files
      *
-     * @param  \Entities\LazaretFile $files
+     * @param  LazaretFile $files
      * @return LazaretSession
      */
-    public function addFile(\Entities\LazaretFile $files)
+    public function addFile(LazaretFile $files)
     {
         $this->files[] = $files;
 
@@ -172,9 +172,9 @@ class LazaretSession
     /**
      * Remove files
      *
-     * @param \Entities\LazaretFile $files
+     * @param LazaretFile $files
      */
-    public function removeFile(\Entities\LazaretFile $files)
+    public function removeFile(LazaretFile $files)
     {
         $this->files->removeElement($files);
     }
diff --git a/lib/Doctrine/Entities/Order.php b/lib/Alchemy/Phrasea/Model/Entities/Order.php
similarity index 91%
rename from lib/Doctrine/Entities/Order.php
rename to lib/Alchemy/Phrasea/Model/Entities/Order.php
index e4a6c06522..52b592468e 100644
--- a/lib/Doctrine/Entities/Order.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Order.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -145,10 +145,10 @@ class Order
     /**
      * Add elements
      *
-     * @param  \Entities\OrderElement $elements
+     * @param  OrderElement $elements
      * @return Order
      */
-    public function addElement(\Entities\OrderElement $elements)
+    public function addElement(OrderElement $elements)
     {
         $this->elements[] = $elements;
 
@@ -158,9 +158,9 @@ class Order
     /**
      * Remove elements
      *
-     * @param \Entities\OrderElement $elements
+     * @param OrderElement $elements
      */
-    public function removeElement(\Entities\OrderElement $elements)
+    public function removeElement(OrderElement $elements)
     {
         $this->elements->removeElement($elements);
     }
@@ -248,10 +248,10 @@ class Order
     /**
      * Set basket
      *
-     * @param  \Entities\Basket $basket
+     * @param  Basket $basket
      * @return Order
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -261,7 +261,7 @@ class Order
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {
diff --git a/lib/Doctrine/Entities/OrderElement.php b/lib/Alchemy/Phrasea/Model/Entities/OrderElement.php
similarity index 97%
rename from lib/Doctrine/Entities/OrderElement.php
rename to lib/Alchemy/Phrasea/Model/Entities/OrderElement.php
index 9cd2d2d3a8..4eeb40587f 100644
--- a/lib/Doctrine/Entities/OrderElement.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/OrderElement.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
-use Entities\Order;
+use Alchemy\Phrasea\Model\Entities\Order;
 
 /**
  * @ORM\Table(name="OrderElements", uniqueConstraints={@ORM\UniqueConstraint(name="unique_ordercle", columns={"base_id","record_id","order_id"})})
diff --git a/lib/Doctrine/Entities/Session.php b/lib/Alchemy/Phrasea/Model/Entities/Session.php
similarity index 96%
rename from lib/Doctrine/Entities/Session.php
rename to lib/Alchemy/Phrasea/Model/Entities/Session.php
index 1745c24538..1e278a8bd2 100644
--- a/lib/Doctrine/Entities/Session.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Session.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -405,10 +405,10 @@ class Session
     /**
      * Add modules
      *
-     * @param  \Entities\SessionModule $modules
+     * @param  SessionModule $modules
      * @return Session
      */
-    public function addModule(\Entities\SessionModule $modules)
+    public function addModule(SessionModule $modules)
     {
         $this->modules[] = $modules;
 
@@ -418,9 +418,9 @@ class Session
     /**
      * Remove modules
      *
-     * @param \Entities\SessionModule $modules
+     * @param SessionModule $modules
      */
-    public function removeModule(\Entities\SessionModule $modules)
+    public function removeModule(SessionModule $modules)
     {
         $this->modules->removeElement($modules);
     }
@@ -439,7 +439,7 @@ class Session
      * Get a module by its identifier
      *
      * @param  integer                     $moduleId
-     * @return Entities\SessionModule|null
+     * @return Alchemy\Phrasea\Model\Entities\SessionModule|null
      */
     public function getModuleById($moduleId)
     {
diff --git a/lib/Doctrine/Entities/SessionModule.php b/lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
similarity index 94%
rename from lib/Doctrine/Entities/SessionModule.php
rename to lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
index b82ecbbd1c..7d62e25411 100644
--- a/lib/Doctrine/Entities/SessionModule.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -132,10 +132,10 @@ class SessionModule
     /**
      * Set session
      *
-     * @param  \Entities\Session $session
+     * @param  Session $session
      * @return SessionModule
      */
-    public function setSession(\Entities\Session $session = null)
+    public function setSession(Session $session = null)
     {
         $this->session = $session;
 
@@ -145,7 +145,7 @@ class SessionModule
     /**
      * Get session
      *
-     * @return \Entities\Session
+     * @return Session
      */
     public function getSession()
     {
diff --git a/lib/Doctrine/Entities/StoryWZ.php b/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
similarity index 98%
rename from lib/Doctrine/Entities/StoryWZ.php
rename to lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
index 012915d656..b19be1b7e5 100644
--- a/lib/Doctrine/Entities/StoryWZ.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 
diff --git a/lib/Doctrine/Entities/User.php b/lib/Alchemy/Phrasea/Model/Entities/User.php
similarity index 99%
rename from lib/Doctrine/Entities/User.php
rename to lib/Alchemy/Phrasea/Model/Entities/User.php
index 4771b62833..235d82652e 100644
--- a/lib/Doctrine/Entities/User.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/User.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
diff --git a/lib/Doctrine/Entities/UserNotificationSetting.php b/lib/Alchemy/Phrasea/Model/Entities/UserNotificationSetting.php
similarity index 98%
rename from lib/Doctrine/Entities/UserNotificationSetting.php
rename to lib/Alchemy/Phrasea/Model/Entities/UserNotificationSetting.php
index 6951cd5b6d..30775822f2 100644
--- a/lib/Doctrine/Entities/UserNotificationSetting.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UserNotificationSetting.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/lib/Doctrine/Entities/UserQuery.php b/lib/Alchemy/Phrasea/Model/Entities/UserQuery.php
similarity index 98%
rename from lib/Doctrine/Entities/UserQuery.php
rename to lib/Alchemy/Phrasea/Model/Entities/UserQuery.php
index fe28626b82..23b792e1e3 100644
--- a/lib/Doctrine/Entities/UserQuery.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UserQuery.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/lib/Doctrine/Entities/UserSetting.php b/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php
similarity index 98%
rename from lib/Doctrine/Entities/UserSetting.php
rename to lib/Alchemy/Phrasea/Model/Entities/UserSetting.php
index bca4b37f0b..f6a9a8f417 100644
--- a/lib/Doctrine/Entities/UserSetting.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/lib/Doctrine/Entities/UsrAuthProvider.php b/lib/Alchemy/Phrasea/Model/Entities/UsrAuthProvider.php
similarity index 98%
rename from lib/Doctrine/Entities/UsrAuthProvider.php
rename to lib/Alchemy/Phrasea/Model/Entities/UsrAuthProvider.php
index 6ba7bd75ee..062bbd8852 100644
--- a/lib/Doctrine/Entities/UsrAuthProvider.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UsrAuthProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/lib/Doctrine/Entities/UsrList.php b/lib/Alchemy/Phrasea/Model/Entities/UsrList.php
similarity index 89%
rename from lib/Doctrine/Entities/UsrList.php
rename to lib/Alchemy/Phrasea/Model/Entities/UsrList.php
index 03467eda02..de998adb2d 100644
--- a/lib/Doctrine/Entities/UsrList.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UsrList.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -146,10 +146,10 @@ class UsrList
     /**
      * Add owners
      *
-     * @param  \Entities\UsrListOwner $owners
+     * @param  UsrListOwner $owners
      * @return UsrList
      */
-    public function addOwner(\Entities\UsrListOwner $owners)
+    public function addOwner(UsrListOwner $owners)
     {
         $this->owners[] = $owners;
 
@@ -159,9 +159,9 @@ class UsrList
     /**
      * Remove owners
      *
-     * @param \Entities\UsrListOwner $owners
+     * @param UsrListOwner $owners
      */
-    public function removeOwner(\Entities\UsrListOwner $owners)
+    public function removeOwner(UsrListOwner $owners)
     {
         $this->owners->removeElement($owners);
     }
@@ -179,10 +179,10 @@ class UsrList
     /**
      * Add entries
      *
-     * @param  \Entities\UsrListEntry $entries
+     * @param  UsrListEntry $entries
      * @return UsrList
      */
-    public function addEntrie(\Entities\UsrListEntry $entries)
+    public function addEntrie(UsrListEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -192,9 +192,9 @@ class UsrList
     /**
      * Remove entries
      *
-     * @param \Entities\UsrListEntry $entries
+     * @param UsrListEntry $entries
      */
-    public function removeEntrie(\Entities\UsrListEntry $entries)
+    public function removeEntrie(UsrListEntry $entries)
     {
         $this->entries->removeElement($entries);
     }
@@ -223,7 +223,7 @@ class UsrList
     /**
      *
      * @param  \User_Adapter          $user
-     * @return \Entities\UsrListOwner
+     * @return UsrListOwner
      */
     public function getOwner(\User_Adapter $user, Application $app)
     {
diff --git a/lib/Doctrine/Entities/UsrListEntry.php b/lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
similarity index 94%
rename from lib/Doctrine/Entities/UsrListEntry.php
rename to lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
index b487dbb0fa..6fae14bb2a 100644
--- a/lib/Doctrine/Entities/UsrListEntry.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -143,10 +143,10 @@ class UsrListEntry
     /**
      * Set list
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @return UsrListEntry
      */
-    public function setList(\Entities\UsrList $list = null)
+    public function setList(UsrList $list = null)
     {
         $this->list = $list;
 
@@ -156,7 +156,7 @@ class UsrListEntry
     /**
      * Get list
      *
-     * @return \Entities\UsrList
+     * @return UsrList
      */
     public function getList()
     {
diff --git a/lib/Doctrine/Entities/UsrListOwner.php b/lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
similarity index 95%
rename from lib/Doctrine/Entities/UsrListOwner.php
rename to lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
index b9a0479386..dacf5f6950 100644
--- a/lib/Doctrine/Entities/UsrListOwner.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -178,10 +178,10 @@ class UsrListOwner
     /**
      * Set list
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @return UsrListOwner
      */
-    public function setList(\Entities\UsrList $list = null)
+    public function setList(UsrList $list = null)
     {
         $this->list = $list;
 
@@ -191,7 +191,7 @@ class UsrListOwner
     /**
      * Get list
      *
-     * @return \Entities\UsrList
+     * @return UsrList
      */
     public function getList()
     {
diff --git a/lib/Doctrine/Entities/ValidationData.php b/lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
similarity index 88%
rename from lib/Doctrine/Entities/ValidationData.php
rename to lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
index 51465d2b96..20a39f969d 100644
--- a/lib/Doctrine/Entities/ValidationData.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -137,10 +137,10 @@ class ValidationData
     /**
      * Set participant
      *
-     * @param  \Entities\ValidationParticipant $participant
+     * @param  ValidationParticipant $participant
      * @return ValidationData
      */
-    public function setParticipant(\Entities\ValidationParticipant $participant = null)
+    public function setParticipant(ValidationParticipant $participant = null)
     {
         $this->participant = $participant;
 
@@ -150,7 +150,7 @@ class ValidationData
     /**
      * Get participant
      *
-     * @return \Entities\ValidationParticipant
+     * @return ValidationParticipant
      */
     public function getParticipant()
     {
@@ -160,10 +160,10 @@ class ValidationData
     /**
      * Set basket_element
      *
-     * @param  \Entities\BasketElement $basketElement
+     * @param  BasketElement $basketElement
      * @return ValidationData
      */
-    public function setBasketElement(\Entities\BasketElement $basketElement = null)
+    public function setBasketElement(BasketElement $basketElement = null)
     {
         $this->basket_element = $basketElement;
 
@@ -173,7 +173,7 @@ class ValidationData
     /**
      * Get basket_element
      *
-     * @return \Entities\BasketElement
+     * @return BasketElement
      */
     public function getBasketElement()
     {
diff --git a/lib/Doctrine/Entities/ValidationParticipant.php b/lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
similarity index 91%
rename from lib/Doctrine/Entities/ValidationParticipant.php
rename to lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
index be257e0b20..0482b989b0 100644
--- a/lib/Doctrine/Entities/ValidationParticipant.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -244,10 +244,10 @@ class ValidationParticipant
     /**
      * Add datas
      *
-     * @param  \Entities\ValidationData $datas
+     * @param  ValidationData $datas
      * @return ValidationParticipant
      */
-    public function addData(\Entities\ValidationData $datas)
+    public function addData(ValidationData $datas)
     {
         $this->datas[] = $datas;
 
@@ -257,9 +257,9 @@ class ValidationParticipant
     /**
      * Remove datas
      *
-     * @param \Entities\ValidationData $datas
+     * @param ValidationData $datas
      */
-    public function removeData(\Entities\ValidationData $datas)
+    public function removeData(ValidationData $datas)
     {
         $this->datas->removeElement($datas);
     }
@@ -277,10 +277,10 @@ class ValidationParticipant
     /**
      * Set session
      *
-     * @param  \Entities\ValidationSession $session
+     * @param  ValidationSession $session
      * @return ValidationParticipant
      */
-    public function setSession(\Entities\ValidationSession $session = null)
+    public function setSession(ValidationSession $session = null)
     {
         $this->session = $session;
 
@@ -290,7 +290,7 @@ class ValidationParticipant
     /**
      * Get session
      *
-     * @return \Entities\ValidationSession
+     * @return ValidationSession
      */
     public function getSession()
     {
@@ -305,7 +305,7 @@ class ValidationParticipant
         }
 
         foreach ($this->getDatas() as $validation_data) {
-            /* @var $validation_data \Entities\ValidationData */
+            /* @var $validation_data ValidationData */
             if ($validation_data->getAgreement() === null) {
                 return false;
             }
diff --git a/lib/Doctrine/Entities/ValidationSession.php b/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
similarity index 92%
rename from lib/Doctrine/Entities/ValidationSession.php
rename to lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
index f6f083b03b..55f0067d00 100644
--- a/lib/Doctrine/Entities/ValidationSession.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -194,10 +194,10 @@ class ValidationSession
     /**
      * Set basket
      *
-     * @param  \Entities\Basket  $basket
+     * @param  Basket  $basket
      * @return ValidationSession
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -207,7 +207,7 @@ class ValidationSession
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {
@@ -217,10 +217,10 @@ class ValidationSession
     /**
      * Add participants
      *
-     * @param  \Entities\ValidationParticipant $participants
+     * @param  ValidationParticipant $participants
      * @return ValidationSession
      */
-    public function addParticipant(\Entities\ValidationParticipant $participants)
+    public function addParticipant(ValidationParticipant $participants)
     {
         $this->participants[] = $participants;
 
@@ -230,9 +230,9 @@ class ValidationSession
     /**
      * Remove participants
      *
-     * @param \Entities\ValidationParticipant $participants
+     * @param ValidationParticipant $participants
      */
-    public function removeParticipant(\Entities\ValidationParticipant $participants)
+    public function removeParticipant(ValidationParticipant $participants)
     {
         $this->participants->removeElement($participants);
     }
@@ -291,7 +291,7 @@ class ValidationSession
     /**
      * Get a participant
      *
-     * @return Entities\ValidationParticipant
+     * @return Alchemy\Phrasea\Model\Entities\ValidationParticipant
      */
     public function getParticipant(\User_Adapter $user, Application $app)
     {
diff --git a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
index e8241bddae..d749b578a9 100644
--- a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
+++ b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
@@ -13,8 +13,8 @@ namespace Alchemy\Phrasea\Model\Manager;
 
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Doctrine\Common\Persistence\ObjectManager;
-use Entities\User;
-use Entities\UserSetting;
+use Alchemy\Phrasea\Model\Entities\User;
+use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class UserManager
 {
@@ -137,7 +137,7 @@ class UserManager
      */
     private function cleanFtpExports(User $user)
     {
-       $elements = $this->objectManager->getRepository('Entities\FtpExport')
+       $elements = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                ->findBy(array('usrId' => $user->getId()));
 
        foreach($elements as $element) {
@@ -152,7 +152,7 @@ class UserManager
      */
     private function cleanOrders(User $user)
     {
-       $orders = $this->objectManager->getRepository('Entities\Order')
+       $orders = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Order')
                ->findBy(array('usrId' => $user->getId()));
 
        foreach($orders as $order) {
diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
index 89782e8687..24419ac589 100644
--- a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
+++ b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Model\Manager\UserManager;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Doctrine\Common\Persistence\ObjectManager;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 use Repositories\UserRepository;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
 
@@ -45,7 +45,7 @@ class UserManipulator implements ManipulatorInterface
      */
     public function getRepository()
     {
-        return $this->manager->getObjectManager()->getRepository('Entities\User');
+        return $this->manager->getObjectManager()->getRepository('Alchemy\Phrasea\Model\Entities\User');
     }
 
     /**
diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php
index c490083f8c..c08d758d65 100644
--- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php
+++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Notification\Mail;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\Exception\LogicException;
 
 class MailInfoOrderDelivered extends AbstractMail
diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php
index 4f8dd190a7..d7e7954062 100644
--- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php
+++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php
@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Notification\Mail;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\Exception\LogicException;
 
 class MailInfoPushReceived extends AbstractMailWithLink
@@ -24,7 +24,7 @@ class MailInfoPushReceived extends AbstractMailWithLink
     /**
      * Sets the basket
      *
-     * @param \Entities\Basket $basket
+     * @param Basket $basket
      */
     public function setBasket(Basket $basket)
     {
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
index 85a58c9500..044ee3231b 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
@@ -18,7 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 
 class PhraseaEngine implements SearchEngineInterface
 {
diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
index abcece3260..ba669fee48 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 
 interface SearchEngineInterface
 {
diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
index 3e643c96de..e2c5016b72 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
@@ -18,7 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;
 
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php
similarity index 93%
rename from lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php
index 4699a03f02..68f9e9fb7b 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class AggregateToken extends \Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
+class AggregateToken extends \Alchemy\Phrasea\Model\Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesAuthFailure.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php
similarity index 94%
rename from lib/Doctrine/Proxies/__CG__EntitiesAuthFailure.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php
index c2a4f69f75..8aa9f62e44 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesAuthFailure.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class AuthFailure extends \Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
+class AuthFailure extends \Alchemy\Phrasea\Model\Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesBasket.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php
similarity index 91%
rename from lib/Doctrine/Proxies/__CG__EntitiesBasket.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php
index a74f17e7ab..5f118b7849 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesBasket.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
+class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -171,7 +171,7 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function setValidation(\Entities\ValidationSession $validation = NULL)
+    public function setValidation(\Alchemy\Phrasea\Model\Entities\ValidationSession $validation = NULL)
     {
         $this->__load();
         return parent::setValidation($validation);
@@ -183,19 +183,19 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
         return parent::getValidation();
     }
 
-    public function addElement(\Entities\BasketElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\BasketElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);
     }
 
-    public function setOrder(\Entities\Order $order = NULL)
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
     {
         $this->__load();
         return parent::setOrder($order);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesBasketElement.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesBasketElement.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php
index 4c88a4e1ec..c4d6343fe3 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesBasketElement.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
+class BasketElement extends \Alchemy\Phrasea\Model\Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -123,13 +123,13 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
         return parent::getUpdated();
     }
 
-    public function addValidationData(\Entities\ValidationData $validationDatas)
+    public function addValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
     {
         $this->__load();
         return parent::addValidationData($validationDatas);
     }
 
-    public function removeValidationData(\Entities\ValidationData $validationDatas)
+    public function removeValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
     {
         $this->__load();
         return parent::removeValidationData($validationDatas);
@@ -141,7 +141,7 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
         return parent::getValidationDatas();
     }
 
-    public function setBasket(\Entities\Basket $basket = NULL)
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
     {
         $this->__load();
         return parent::setBasket($basket);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeed.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php
similarity index 88%
rename from lib/Doctrine/Proxies/__CG__EntitiesFeed.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php
index 0710572d45..f3fd4abf2e 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFeed.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
+class Feed extends \Alchemy\Phrasea\Model\Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -99,13 +99,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getTitle();
     }
 
-    public function addPublisher(\Entities\FeedPublisher $publishers)
+    public function addPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
     {
         $this->__load();
         return parent::addPublisher($publishers);
     }
 
-    public function removePublisher(\Entities\FeedPublisher $publishers)
+    public function removePublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
     {
         $this->__load();
         return parent::removePublisher($publishers);
@@ -117,13 +117,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getPublishers();
     }
 
-    public function addEntry(\Entities\FeedEntry $entries)
+    public function addEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::addEntry($entries);
     }
 
-    public function removeEntry(\Entities\FeedEntry $entries)
+    public function removeEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::removeEntry($entries);
@@ -225,13 +225,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::hasAccess($user, $app);
     }
 
-    public function addToken(\Entities\FeedToken $tokens)
+    public function addToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
     {
         $this->__load();
         return parent::addToken($tokens);
     }
 
-    public function removeToken(\Entities\FeedToken $tokens)
+    public function removeToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
     {
         $this->__load();
         return parent::removeToken($tokens);
@@ -243,13 +243,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getTokens();
     }
 
-    public function addEntrie(\Entities\FeedEntry $entries)
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::addEntrie($entries);
     }
 
-    public function removeEntrie(\Entities\FeedEntry $entries)
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::removeEntrie($entries);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php
index 19fd2caae8..25d4e5945e 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
+class FeedEntry extends \Alchemy\Phrasea\Model\Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -123,13 +123,13 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdatedOn();
     }
 
-    public function addItem(\Entities\FeedItem $items)
+    public function addItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
     {
         $this->__load();
         return parent::addItem($items);
     }
 
-    public function removeItem(\Entities\FeedItem $items)
+    public function removeItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
     {
         $this->__load();
         return parent::removeItem($items);
@@ -141,7 +141,7 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getItems();
     }
 
-    public function setPublisher(\Entities\FeedPublisher $publisher = NULL)
+    public function setPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publisher = NULL)
     {
         $this->__load();
         return parent::setPublisher($publisher);
@@ -153,7 +153,7 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getPublisher();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php
similarity index 94%
rename from lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php
index c47ea49d11..72f89d8a9f 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedItem extends \Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
+class FeedItem extends \Alchemy\Phrasea\Model\Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -75,7 +75,7 @@ class FeedItem extends \Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
         return parent::getSbasId();
     }
 
-    public function setEntry(\Entities\FeedEntry $entry = NULL)
+    public function setEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entry = NULL)
     {
         $this->__load();
         return parent::setEntry($entry);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php
similarity index 92%
rename from lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php
index b222551898..40c72402d0 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedPublisher extends \Entities\FeedPublisher implements \Doctrine\ORM\Proxy\Proxy
+class FeedPublisher extends \Alchemy\Phrasea\Model\Entities\FeedPublisher implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -75,7 +75,7 @@ class FeedPublisher extends \Entities\FeedPublisher implements \Doctrine\ORM\Pro
         return parent::isOwner();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php
similarity index 92%
rename from lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php
index 57efe8b9fe..e3554494b9 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedToken extends \Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
+class FeedToken extends \Alchemy\Phrasea\Model\Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -63,7 +63,7 @@ class FeedToken extends \Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUsrId();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFtpCredential.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php
similarity index 91%
rename from lib/Doctrine/Proxies/__CG__EntitiesFtpCredential.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php
index 9c36a48055..051c454d3f 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFtpCredential.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Proxy\Proxy
+class FtpCredential extends \Alchemy\Phrasea\Model\Entities\FtpCredential implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -51,12 +51,6 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
         return parent::getId();
     }
 
-    public function getUser(\Alchemy\Phrasea\Application $app)
-    {
-        $this->__load();
-        return parent::getUser($app);
-    }
-
     public function getUsrId()
     {
         $this->__load();
@@ -69,6 +63,18 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
         return parent::setUsrId($usrId);
     }
 
+    public function getUser()
+    {
+        $this->__load();
+        return parent::getUser();
+    }
+
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+        $this->__load();
+        return parent::setUser($user);
+    }
+
     public function isActive()
     {
         $this->__load();
@@ -192,7 +198,7 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'usrId', 'active', 'address', 'login', 'password', 'receptionFolder', 'repositoryPrefixName', 'passive', 'ssl', 'maxRetry', 'updated');
+        return array('__isInitialized__', 'id', 'usrId', 'active', 'address', 'login', 'password', 'receptionFolder', 'repositoryPrefixName', 'passive', 'ssl', 'maxRetry', 'updated', 'user');
     }
 
     public function __clone()
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFtpExport.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php
similarity index 93%
rename from lib/Doctrine/Proxies/__CG__EntitiesFtpExport.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php
index 4bbb57bfac..c0161c66d7 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFtpExport.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
+class FtpExport extends \Alchemy\Phrasea\Model\Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -249,7 +249,7 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::isLogfile();
     }
 
-    public function setCreated($created)
+    public function setCreated(\DateTime $created)
     {
         $this->__load();
         return parent::setCreated($created);
@@ -261,7 +261,7 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::getCreated();
     }
 
-    public function setUpdated($updated)
+    public function setUpdated(\DateTime $updated)
     {
         $this->__load();
         return parent::setUpdated($updated);
@@ -273,13 +273,13 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function addElement(\Entities\FtpExportElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\FtpExportElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFtpExportElement.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php
similarity index 92%
rename from lib/Doctrine/Proxies/__CG__EntitiesFtpExportElement.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php
index 0eb21ba367..fba4a80131 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesFtpExportElement.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\ORM\Proxy\Proxy
+class FtpExportElement extends \Alchemy\Phrasea\Model\Entities\FtpExportElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -147,7 +147,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::isBusinessfields();
     }
 
-    public function setCreated($created)
+    public function setCreated(\DateTime $created)
     {
         $this->__load();
         return parent::setCreated($created);
@@ -159,7 +159,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::getCreated();
     }
 
-    public function setUpdated($updated)
+    public function setUpdated(\DateTime $updated)
     {
         $this->__load();
         return parent::setUpdated($updated);
@@ -171,7 +171,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::getUpdated();
     }
 
-    public function setExport(\Entities\FtpExport $export = NULL)
+    public function setExport(\Alchemy\Phrasea\Model\Entities\FtpExport $export = NULL)
     {
         $this->__load();
         return parent::setExport($export);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretAttribute.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php
similarity index 92%
rename from lib/Doctrine/Proxies/__CG__EntitiesLazaretAttribute.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php
index db8ce47b73..d3e2488348 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretAttribute.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\ORM\Proxy\Proxy
+class LazaretAttribute extends \Alchemy\Phrasea\Model\Entities\LazaretAttribute implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -99,7 +99,7 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
         return parent::getUpdated();
     }
 
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
         return parent::setLazaretFile($lazaretFile);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php
similarity index 91%
rename from lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php
index 0f5f7fb556..1878f7936a 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy\Proxy
+class LazaretCheck extends \Alchemy\Phrasea\Model\Entities\LazaretCheck implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -63,7 +63,7 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
         return parent::getCheckClassname();
     }
 
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
         return parent::setLazaretFile($lazaretFile);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretFile.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php
similarity index 89%
rename from lib/Doctrine/Proxies/__CG__EntitiesLazaretFile.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php
index 764d391ab2..83b88d51be 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretFile.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\Proxy
+class LazaretFile extends \Alchemy\Phrasea\Model\Entities\LazaretFile implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -165,13 +165,13 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getUpdated();
     }
 
-    public function addAttribute(\Entities\LazaretAttribute $attributes)
+    public function addAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
     {
         $this->__load();
         return parent::addAttribute($attributes);
     }
 
-    public function removeAttribute(\Entities\LazaretAttribute $attributes)
+    public function removeAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
     {
         $this->__load();
         return parent::removeAttribute($attributes);
@@ -183,13 +183,13 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getAttributes();
     }
 
-    public function addCheck(\Entities\LazaretCheck $checks)
+    public function addCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
     {
         $this->__load();
         return parent::addCheck($checks);
     }
 
-    public function removeCheck(\Entities\LazaretCheck $checks)
+    public function removeCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
     {
         $this->__load();
         return parent::removeCheck($checks);
@@ -201,7 +201,7 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getChecks();
     }
 
-    public function setSession(\Entities\LazaretSession $session = NULL)
+    public function setSession(\Alchemy\Phrasea\Model\Entities\LazaretSession $session = NULL)
     {
         $this->__load();
         return parent::setSession($session);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php
index 906543e104..d70efdccef 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\Proxy\Proxy
+class LazaretSession extends \Alchemy\Phrasea\Model\Entities\LazaretSession implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -93,13 +93,13 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
         return parent::getUpdated();
     }
 
-    public function addFile(\Entities\LazaretFile $files)
+    public function addFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
     {
         $this->__load();
         return parent::addFile($files);
     }
 
-    public function removeFile(\Entities\LazaretFile $files)
+    public function removeFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
     {
         $this->__load();
         return parent::removeFile($files);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesOrder.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesOrder.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php
index ff701734e8..181e9d0fec 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesOrder.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
+class Order extends \Alchemy\Phrasea\Model\Entities\Order implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,13 +87,13 @@ class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
         return parent::getCreatedOn();
     }
 
-    public function addElement(\Entities\OrderElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\OrderElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);
@@ -141,7 +141,7 @@ class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
         return parent::getOrderUsage();
     }
 
-    public function setBasket(\Entities\Basket $basket = NULL)
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
     {
         $this->__load();
         return parent::setBasket($basket);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesOrderElement.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php
similarity index 93%
rename from lib/Doctrine/Proxies/__CG__EntitiesOrderElement.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php
index 4d3335c727..0d49976385 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesOrderElement.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class OrderElement extends \Entities\OrderElement implements \Doctrine\ORM\Proxy\Proxy
+class OrderElement extends \Alchemy\Phrasea\Model\Entities\OrderElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -81,7 +81,7 @@ class OrderElement extends \Entities\OrderElement implements \Doctrine\ORM\Proxy
         return parent::getDeny();
     }
 
-    public function setOrder(\Entities\Order $order = NULL)
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
     {
         $this->__load();
         return parent::setOrder($order);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesSession.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSession.php
similarity index 94%
rename from lib/Doctrine/Proxies/__CG__EntitiesSession.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSession.php
index df034690ad..48a8d97e17 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesSession.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSession.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Session extends \Entities\Session implements \Doctrine\ORM\Proxy\Proxy
+class Session extends \Alchemy\Phrasea\Model\Entities\Session implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -207,13 +207,13 @@ class Session extends \Entities\Session implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function addModule(\Entities\SessionModule $modules)
+    public function addModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
     {
         $this->__load();
         return parent::addModule($modules);
     }
 
-    public function removeModule(\Entities\SessionModule $modules)
+    public function removeModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
     {
         $this->__load();
         return parent::removeModule($modules);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesSessionModule.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php
similarity index 92%
rename from lib/Doctrine/Proxies/__CG__EntitiesSessionModule.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php
index 8404eb0dc8..5806a2229f 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesSessionModule.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class SessionModule extends \Entities\SessionModule implements \Doctrine\ORM\Proxy\Proxy
+class SessionModule extends \Alchemy\Phrasea\Model\Entities\SessionModule implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,7 +87,7 @@ class SessionModule extends \Entities\SessionModule implements \Doctrine\ORM\Pro
         return parent::getUpdated();
     }
 
-    public function setSession(\Entities\Session $session = NULL)
+    public function setSession(\Alchemy\Phrasea\Model\Entities\Session $session = NULL)
     {
         $this->__load();
         return parent::setSession($session);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesStoryWZ.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php
similarity index 95%
rename from lib/Doctrine/Proxies/__CG__EntitiesStoryWZ.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php
index 82216102a5..1569682cbe 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesStoryWZ.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
+class StoryWZ extends \Alchemy\Phrasea\Model\Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUser.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUser.php
similarity index 85%
rename from lib/Doctrine/Proxies/__CG__EntitiesUser.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUser.php
index 08d81a9fd4..3318b0b5ca 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUser.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUser.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class User extends \Entities\User implements \Doctrine\ORM\Proxy\Proxy
+class User extends \Alchemy\Phrasea\Model\Entities\User implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -357,10 +357,10 @@ class User extends \Entities\User implements \Doctrine\ORM\Proxy\Proxy
         return parent::getModelOf();
     }
 
-    public function setModelOf($modelOf)
+    public function setModelOf(\Alchemy\Phrasea\Model\Entities\User $owner)
     {
         $this->__load();
-        return parent::setModelOf($modelOf);
+        return parent::setModelOf($owner);
     }
 
     public function getLastModel()
@@ -471,6 +471,60 @@ class User extends \Entities\User implements \Doctrine\ORM\Proxy\Proxy
         return parent::setUpdated($updated);
     }
 
+    public function getFtpCredential()
+    {
+        $this->__load();
+        return parent::getFtpCredential();
+    }
+
+    public function setFtpCredential(\Alchemy\Phrasea\Model\Entities\FtpCredential $ftpCredential = NULL)
+    {
+        $this->__load();
+        return parent::setFtpCredential($ftpCredential);
+    }
+
+    public function getQueries()
+    {
+        $this->__load();
+        return parent::getQueries();
+    }
+
+    public function AddQuery(\Alchemy\Phrasea\Model\Entities\UserQuery $query)
+    {
+        $this->__load();
+        return parent::AddQuery($query);
+    }
+
+    public function getSettings()
+    {
+        $this->__load();
+        return parent::getSettings();
+    }
+
+    public function getSettingValue($name, $default = NULL)
+    {
+        $this->__load();
+        return parent::getSettingValue($name, $default);
+    }
+
+    public function addSetting(\Alchemy\Phrasea\Model\Entities\UserSetting $setting)
+    {
+        $this->__load();
+        return parent::addSetting($setting);
+    }
+
+    public function getNotificationSettings()
+    {
+        $this->__load();
+        return parent::getNotificationSettings();
+    }
+
+    public function addNotificationSettings(\Alchemy\Phrasea\Model\Entities\UserNotificationSetting $notificationSetting)
+    {
+        $this->__load();
+        return parent::addNotificationSettings($notificationSetting);
+    }
+
     public function ACL(\Alchemy\Phrasea\Application $app)
     {
         $this->__load();
@@ -498,7 +552,7 @@ class User extends \Entities\User implements \Doctrine\ORM\Proxy\Proxy
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'login', 'email', 'password', 'nonce', 'saltedPassword', 'firstName', 'lastName', 'gender', 'address', 'city', 'country', 'zipCode', 'geonameId', 'locale', 'timezone', 'job', 'activity', 'company', 'phone', 'fax', 'admin', 'guest', 'mailNotificationsActivated', 'requestNotificationsActivated', 'ldapCreated', 'modelOf', 'lastModel', 'pushList', 'canChangeProfil', 'canChangeFtpProfil', 'lastConnection', 'mailLocked', 'deleted', 'created', 'updated');
+        return array('__isInitialized__', 'id', 'login', 'email', 'password', 'nonce', 'saltedPassword', 'firstName', 'lastName', 'gender', 'address', 'city', 'country', 'zipCode', 'geonameId', 'locale', 'timezone', 'job', 'activity', 'company', 'phone', 'fax', 'admin', 'guest', 'mailNotificationsActivated', 'requestNotificationsActivated', 'ldapCreated', 'lastModel', 'pushList', 'canChangeProfil', 'canChangeFtpProfil', 'lastConnection', 'mailLocked', 'deleted', 'created', 'updated', 'modelOf', 'ftpCredential', 'queries', 'settings', 'notificationSettings');
     }
 
     public function __clone()
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUserNotificationSetting.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesUserNotificationSetting.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php
index a18b468d4a..5f28762645 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUserNotificationSetting.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UserNotificationSetting extends \Entities\UserNotificationSetting implements \Doctrine\ORM\Proxy\Proxy
+class UserNotificationSetting extends \Alchemy\Phrasea\Model\Entities\UserNotificationSetting implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -51,6 +51,18 @@ class UserNotificationSetting extends \Entities\UserNotificationSetting implemen
         return parent::getId();
     }
 
+    public function getUser()
+    {
+        $this->__load();
+        return parent::getUser();
+    }
+
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+        $this->__load();
+        return parent::setUser($user);
+    }
+
     public function getUsrId()
     {
         $this->__load();
@@ -63,18 +75,6 @@ class UserNotificationSetting extends \Entities\UserNotificationSetting implemen
         return parent::setUsrId($usrId);
     }
 
-    public function getUser(\Alchemy\Phrasea\Application $app)
-    {
-        $this->__load();
-        return parent::getUser($app);
-    }
-
-    public function setUser(\User_Adapter $user)
-    {
-        $this->__load();
-        return parent::setUser($user);
-    }
-
     public function getName()
     {
         $this->__load();
@@ -126,7 +126,7 @@ class UserNotificationSetting extends \Entities\UserNotificationSetting implemen
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'usrId', 'name', 'value', 'created', 'updated');
+        return array('__isInitialized__', 'id', 'usrId', 'name', 'value', 'created', 'updated', 'user');
     }
 
     public function __clone()
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUserQuery.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesUserQuery.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php
index cd0c37a5b0..348b6676eb 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUserQuery.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UserQuery extends \Entities\UserQuery implements \Doctrine\ORM\Proxy\Proxy
+class UserQuery extends \Alchemy\Phrasea\Model\Entities\UserQuery implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -63,13 +63,13 @@ class UserQuery extends \Entities\UserQuery implements \Doctrine\ORM\Proxy\Proxy
         return parent::setUsrId($usrId);
     }
 
-    public function getUser(\Alchemy\Phrasea\Application $app)
+    public function getUser()
     {
         $this->__load();
-        return parent::getUser($app);
+        return parent::getUser();
     }
 
-    public function setUser(\User_Adapter $user)
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
     {
         $this->__load();
         return parent::setUser($user);
@@ -102,7 +102,7 @@ class UserQuery extends \Entities\UserQuery implements \Doctrine\ORM\Proxy\Proxy
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'usrId', 'query', 'created');
+        return array('__isInitialized__', 'id', 'usrId', 'query', 'created', 'user');
     }
 
     public function __clone()
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUserSetting.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesUserSetting.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php
index 99d971d0a9..fbff461177 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUserSetting.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UserSetting extends \Entities\UserSetting implements \Doctrine\ORM\Proxy\Proxy
+class UserSetting extends \Alchemy\Phrasea\Model\Entities\UserSetting implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -51,6 +51,18 @@ class UserSetting extends \Entities\UserSetting implements \Doctrine\ORM\Proxy\P
         return parent::getId();
     }
 
+    public function getUser()
+    {
+        $this->__load();
+        return parent::getUser();
+    }
+
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+        $this->__load();
+        return parent::setUser($user);
+    }
+
     public function getUsrId()
     {
         $this->__load();
@@ -63,18 +75,6 @@ class UserSetting extends \Entities\UserSetting implements \Doctrine\ORM\Proxy\P
         return parent::setUsrId($usrId);
     }
 
-    public function getUser(\Alchemy\Phrasea\Application $app)
-    {
-        $this->__load();
-        return parent::getUser($app);
-    }
-
-    public function setUser(\User_Adapter $user)
-    {
-        $this->__load();
-        return parent::setUser($user);
-    }
-
     public function getName()
     {
         $this->__load();
@@ -126,7 +126,7 @@ class UserSetting extends \Entities\UserSetting implements \Doctrine\ORM\Proxy\P
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'usrId', 'name', 'value', 'created', 'updated');
+        return array('__isInitialized__', 'id', 'usrId', 'name', 'value', 'created', 'updated', 'user');
     }
 
     public function __clone()
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrAuthProvider.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php
similarity index 95%
rename from lib/Doctrine/Proxies/__CG__EntitiesUsrAuthProvider.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php
index 0c89356408..0593408bba 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUsrAuthProvider.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UsrAuthProvider extends \Entities\UsrAuthProvider implements \Doctrine\ORM\Proxy\Proxy
+class UsrAuthProvider extends \Alchemy\Phrasea\Model\Entities\UsrAuthProvider implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php
similarity index 88%
rename from lib/Doctrine/Proxies/__CG__EntitiesUsrList.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php
index 26ed5e8ead..bd517edc9e 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
+class UsrList extends \Alchemy\Phrasea\Model\Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,13 +87,13 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function addOwner(\Entities\UsrListOwner $owners)
+    public function addOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners)
     {
         $this->__load();
         return parent::addOwner($owners);
     }
 
-    public function removeOwner(\Entities\UsrListOwner $owners)
+    public function removeOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners)
     {
         $this->__load();
         return parent::removeOwner($owners);
@@ -105,13 +105,13 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
         return parent::getOwners();
     }
 
-    public function addEntrie(\Entities\UsrListEntry $entries)
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries)
     {
         $this->__load();
         return parent::addEntrie($entries);
     }
 
-    public function removeEntrie(\Entities\UsrListEntry $entries)
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries)
     {
         $this->__load();
         return parent::removeEntrie($entries);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrListEntry.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php
similarity index 93%
rename from lib/Doctrine/Proxies/__CG__EntitiesUsrListEntry.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php
index 33d4725896..876b2b587a 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUsrListEntry.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy\Proxy
+class UsrListEntry extends \Alchemy\Phrasea\Model\Entities\UsrListEntry implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -99,7 +99,7 @@ class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy
         return parent::getUpdated();
     }
 
-    public function setList(\Entities\UsrList $list = NULL)
+    public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL)
     {
         $this->__load();
         return parent::setList($list);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php
similarity index 93%
rename from lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php
index 182b4a24c0..95617a6957 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy\Proxy
+class UsrListOwner extends \Alchemy\Phrasea\Model\Entities\UsrListOwner implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -111,7 +111,7 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
         return parent::getUpdated();
     }
 
-    public function setList(\Entities\UsrList $list = NULL)
+    public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL)
     {
         $this->__load();
         return parent::setList($list);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesValidationData.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php
similarity index 89%
rename from lib/Doctrine/Proxies/__CG__EntitiesValidationData.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php
index 97a007b22d..601c32a85b 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesValidationData.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\Proxy\Proxy
+class ValidationData extends \Alchemy\Phrasea\Model\Entities\ValidationData implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,7 +87,7 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
         return parent::getUpdated();
     }
 
-    public function setParticipant(\Entities\ValidationParticipant $participant = NULL)
+    public function setParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participant = NULL)
     {
         $this->__load();
         return parent::setParticipant($participant);
@@ -99,7 +99,7 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
         return parent::getParticipant();
     }
 
-    public function setBasketElement(\Entities\BasketElement $basketElement = NULL)
+    public function setBasketElement(\Alchemy\Phrasea\Model\Entities\BasketElement $basketElement = NULL)
     {
         $this->__load();
         return parent::setBasketElement($basketElement);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php
index cef3296458..d8d21c51ea 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class ValidationParticipant extends \Entities\ValidationParticipant implements \Doctrine\ORM\Proxy\Proxy
+class ValidationParticipant extends \Alchemy\Phrasea\Model\Entities\ValidationParticipant implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -135,13 +135,13 @@ class ValidationParticipant extends \Entities\ValidationParticipant implements \
         return parent::getReminded();
     }
 
-    public function addData(\Entities\ValidationData $datas)
+    public function addData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas)
     {
         $this->__load();
         return parent::addData($datas);
     }
 
-    public function removeData(\Entities\ValidationData $datas)
+    public function removeData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas)
     {
         $this->__load();
         return parent::removeData($datas);
@@ -153,7 +153,7 @@ class ValidationParticipant extends \Entities\ValidationParticipant implements \
         return parent::getDatas();
     }
 
-    public function setSession(\Entities\ValidationSession $session = NULL)
+    public function setSession(\Alchemy\Phrasea\Model\Entities\ValidationSession $session = NULL)
     {
         $this->__load();
         return parent::setSession($session);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesValidationSession.php b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php
similarity index 90%
rename from lib/Doctrine/Proxies/__CG__EntitiesValidationSession.php
rename to lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php
index 792c430319..ae60b4c3ea 100644
--- a/lib/Doctrine/Proxies/__CG__EntitiesValidationSession.php
+++ b/lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class ValidationSession extends \Entities\ValidationSession implements \Doctrine\ORM\Proxy\Proxy
+class ValidationSession extends \Alchemy\Phrasea\Model\Entities\ValidationSession implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -117,7 +117,7 @@ class ValidationSession extends \Entities\ValidationSession implements \Doctrine
         return parent::getExpires();
     }
 
-    public function setBasket(\Entities\Basket $basket = NULL)
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
     {
         $this->__load();
         return parent::setBasket($basket);
@@ -129,13 +129,13 @@ class ValidationSession extends \Entities\ValidationSession implements \Doctrine
         return parent::getBasket();
     }
 
-    public function addParticipant(\Entities\ValidationParticipant $participants)
+    public function addParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants)
     {
         $this->__load();
         return parent::addParticipant($participants);
     }
 
-    public function removeParticipant(\Entities\ValidationParticipant $participants)
+    public function removeParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants)
     {
         $this->__load();
         return parent::removeParticipant($participants);
diff --git a/lib/Doctrine/Proxies/__CG__EntitiesCategory.php b/lib/Doctrine/Proxies/__CG__EntitiesCategory.php
deleted file mode 100644
index 317d86f9cc..0000000000
--- a/lib/Doctrine/Proxies/__CG__EntitiesCategory.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-namespace Proxies\__CG__\Entities;
-
-/**
- * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
- */
-class Category extends \Entities\Category implements \Doctrine\ORM\Proxy\Proxy
-{
-    private $_entityPersister;
-    private $_identifier;
-    public $__isInitialized__ = false;
-    public function __construct($entityPersister, $identifier)
-    {
-        $this->_entityPersister = $entityPersister;
-        $this->_identifier = $identifier;
-    }
-    /** @private */
-    public function __load()
-    {
-        if (!$this->__isInitialized__ && $this->_entityPersister) {
-            $this->__isInitialized__ = true;
-
-            if (method_exists($this, "__wakeup")) {
-                // call this after __isInitialized__to avoid infinite recursion
-                // but before loading to emulate what ClassMetadata::newInstance()
-                // provides.
-                $this->__wakeup();
-            }
-
-            if ($this->_entityPersister->load($this->_identifier, $this) === null) {
-                throw new \Doctrine\ORM\EntityNotFoundException();
-            }
-            unset($this->_entityPersister, $this->_identifier);
-        }
-    }
-
-    /** @private */
-    public function __isInitialized()
-    {
-        return $this->__isInitialized__;
-    }
-
-    
-    public function getTranslations()
-    {
-        $this->__load();
-        return parent::getTranslations();
-    }
-
-    public function getTranslation($locale)
-    {
-        $this->__load();
-        return parent::getTranslation($locale);
-    }
-
-    public function addTranslation(\Entities\CategoryTranslation $t)
-    {
-        $this->__load();
-        return parent::addTranslation($t);
-    }
-
-    public function getId()
-    {
-        if ($this->__isInitialized__ === false) {
-            return (int) $this->_identifier["id"];
-        }
-        $this->__load();
-        return parent::getId();
-    }
-
-    public function setTitle($title)
-    {
-        $this->__load();
-        return parent::setTitle($title);
-    }
-
-    public function getTitle()
-    {
-        $this->__load();
-        return parent::getTitle();
-    }
-
-    public function setSubtitle($subtitle)
-    {
-        $this->__load();
-        return parent::setSubtitle($subtitle);
-    }
-
-    public function getSubtitle()
-    {
-        $this->__load();
-        return parent::getSubtitle();
-    }
-
-    public function setParent($parent)
-    {
-        $this->__load();
-        return parent::setParent($parent);
-    }
-
-    public function getParent()
-    {
-        $this->__load();
-        return parent::getParent();
-    }
-
-    public function getRoot()
-    {
-        $this->__load();
-        return parent::getRoot();
-    }
-
-    public function getLevel()
-    {
-        $this->__load();
-        return parent::getLevel();
-    }
-
-    public function getChildren()
-    {
-        $this->__load();
-        return parent::getChildren();
-    }
-
-    public function getLeft()
-    {
-        $this->__load();
-        return parent::getLeft();
-    }
-
-    public function getRight()
-    {
-        $this->__load();
-        return parent::getRight();
-    }
-
-    public function getCreated()
-    {
-        $this->__load();
-        return parent::getCreated();
-    }
-
-    public function getUpdated()
-    {
-        $this->__load();
-        return parent::getUpdated();
-    }
-
-    public function getCreatedBy()
-    {
-        $this->__load();
-        return parent::getCreatedBy();
-    }
-
-    public function getUpdatedBy()
-    {
-        $this->__load();
-        return parent::getUpdatedBy();
-    }
-
-    public function __toString()
-    {
-        $this->__load();
-        return parent::__toString();
-    }
-
-    public function addElement(\Entities\CategoryElement $elements)
-    {
-        $this->__load();
-        return parent::addElement($elements);
-    }
-
-    public function removeElement(\Entities\CategoryElement $elements)
-    {
-        $this->__load();
-        return parent::removeElement($elements);
-    }
-
-
-    public function __sleep()
-    {
-        return array('__isInitialized__', 'id', 'title', 'subtitle', 'lft', 'rgt', 'root', 'level', 'parent', 'children', 'translations', 'elements');
-    }
-
-    public function __clone()
-    {
-        if (!$this->__isInitialized__ && $this->_entityPersister) {
-            $this->__isInitialized__ = true;
-            $class = $this->_entityPersister->getClassMetadata();
-            $original = $this->_entityPersister->load($this->_identifier);
-            if ($original === null) {
-                throw new \Doctrine\ORM\EntityNotFoundException();
-            }
-            foreach ($class->reflFields as $field => $reflProperty) {
-                $reflProperty->setValue($this, $reflProperty->getValue($original));
-            }
-            unset($this->_entityPersister, $this->_identifier);
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/lib/Doctrine/Repositories/AuthFailureRepository.php b/lib/Doctrine/Repositories/AuthFailureRepository.php
index 87a1efc127..737178f4a8 100644
--- a/lib/Doctrine/Repositories/AuthFailureRepository.php
+++ b/lib/Doctrine/Repositories/AuthFailureRepository.php
@@ -17,7 +17,7 @@ class AuthFailureRepository extends EntityRepository
         $date = new \DateTime($limit);
 
         $dql = 'SELECT f
-                FROM Entities\AuthFailure f
+                FROM Alchemy\Phrasea\Model\Entities\AuthFailure f
                 WHERE f.created < :date';
 
         $params = array('date' => $date->format('Y-m-d h:i:s'));
@@ -31,7 +31,7 @@ class AuthFailureRepository extends EntityRepository
     public function findLockedFailuresMatching($username, $ip)
     {
         $dql = 'SELECT f
-                FROM Entities\AuthFailure f
+                FROM Alchemy\Phrasea\Model\Entities\AuthFailure f
                 WHERE (f.username = :username OR f.ip = :ip)
                     AND f.locked = true';
 
diff --git a/lib/Doctrine/Repositories/BasketElementRepository.php b/lib/Doctrine/Repositories/BasketElementRepository.php
index a9ed6dd337..0330a651c5 100644
--- a/lib/Doctrine/Repositories/BasketElementRepository.php
+++ b/lib/Doctrine/Repositories/BasketElementRepository.php
@@ -2,6 +2,7 @@
 
 namespace Repositories;
 
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -17,7 +18,7 @@ class BasketElementRepository extends EntityRepository
     public function findUserElement($element_id, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Entities\BasketElement e
+            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
             JOIN e.basket b
             LEFT JOIN e.validation_datas vd
             LEFT JOIN b.validation s
@@ -36,7 +37,7 @@ class BasketElementRepository extends EntityRepository
 
         $element = $query->getOneOrNullResult();
 
-        /* @var $element \Entities\BasketElement */
+        /* @var $element BasketElement */
         if (null === $element) {
             throw new NotFoundHttpException(_('Element is not found'));
         }
@@ -47,7 +48,7 @@ class BasketElementRepository extends EntityRepository
     public function findElementsByRecord(\record_adapter $record)
     {
         $dql = 'SELECT e
-            FROM Entities\BasketElement e
+            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -68,7 +69,7 @@ class BasketElementRepository extends EntityRepository
     public function findElementsByDatabox(\databox $databox)
     {
         $dql = 'SELECT e
-            FROM Entities\BasketElement e
+            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -93,7 +94,7 @@ class BasketElementRepository extends EntityRepository
     public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Entities\BasketElement e
+            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -117,7 +118,7 @@ class BasketElementRepository extends EntityRepository
     public function findReceivedValidationElementsByRecord(\record_adapter $record, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Entities\BasketElement e
+            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
             JOIN e.basket b
             JOIN b.validation v
             JOIN v.participants p
diff --git a/lib/Doctrine/Repositories/BasketRepository.php b/lib/Doctrine/Repositories/BasketRepository.php
index aaaded5ff1..3ebdd8b4e7 100644
--- a/lib/Doctrine/Repositories/BasketRepository.php
+++ b/lib/Doctrine/Repositories/BasketRepository.php
@@ -12,6 +12,7 @@
 namespace Repositories;
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -37,7 +38,7 @@ class BasketRepository extends EntityRepository
     public function findActiveByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             LEFT JOIN b.elements e
             WHERE b.usr_id = :usr_id
             AND b.archived = false';
@@ -63,7 +64,7 @@ class BasketRepository extends EntityRepository
     public function findUnreadActiveByUser(\User_Adapter $user)
     {
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             JOIN b.elements e
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -98,7 +99,7 @@ class BasketRepository extends EntityRepository
     public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             JOIN b.elements e
             JOIN e.validation_datas v
             JOIN b.validation s
@@ -125,12 +126,12 @@ class BasketRepository extends EntityRepository
      * @throws AccessDeniedHttpException
      * @param  type                      $basket_id
      * @param  \User_Adapter             $user
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function findUserBasket(Application $app, $basket_id, \User_Adapter $user, $requireOwner)
     {
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             LEFT JOIN b.elements e
             WHERE b.id = :basket_id';
 
@@ -139,7 +140,7 @@ class BasketRepository extends EntityRepository
 
         $basket = $query->getOneOrNullResult();
 
-        /* @var $basket \Entities\Basket */
+        /* @var $basket Basket */
         if (null === $basket) {
             throw new NotFoundHttpException(_('Basket is not found'));
         }
@@ -167,7 +168,7 @@ class BasketRepository extends EntityRepository
     {
 
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             JOIN b.elements e
             WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
               AND b.usr_id = :usr_id';
@@ -190,7 +191,7 @@ class BasketRepository extends EntityRepository
         switch ($type) {
             case self::RECEIVED:
                 $dql = 'SELECT b
-                FROM Entities\Basket b
+                FROM Alchemy\Phrasea\Model\Entities\Basket b
                 JOIN b.elements e
                 WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL';
                 $params = array(
@@ -199,7 +200,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::VALIDATION_DONE:
                 $dql = 'SELECT b
-                FROM Entities\Basket b
+                FROM Alchemy\Phrasea\Model\Entities\Basket b
                 JOIN b.elements e
                 JOIN b.validation s
                 JOIN s.participants p
@@ -211,7 +212,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::VALIDATION_SENT:
                 $dql = 'SELECT b
-                FROM Entities\Basket b
+                FROM Alchemy\Phrasea\Model\Entities\Basket b
                 JOIN b.elements e
                 JOIN b.validation v
                 WHERE b.usr_id = :usr_id';
@@ -221,7 +222,7 @@ class BasketRepository extends EntityRepository
                 break;
             default:
                 $dql = 'SELECT b
-                FROM Entities\Basket b
+                FROM Alchemy\Phrasea\Model\Entities\Basket b
                 LEFT JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
@@ -233,7 +234,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::MYBASKETS:
                 $dql = 'SELECT b
-                FROM Entities\Basket b
+                FROM Alchemy\Phrasea\Model\Entities\Basket b
                 LEFT JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
@@ -280,7 +281,7 @@ class BasketRepository extends EntityRepository
     public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Entities\Basket b
+            FROM Alchemy\Phrasea\Model\Entities\Basket b
             LEFT JOIN b.elements e
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
diff --git a/lib/Doctrine/Repositories/FeedEntryRepository.php b/lib/Doctrine/Repositories/FeedEntryRepository.php
index 3000630ce5..1eee440851 100644
--- a/lib/Doctrine/Repositories/FeedEntryRepository.php
+++ b/lib/Doctrine/Repositories/FeedEntryRepository.php
@@ -23,7 +23,7 @@ class FeedEntryRepository extends EntityRepository
      */
     public function findByFeeds($feeds, $offset_start = null, $how_many = null)
     {
-        $dql = 'SELECT f FROM Entities\FeedEntry f
+        $dql = 'SELECT f FROM Alchemy\Phrasea\Model\Entities\FeedEntry f
                 WHERE f.feed IN (:feeds) order by f.updatedOn DESC';
 
         $query = $this->_em->createQuery($dql);
diff --git a/lib/Doctrine/Repositories/FeedItemRepository.php b/lib/Doctrine/Repositories/FeedItemRepository.php
index 5ab3935fc2..c66a26f6f5 100644
--- a/lib/Doctrine/Repositories/FeedItemRepository.php
+++ b/lib/Doctrine/Repositories/FeedItemRepository.php
@@ -26,7 +26,7 @@ class FeedItemRepository extends EntityRepository
     public function isRecordInPublicFeed(Application $app, $sbas_id, $record_id)
     {
         $dql = 'SELECT i
-            FROM Entities\FeedItem i
+            FROM Alchemy\Phrasea\Model\Entities\FeedItem i
             JOIN i.entry e
             JOIN e.feed f
             WHERE i.sbasId = :sbas_id
@@ -54,7 +54,7 @@ class FeedItemRepository extends EntityRepository
 
         do {
             $dql = 'SELECT i
-                FROM Entities\FeedItem i
+                FROM Alchemy\Phrasea\Model\Entities\FeedItem i
                 JOIN i.entry e
                 JOIN e.feed f
                 WHERE f.public = true ORDER BY i.createdOn DESC';
diff --git a/lib/Doctrine/Repositories/FeedPublisherRepository.php b/lib/Doctrine/Repositories/FeedPublisherRepository.php
index 185fa596ac..273d74119a 100644
--- a/lib/Doctrine/Repositories/FeedPublisherRepository.php
+++ b/lib/Doctrine/Repositories/FeedPublisherRepository.php
@@ -3,8 +3,8 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\Feed;
-use Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
 
 /**
  * FeedPublisherRepository
diff --git a/lib/Doctrine/Repositories/FeedRepository.php b/lib/Doctrine/Repositories/FeedRepository.php
index 3a085dcfc3..6d65bfd92c 100644
--- a/lib/Doctrine/Repositories/FeedRepository.php
+++ b/lib/Doctrine/Repositories/FeedRepository.php
@@ -4,7 +4,7 @@ namespace Repositories;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\EntityRepository;
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
 
 /**
  * FeedRepository
diff --git a/lib/Doctrine/Repositories/FtpExportRepository.php b/lib/Doctrine/Repositories/FtpExportRepository.php
index 17838203f1..76dd2f56ed 100644
--- a/lib/Doctrine/Repositories/FtpExportRepository.php
+++ b/lib/Doctrine/Repositories/FtpExportRepository.php
@@ -13,11 +13,11 @@ use Doctrine\ORM\EntityRepository;
 class FtpExportRepository extends EntityRepository
 {
     /**
-     * Returns exports that crashed. If a date is provided, only exports created 
+     * Returns exports that crashed. If a date is provided, only exports created
      * before this date are returned.
-     * 
+     *
      * @param \DateTime $before An optional date to search
-     * 
+     *
      * @return array
      */
     public function findCrashedExports(\DateTime $before = null)
@@ -29,19 +29,19 @@ class FtpExportRepository extends EntityRepository
             $qb->andWhere($qb->expr()->lte('e.created', ':created'));
             $qb->setParameter(':created', $before);
         }
-        
+
         return $qb->getQuery()->getResult();
     }
 
     /**
      * Returns a list of exports that can be achieved.
-     * 
+     *
      * @return array
      */
     public function findDoableExports()
     {
         $dql = 'SELECT f
-            FROM Entities\FtpExport f
+            FROM Alchemy\Phrasea\Model\Entities\FtpExport f
                 INNER JOIN f.elements e
             WHERE e.done = false';
 
@@ -52,9 +52,9 @@ class FtpExportRepository extends EntityRepository
 
     /**
      * Returns the exports initiated by a given user.
-     * 
+     *
      * @param \User_Adapter $user
-     * 
+     *
      * @return array
      */
     public function findByUser(\User_Adapter $user)
diff --git a/lib/Doctrine/Repositories/LazaretFileRepository.php b/lib/Doctrine/Repositories/LazaretFileRepository.php
index 237c4b98fa..d4465e1b43 100644
--- a/lib/Doctrine/Repositories/LazaretFileRepository.php
+++ b/lib/Doctrine/Repositories/LazaretFileRepository.php
@@ -21,7 +21,7 @@ class LazaretFileRepository extends EntityRepository
 
         $dql = '
             SELECT f
-            FROM Entities\LazaretFile f'
+            FROM Alchemy\Phrasea\Model\Entities\LazaretFile f'
             . ('' === $base_ids ? '' : ' WHERE f.base_id IN  (' . $base_ids . ')')
             . ' ORDER BY f.id DESC';
 
diff --git a/lib/Doctrine/Repositories/StoryWZRepository.php b/lib/Doctrine/Repositories/StoryWZRepository.php
index 5e0827390f..ff50c85b9c 100644
--- a/lib/Doctrine/Repositories/StoryWZRepository.php
+++ b/lib/Doctrine/Repositories/StoryWZRepository.php
@@ -18,7 +18,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByUser(Application $app, \User_Adapter $user, $sort)
     {
-        $dql = 'SELECT s FROM Entities\StoryWZ s WHERE s.usr_id = :usr_id ';
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.usr_id = :usr_id ';
 
         if ($sort == 'date') {
             $dql .= ' ORDER BY s.created DESC';
@@ -109,7 +109,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByRecord(Application $app, \record_adapter $Story)
     {
-        $dql = 'SELECT s FROM Entities\StoryWZ s WHERE s.sbas_id = :sbas_id
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.sbas_id = :sbas_id
                 AND s.record_id = :record_id';
 
         $query = $this->_em->createQuery($dql);
@@ -135,7 +135,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByDatabox(Application $app, \databox $databox)
     {
-        $dql = 'SELECT s FROM Entities\StoryWZ s WHERE s.sbas_id = :sbas_id';
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.sbas_id = :sbas_id';
 
         $query = $this->_em->createQuery($dql);
         $query->setParameters(array(
diff --git a/lib/Doctrine/Repositories/UserRepository.php b/lib/Doctrine/Repositories/UserRepository.php
index f7ff3b4fde..e4848f99a5 100644
--- a/lib/Doctrine/Repositories/UserRepository.php
+++ b/lib/Doctrine/Repositories/UserRepository.php
@@ -12,7 +12,7 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 
 /**
  * User
diff --git a/lib/Doctrine/Repositories/UsrAuthProviderRepository.php b/lib/Doctrine/Repositories/UsrAuthProviderRepository.php
index 61468e4f8c..3c7cf9745d 100644
--- a/lib/Doctrine/Repositories/UsrAuthProviderRepository.php
+++ b/lib/Doctrine/Repositories/UsrAuthProviderRepository.php
@@ -15,7 +15,7 @@ class UsrAuthProviderRepository extends EntityRepository
     public function findByUser(\User_Adapter $user)
     {
         $dql = 'SELECT u
-                FROM Entities\UsrAuthProvider u
+                FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u
                 WHERE u.usr_id = :usrId';
 
         $params = array('usrId' => $user->get_id());
@@ -29,7 +29,7 @@ class UsrAuthProviderRepository extends EntityRepository
     public function findWithProviderAndId($providerId, $distantId)
     {
         $dql = 'SELECT u
-                FROM Entities\UsrAuthProvider u
+                FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u
                 WHERE u.provider = :providerId AND u.distant_id = :distantId';
 
         $params = array('providerId' => $providerId, 'distantId' => $distantId);
diff --git a/lib/Doctrine/Repositories/UsrListEntryRepository.php b/lib/Doctrine/Repositories/UsrListEntryRepository.php
index da537ce723..1ae5a9ae7c 100644
--- a/lib/Doctrine/Repositories/UsrListEntryRepository.php
+++ b/lib/Doctrine/Repositories/UsrListEntryRepository.php
@@ -2,6 +2,8 @@
 
 namespace Repositories;
 
+use Alchemy\Phrasea\Model\Entities\UsrList;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -23,7 +25,7 @@ class UsrListEntryRepository extends EntityRepository
      */
     public function findUserList(\User_Adapter $user)
     {
-        $dql = 'SELECT e FROM Entities\UsrListEntry e
+        $dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e
             WHERE e.usr_id = :usr_id';
 
         $params = array(
@@ -36,7 +38,7 @@ class UsrListEntryRepository extends EntityRepository
         return $query->getResult();
     }
 
-    public function findEntryByListAndEntryId(\Entities\UsrList $list, $entry_id)
+    public function findEntryByListAndEntryId(UsrList $list, $entry_id)
     {
         $entry = $this->find($entry_id);
 
@@ -44,7 +46,7 @@ class UsrListEntryRepository extends EntityRepository
             throw new NotFoundHttpException('Entry not found');
         }
 
-        /* @var $entry \Entities\UsrListEntry */
+        /* @var $entry UsrListEntry */
         if ($entry->getList()->getId() != $list->getId()) {
             throw new AccessDeniedHttpException('Entry mismatch list');
         }
@@ -52,9 +54,9 @@ class UsrListEntryRepository extends EntityRepository
         return $entry;
     }
 
-    public function findEntryByListAndUsrId(\Entities\UsrList $list, $usr_id)
+    public function findEntryByListAndUsrId(UsrList $list, $usr_id)
     {
-        $dql = 'SELECT e FROM Entities\UsrListEntry e
+        $dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e
               JOIN e.list l
             WHERE e.usr_id = :usr_id AND l.id = :list_id';
 
diff --git a/lib/Doctrine/Repositories/UsrListOwnerRepository.php b/lib/Doctrine/Repositories/UsrListOwnerRepository.php
index 940fdd3d93..bb660f52d5 100644
--- a/lib/Doctrine/Repositories/UsrListOwnerRepository.php
+++ b/lib/Doctrine/Repositories/UsrListOwnerRepository.php
@@ -2,6 +2,8 @@
 
 namespace Repositories;
 
+use Alchemy\Phrasea\Model\Entities\UsrListOwner;
+use Alchemy\Phrasea\Model\Entities\UsrList;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -18,15 +20,15 @@ class UsrListOwnerRepository extends EntityRepository
     /**
      *
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @param  type              $owner_id
-     * @return \Entities\UsrList
+     * @return UsrList
      */
-    public function findByListAndOwner(\Entities\UsrList $list, $owner_id)
+    public function findByListAndOwner(UsrList $list, $owner_id)
     {
         $owner = $this->find($owner_id);
 
-        /* @var $owner \Entities\UsrListOwner */
+        /* @var $owner UsrListOwner */
         if (null === $owner) {
             throw new NotFoundHttpException(_('Owner is not found'));
         }
@@ -41,13 +43,13 @@ class UsrListOwnerRepository extends EntityRepository
     /**
      *
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @param  type              $usr_id
-     * @return \Entities\UsrList
+     * @return UsrList
      */
-    public function findByListAndUsrId(\Entities\UsrList $list, $usr_id)
+    public function findByListAndUsrId(UsrList $list, $usr_id)
     {
-        $dql = 'SELECT o FROM Entities\UsrListOwner o
+        $dql = 'SELECT o FROM Alchemy\Phrasea\Model\Entities\UsrListOwner o
               JOIN o.list l
             WHERE l.id = :list_id AND o.usr_id = :usr_id';
 
@@ -61,7 +63,7 @@ class UsrListOwnerRepository extends EntityRepository
 
         $owner = $query->getSingleResult();
 
-        /* @var $owner \Entities\UsrListOwner */
+        /* @var $owner UsrListOwner */
         if (null === $owner) {
             throw new NotFoundHttpException(_('Owner is not found'));
         }
diff --git a/lib/Doctrine/Repositories/UsrListRepository.php b/lib/Doctrine/Repositories/UsrListRepository.php
index 193e04b99a..7e04469b9d 100644
--- a/lib/Doctrine/Repositories/UsrListRepository.php
+++ b/lib/Doctrine/Repositories/UsrListRepository.php
@@ -3,6 +3,7 @@
 namespace Repositories;
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\UsrList;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -24,7 +25,7 @@ class UsrListRepository extends EntityRepository
      */
     public function findUserLists(\User_Adapter $user)
     {
-        $dql = 'SELECT l FROM Entities\UsrList l
+        $dql = 'SELECT l FROM Alchemy\Phrasea\Model\Entities\UsrList l
               JOIN l.owners o
             WHERE o.usr_id = :usr_id';
 
@@ -42,13 +43,13 @@ class UsrListRepository extends EntityRepository
      *
      * @param  \User_Adapter     $user
      * @param  type              $list_id
-     * @return \Entities\UsrList
+     * @return UsrList
      */
     public function findUserListByUserAndId(Application $app, \User_Adapter $user, $list_id)
     {
         $list = $this->find($list_id);
 
-        /* @var $basket \Entities\UsrList */
+        /* @var $list UsrList */
         if (null === $list) {
             throw new NotFoundHttpException(_('List is not found'));
         }
@@ -69,7 +70,7 @@ class UsrListRepository extends EntityRepository
      */
     public function findUserListLike(\User_Adapter $user, $name)
     {
-        $dql = 'SELECT l FROM Entities\UsrList l
+        $dql = 'SELECT l FROM Alchemy\Phrasea\Model\Entities\UsrList l
               JOIN l.owners o
             WHERE o.usr_id = :usr_id AND l.name LIKE :name';
 
diff --git a/lib/Doctrine/Repositories/ValidationParticipantRepository.php b/lib/Doctrine/Repositories/ValidationParticipantRepository.php
index 93cdfa8809..97ca9f9fd7 100644
--- a/lib/Doctrine/Repositories/ValidationParticipantRepository.php
+++ b/lib/Doctrine/Repositories/ValidationParticipantRepository.php
@@ -32,7 +32,7 @@ class ValidationParticipantRepository extends EntityRepository
     {
         $dql = '
             SELECT p, s
-            FROM Entities\ValidationParticipant p
+            FROM Alchemy\Phrasea\Model\Entities\ValidationParticipant p
             JOIN p.session s
             JOIN s.basket b
             WHERE p.is_confirmed = 0
diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php
index ab3bffcae6..12dafbcb0d 100644
--- a/lib/classes/ACL.php
+++ b/lib/classes/ACL.php
@@ -258,7 +258,7 @@ class ACL implements cache_cacheableInterface
             $granted = true;
         }
 
-        if (false === $granted && $this->app['EM']->getRepository('Entities\FeedItem')->isRecordInPublicFeed($this->app, $record->get_sbas_id(), $record->get_record_id())) {
+        if (false === $granted && $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed($this->app, $record->get_sbas_id(), $record->get_record_id())) {
             $granted = true;
         }
 
diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php
index 911bd290d1..e0e3e3e484 100644
--- a/lib/classes/API/V1/adapter.php
+++ b/lib/classes/API/V1/adapter.php
@@ -17,10 +17,14 @@ use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Attribute\Status;
 use Alchemy\Phrasea\Border\Manager as BorderManager;
-use Entities\Feed;
-use Entities\FeedEntry;
-use Entities\FeedItem;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -684,7 +688,7 @@ class API_V1_adapter extends API_V1_Abstract
             $Package->addAttribute(new Status($app, $request->get('status')));
         }
 
-        $session = new Entities\LazaretSession();
+        $session = new Alchemy\Phrasea\Model\Entities\LazaretSession();
         $session->setUsrId($app['authentication']->getUser()->get_id());
 
         $app['EM']->persist($session);
@@ -730,7 +734,7 @@ class API_V1_adapter extends API_V1_Abstract
             $ret['url'] = '/records/' . $output->get_sbas_id() . '/' . $output->get_record_id() . '/';
             $app['phraseanet.SE']->addRecord($output);
         }
-        if ($output instanceof \Entities\LazaretFile) {
+        if ($output instanceof LazaretFile) {
             $ret['entity'] = '1';
             $ret['url'] = '/quarantine/item/' . $output->getId() . '/';
         }
@@ -752,7 +756,7 @@ class API_V1_adapter extends API_V1_Abstract
         $lazaretFiles = array();
 
         if (count($baseIds) > 0) {
-            $lazaretRepository = $app['EM']->getRepository('Entities\LazaretFile');
+            $lazaretRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile');
 
             $lazaretFiles = $lazaretRepository->findPerPage(
                     $baseIds, $offset_start, $per_page
@@ -778,9 +782,9 @@ class API_V1_adapter extends API_V1_Abstract
 
     public function list_quarantine_item($lazaret_id, Application $app, Request $request)
     {
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $lazaret_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $lazaret_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             throw new \API_V1_exception_notfound(sprintf('Lazaret file id %d not found', $lazaret_id));
         }
@@ -798,7 +802,7 @@ class API_V1_adapter extends API_V1_Abstract
         return $result;
     }
 
-    protected function list_lazaret_file(\Entities\LazaretFile $file)
+    protected function list_lazaret_file(LazaretFile $file)
     {
         $checks = array();
 
@@ -1264,7 +1268,7 @@ class API_V1_adapter extends API_V1_Abstract
      */
     protected function list_baskets($usr_id)
     {
-        $repo = $this->app['EM']->getRepository('\Entities\Basket');
+        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
         /* @var $repo \Repositories\BasketRepository */
 
         $baskets = $repo->findActiveByUser($this->app['authentication']->getUser());
@@ -1293,7 +1297,7 @@ class API_V1_adapter extends API_V1_Abstract
             throw new API_V1_exception_badrequest('Missing basket name parameter');
         }
 
-        $Basket = new \Entities\Basket();
+        $Basket = new Basket();
         $Basket->setOwner($this->app['authentication']->getUser());
         $Basket->setName($name);
 
@@ -1314,7 +1318,7 @@ class API_V1_adapter extends API_V1_Abstract
      */
     public function delete_basket(Request $request, $basket_id)
     {
-        $repository = $this->app['EM']->getRepository('\Entities\Basket');
+        $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
 
@@ -1336,7 +1340,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $repository = $this->app['EM']->getRepository('\Entities\Basket');
+        $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
 
@@ -1355,10 +1359,10 @@ class API_V1_adapter extends API_V1_Abstract
     /**
      * Retrieve elements of one basket
      *
-     * @param  \Entities\Basket $Basket
+     * @param  Basket $Basket
      * @return type
      */
-    protected function list_basket_content(\Entities\Basket $Basket)
+    protected function list_basket_content(Basket $Basket)
     {
         $ret = array();
 
@@ -1372,10 +1376,10 @@ class API_V1_adapter extends API_V1_Abstract
     /**
      * Retrieve detailled informations about a basket element
      *
-     * @param  \Entities\BasketElement $basket_element
+     * @param  BasketElement $basket_element
      * @return type
      */
-    protected function list_basket_element(\Entities\BasketElement $basket_element)
+    protected function list_basket_element(BasketElement $basket_element)
     {
         $ret = array(
             'basket_element_id' => $basket_element->getId(),
@@ -1392,7 +1396,7 @@ class API_V1_adapter extends API_V1_Abstract
             foreach ($basket_element->getValidationDatas() as $validation_datas) {
                 $participant = $validation_datas->getParticipant();
                 $user = $participant->getUser($this->app);
-                /* @var $validation_datas Entities\ValidationData */
+                /* @var $validation_datas Alchemy\Phrasea\Model\Entities\ValidationData */
                 $choices[] = array(
                     'validation_user' => array(
                         'usr_id'         => $user->get_id(),
@@ -1435,7 +1439,7 @@ class API_V1_adapter extends API_V1_Abstract
 
         $name = $request->get('name');
 
-        $repository = $this->app['EM']->getRepository('\Entities\Basket');
+        $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
 
@@ -1463,7 +1467,7 @@ class API_V1_adapter extends API_V1_Abstract
 
         $desc = $request->get('description');
 
-        $repository = $this->app['EM']->getRepository('\Entities\Basket');
+        $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
 
@@ -1489,7 +1493,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $coll = $this->app['EM']->getRepository('Entities\Feed')->getAllForUser($user);
+        $coll = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($user);
 
         $datas = array();
         foreach ($coll as $feed) {
@@ -1522,7 +1526,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $feed = $this->app['EM']->getRepository('Entities\Feed')->find($publication_id);
+        $feed = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($publication_id);
         if (!$feed->isAccessible($user, $this->app)) {
             return $result->set_datas(array());
         }
@@ -1570,7 +1574,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find($entry_id);
+        $entry = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
 
         $collection = $entry->getFeed()->getCollection($this->app);
 
@@ -1814,10 +1818,10 @@ class API_V1_adapter extends API_V1_Abstract
     /**
      * Retirve information about one basket
      *
-     * @param  \Entities\Basket $basket
+     * @param  Basket $basket
      * @return array
      */
-    public function list_basket(\Entities\Basket $basket)
+    public function list_basket(Basket $basket)
     {
         $ret = array(
             'basket_id'         => $basket->getId(),
@@ -1834,7 +1838,7 @@ class API_V1_adapter extends API_V1_Abstract
             $users = array();
 
             foreach ($basket->getValidation()->getParticipants() as $participant) {
-                /* @var $participant \Entities\ValidationParticipant */
+                /* @var $participant ValidationParticipant */
                 $user = $participant->getUser($this->app);
 
                 $users[] = array(
diff --git a/lib/classes/Session/Logger.php b/lib/classes/Session/Logger.php
index dc1f06a1d2..b0c7a189dd 100644
--- a/lib/classes/Session/Logger.php
+++ b/lib/classes/Session/Logger.php
@@ -11,6 +11,7 @@
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\SessionNotFound;
+use Alchemy\Phrasea\Model\Entities\SessionModule;
 
 class Session_Logger
 {
@@ -187,14 +188,14 @@ class Session_Logger
             return;
         }
 
-        $session = $app['EM']->find('Entities\Session', $app['session']->get('session_id'));
+        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $app['session']->get('session_id'));
 
         if (!$session) {
             throw new SessionNotFound('No session found');
         }
 
         if (!$session->hasModuleId($appId)) {
-            $module = new \Entities\SessionModule();
+            $module = new SessionModule();
 
             $module->setModuleId($appId);
             $module->setSession($session);
diff --git a/lib/classes/User/Adapter.php b/lib/classes/User/Adapter.php
index ad8c760978..8a161057ba 100644
--- a/lib/classes/User/Adapter.php
+++ b/lib/classes/User/Adapter.php
@@ -12,7 +12,7 @@
 use Alchemy\Phrasea\Application;
 
 use Alchemy\Geonames\Exception\ExceptionInterface as GeonamesExceptionInterface;
-use Entities\FtpCredential;
+use Alchemy\Phrasea\Model\Entities\FtpCredential;
 
 /**
  *
@@ -708,7 +708,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
     public function getFtpCredential()
     {
         if (null === $this->ftpCredential) {
-            $this->ftpCredential = $this->app['EM']->getRepository('Entities\FtpCredential')->findOneBy(array(
+            $this->ftpCredential = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FtpCredential')->findOneBy(array(
                 'usrId' => $this->get_id()
             ));
 
@@ -763,17 +763,17 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
      */
     public function delete()
     {
-        $repo = $this->app['EM']->getRepository('Entities\UsrAuthProvider');
+        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
         foreach ($repo->findByUser($this) as $provider) {
             $this->app['EM']->remove($provider);
         }
 
-        $repo = $this->app['EM']->getRepository('Entities\FtpExport');
+        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport');
         foreach ($repo->findByUser($this) as $export) {
             $this->app['EM']->remove($export);
         }
 
-        $repo = $this->app['EM']->getRepository('Entities\Order');
+        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order');
         foreach ($repo->findByUser($this) as $order) {
             $this->app['EM']->remove($order);
         }
diff --git a/lib/classes/databox.php b/lib/classes/databox.php
index 12d3c3a246..f1956dcaf3 100644
--- a/lib/classes/databox.php
+++ b/lib/classes/databox.php
@@ -452,11 +452,11 @@ class databox extends base
             $n+=50;
         }
 
-        foreach ($this->app['EM']->getRepository('\Entities\StoryWZ')->findByDatabox($this->app, $this) as $story) {
+        foreach ($this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ')->findByDatabox($this->app, $this) as $story) {
             $this->app['EM']->remove($story);
         }
 
-        foreach ($this->app['EM']->getRepository('\Entities\BasketElement')->findElementsByDatabox($this) as $element) {
+        foreach ($this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')->findElementsByDatabox($this) as $element) {
             $this->app['EM']->remove($element);
         }
 
diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php
index 50140861bf..5d1205e4fb 100644
--- a/lib/classes/eventsmanager/notify/feed.php
+++ b/lib/classes/eventsmanager/notify/feed.php
@@ -139,7 +139,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
     {
         $sx = simplexml_load_string($datas);
 
-        $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find((int) $sx->entry_id);
+        $entry = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find((int) $sx->entry_id);
 
         if (null === $entry) {
             return array();
diff --git a/lib/classes/eventsmanager/notify/order.php b/lib/classes/eventsmanager/notify/order.php
index 6912c421a3..f4e5f88aa8 100644
--- a/lib/classes/eventsmanager/notify/order.php
+++ b/lib/classes/eventsmanager/notify/order.php
@@ -55,7 +55,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
         $users = array();
 
         try {
-            $repository = $this->app['EM']->getRepository('Entities\OrderElement');
+            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\OrderElement');
 
             $results = $repository->findBy(array('orderId' => $order_id));
 
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php
index b5a64f198b..5ac5833779 100644
--- a/lib/classes/eventsmanager/notify/orderdeliver.php
+++ b/lib/classes/eventsmanager/notify/orderdeliver.php
@@ -104,7 +104,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
                 $receiver = Receiver::fromUser($user_to);
                 $emitter = Emitter::fromUser($user_from);
 
-                $repository = $this->app['EM']->getRepository('\Entities\Basket');
+                $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
                 $basket = $repository->find($params['ssel_id']);
 
                 $readyToSend = true;
@@ -159,7 +159,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
         $sender = User_Adapter::getInstance($from, $this->app)->get_display_name();
 
         try {
-            $repository = $this->app['EM']->getRepository('\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
         } catch (Exception $e) {
diff --git a/lib/classes/eventsmanager/notify/push.php b/lib/classes/eventsmanager/notify/push.php
index 742e43bccb..cfad060a02 100644
--- a/lib/classes/eventsmanager/notify/push.php
+++ b/lib/classes/eventsmanager/notify/push.php
@@ -86,7 +86,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
 
             $readyToSend = false;
             try {
-                $repository = $this->app['EM']->getRepository('\Entities\Basket');
+                $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
                 $basket = $repository->find($params['ssel_id']);
 
                 $user_from = User_Adapter::getInstance($params['from'], $this->app);
diff --git a/lib/classes/eventsmanager/notify/uploadquarantine.php b/lib/classes/eventsmanager/notify/uploadquarantine.php
index ef0d8ba346..d1a098e3f6 100644
--- a/lib/classes/eventsmanager/notify/uploadquarantine.php
+++ b/lib/classes/eventsmanager/notify/uploadquarantine.php
@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+use Alchemy\Phrasea\Model\Entities\LazaretCheck;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Notification\Receiver;
 use Alchemy\Phrasea\Notification\Mail\MailInfoRecordQuarantined;
 
@@ -43,8 +45,8 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
      */
     public function fire($event, $params, &$object)
     {
-        if (isset($params['lazaret_file']) && $params['lazaret_file'] instanceof \Entities\LazaretFile) {
-            /* @var $lazaretFile \Entities\LazaretFile */
+        if (isset($params['lazaret_file']) && $params['lazaret_file'] instanceof LazaretFile) {
+            /* @var $lazaretFile LazaretFile */
             $lazaretFile = $params['lazaret_file'];
 
             $domXML = new DOMDocument('1.0', 'UTF-8');
@@ -62,7 +64,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
             $reasons = $domXML->createElement('reasons');
 
             foreach ($lazaretFile->getChecks() as $check) {
-                /* @var $check \Entities\LazaretCheck */
+                /* @var $check LazaretCheck */
                 $reason = $domXML->createElement('checkClassName');
                 $reason->appendChild($domXML->createTextNode($check->getCheckClassname()));
                 $reasons->appendChild($reason);
diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php
index c14f4d74b3..7a8d46d8ed 100644
--- a/lib/classes/eventsmanager/notify/validate.php
+++ b/lib/classes/eventsmanager/notify/validate.php
@@ -97,7 +97,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
                 $user_to = User_Adapter::getInstance($params['to'], $this->app);
 
                 $basket = $this->app['EM']
-                    ->getRepository('\Entities\Basket')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
@@ -146,7 +146,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
         $sender = User_Adapter::getInstance($from, $this->app)->get_display_name();
 
         try {
-            $repository = $this->app['EM']->getRepository('\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
 
diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php
index f4096351f4..1118328c79 100644
--- a/lib/classes/eventsmanager/notify/validationdone.php
+++ b/lib/classes/eventsmanager/notify/validationdone.php
@@ -92,7 +92,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
                 $user_to = User_Adapter::getInstance($params['to'], $this->app);
 
                 $basket = $this->app['EM']
-                    ->getRepository('\Entities\Basket')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
@@ -140,7 +140,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
         $sender = $registered_user->get_display_name();
 
         try {
-            $repository = $this->app['EM']->getRepository('\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
         } catch (Exception $e) {
diff --git a/lib/classes/eventsmanager/notify/validationreminder.php b/lib/classes/eventsmanager/notify/validationreminder.php
index 3f3572be7b..56f6908c98 100644
--- a/lib/classes/eventsmanager/notify/validationreminder.php
+++ b/lib/classes/eventsmanager/notify/validationreminder.php
@@ -98,7 +98,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
             $readyToSend = false;
             try {
                 $basket = $this->app['EM']
-                    ->getRepository('\Entities\Basket')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
@@ -145,7 +145,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
         $sender = User_Adapter::getInstance($from, $this->app)->get_display_name();
 
         try {
-            $repository = $this->app['EM']->getRepository('\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
 
diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php
index 70cb23ae0c..831a76e92d 100644
--- a/lib/classes/patch/320f.php
+++ b/lib/classes/patch/320f.php
@@ -10,10 +10,10 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\Feed;
-use Entities\FeedEntry;
-use Entities\FeedItem;
-use Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
 use Gedmo\Timestampable\TimestampableListener;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
diff --git a/lib/classes/patch/361.php b/lib/classes/patch/361.php
index 16257dc120..970d3c0e5c 100644
--- a/lib/classes/patch/361.php
+++ b/lib/classes/patch/361.php
@@ -87,7 +87,7 @@ class patch_361 implements patchInterface
             }
         }
 
-        $dql = "SELECT b FROM Entities\Basket b WHERE b.description != ''";
+        $dql = "SELECT b FROM Alchemy\Phrasea\Model\Entities\Basket b WHERE b.description != ''";
 
         $n = 0;
         $perPage = 100;
diff --git a/lib/classes/patch/370a7.php b/lib/classes/patch/370a7.php
index 1c37f52ba6..1ac0657b94 100644
--- a/lib/classes/patch/370a7.php
+++ b/lib/classes/patch/370a7.php
@@ -10,6 +10,8 @@
  */
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use MediaAlchemyst\Exception\ExceptionInterface as MediaAlchemystException;
 use MediaAlchemyst\Specification\Image as ImageSpec;
 
@@ -60,7 +62,7 @@ class patch_370a7 implements patchInterface
         $conn = $appbox->get_connection();
 
         try {
-            //get all old lazaret file & transform them to \Entities\LazaretFile object
+            //get all old lazaret file & transform them to LazaretFile object
             $sql = 'SELECT * FROM lazaret';
             $stmt = $conn->prepare($sql);
             $stmt->execute();
@@ -76,10 +78,10 @@ class patch_370a7 implements patchInterface
 
         //order matters for foreign keys constraints
         //truncate all altered tables
-        $this->truncateTable($app['EM'], 'Entities\\LazaretAttribute');
-        $this->truncateTable($app['EM'], 'Entities\\LazaretCheck');
-        $this->truncateTable($app['EM'], 'Entities\\LazaretFile');
-        $this->truncateTable($app['EM'], 'Entities\\LazaretSession');
+        $this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute');
+        $this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck');
+        $this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile');
+        $this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession');
 
         $i = 0;
 
@@ -108,10 +110,10 @@ class patch_370a7 implements patchInterface
 
                 $borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection);
 
-                $lazaretSession = new \Entities\LazaretSession();
+                $lazaretSession = new LazaretSession();
                 $lazaretSession->setUsrId($row['usr_id']);
 
-                $lazaretFile = new \Entities\LazaretFile();
+                $lazaretFile = new LazaretFile();
                 $lazaretFile->setBaseId($row['base_id']);
 
                 if (null === $row['uuid']) {
diff --git a/lib/classes/patch/3805.php b/lib/classes/patch/3805.php
index 2a3d9daf49..38e6dcf4e9 100644
--- a/lib/classes/patch/3805.php
+++ b/lib/classes/patch/3805.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\AuthFailure;
+use Alchemy\Phrasea\Model\Entities\AuthFailure;
 
 class patch_3805 implements patchInterface
 {
diff --git a/lib/classes/patch/3811.php b/lib/classes/patch/3811.php
index bf6166a4b4..2800817b90 100644
--- a/lib/classes/patch/3811.php
+++ b/lib/classes/patch/3811.php
@@ -10,8 +10,8 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\Session;
-use Entities\SessionModule;
+use Alchemy\Phrasea\Model\Entities\Session;
+use Alchemy\Phrasea\Model\Entities\SessionModule;
 
 class patch_3811 implements patchInterface
 {
diff --git a/lib/classes/patch/390.php b/lib/classes/patch/390.php
index 4e7b62ef44..ff204cecf1 100644
--- a/lib/classes/patch/390.php
+++ b/lib/classes/patch/390.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\FtpCredential;
+use Alchemy\Phrasea\Model\Entities\FtpCredential;
 
 class patch_390 implements patchInterface
 {
diff --git a/lib/classes/patch/3902.php b/lib/classes/patch/3902.php
index 09f12eada2..89444f0e20 100644
--- a/lib/classes/patch/3902.php
+++ b/lib/classes/patch/3902.php
@@ -11,7 +11,7 @@
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\EntityManager;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 use Gedmo\Timestampable\TimestampableListener;
 
 class patch_3902 implements patchInterface
@@ -175,7 +175,7 @@ class patch_3902 implements patchInterface
 
         $n = 0;
 
-        $repository = $em->getRepository('Entities\User');
+        $repository = $em->getRepository('Alchemy\Phrasea\Model\Entities\User');
 
         foreach ($rows as $row) {
             $user = $repository->findOneByLogin($row['usr_login']);
diff --git a/lib/classes/patch/3903.php b/lib/classes/patch/3903.php
index 4ab076d126..b868084234 100644
--- a/lib/classes/patch/3903.php
+++ b/lib/classes/patch/3903.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
 
 class patch_3903 implements patchInterface
 {
diff --git a/lib/classes/patch/3904.php b/lib/classes/patch/3904.php
index 0723e7ed58..2f0d90820f 100644
--- a/lib/classes/patch/3904.php
+++ b/lib/classes/patch/3904.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\UserSetting;
+use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class patch_3904 implements patchInterface
 {
diff --git a/lib/classes/patch/3905.php b/lib/classes/patch/3905.php
index f1747464fe..82cd3cec02 100644
--- a/lib/classes/patch/3905.php
+++ b/lib/classes/patch/3905.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\UserNotificationSetting;
+use Alchemy\Phrasea\Model\Entities\UserNotificationSetting;
 
 class patch_3905 implements patchInterface
 {
diff --git a/lib/classes/patch/3906.php b/lib/classes/patch/3906.php
index 3c6324b982..a23f593a57 100644
--- a/lib/classes/patch/3906.php
+++ b/lib/classes/patch/3906.php
@@ -10,8 +10,8 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\FtpExport;
-use Entities\FtpExportElement;
+use Alchemy\Phrasea\Model\Entities\FtpExport;
+use Alchemy\Phrasea\Model\Entities\FtpExportElement;
 use Gedmo\Timestampable\TimestampableListener;
 
 class patch_3906 implements patchInterface
diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php
index ca836f328e..0755d1e2cb 100644
--- a/lib/classes/patch/3907.php
+++ b/lib/classes/patch/3907.php
@@ -10,12 +10,12 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\AggregateToken;
-use Entities\Feed;
-use Entities\FeedEntry;
-use Entities\FeedItem;
-use Entities\FeedPublisher;
-use Entities\FeedToken;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\FeedToken;
 
 class patch_3907 implements patchInterface
 {
diff --git a/lib/classes/queries.php b/lib/classes/queries.php
index 60ea1527ab..d33fba4f75 100644
--- a/lib/classes/queries.php
+++ b/lib/classes/queries.php
@@ -188,7 +188,7 @@ class queries
         $history = '<ul>';
 
         $queries = $app['EM']
-            ->getRepository('Entities\UserQuery')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\UserQuery')
             ->findBy(array('usrId' => $usrId), array('created' => 'ASC'), 25, 0);
 
         foreach ($queries as $query) {
diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php
index 959ddd7d66..813f9bf133 100644
--- a/lib/classes/record/adapter.php
+++ b/lib/classes/record/adapter.php
@@ -1569,7 +1569,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
         $stmt->execute(array(':record_id' => $this->get_record_id()));
         $stmt->closeCursor();
 
-        $orderElementRepository = $this->app['EM']->getRepository('\Entities\OrderElement');
+        $orderElementRepository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\OrderElement');
 
         /* @var $repository \Repositories\OrderElementRepository */
         foreach ($orderElementRepository->findBy(array('recordId' => $this->get_record_id())) as $order_element) {
@@ -1578,7 +1578,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
             }
         }
 
-        $basketElementRepository = $this->app['EM']->getRepository('\Entities\BasketElement');
+        $basketElementRepository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
         /* @var $repository \Repositories\BasketElementRepository */
         foreach ($basketElementRepository->findElementsByRecord($this) as $basket_element) {
@@ -1858,7 +1858,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
     public function get_container_baskets(EntityManager $em, User_Adapter $user)
     {
         return $em
-                ->getRepository('\Entities\Basket')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                 ->findContainingRecordForUser($this, $user);
     }
 
diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php
index 90a7c1adf2..f174d38a8f 100644
--- a/lib/classes/record/preview.php
+++ b/lib/classes/record/preview.php
@@ -10,6 +10,8 @@
  */
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
 
 /**
@@ -142,19 +144,19 @@ class record_preview extends record_adapter
 
                 break;
             case "BASK":
-                $repository = $app['EM']->getRepository('\Entities\Basket');
+                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
                 /* @var $repository \Repositories\BasketRepository */
                 $Basket = $repository->findUserBasket($app, $contId, $app['authentication']->getUser(), false);
 
-                /* @var $Basket \Entities\Basket */
+                /* @var $Basket Basket */
                 $this->container = $Basket;
                 $this->total = $Basket->getElements()->count();
                 $i = 0;
                 $first = true;
 
                 foreach ($Basket->getElements() as $element) {
-                    /* @var $element \Entities\BasketElement */
+                    /* @var $element BasketElement */
                     $i ++;
                     if ($first) {
                         $this->original_item = $element;
@@ -175,7 +177,7 @@ class record_preview extends record_adapter
                 }
                 break;
             case "FEED":
-                $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($contId);
+                $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($contId);
 
                 $this->container = $entry;
                 $this->total = count($entry->getItems());
diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php
index b99d1937be..1de672ce77 100644
--- a/lib/classes/set/export.php
+++ b/lib/classes/set/export.php
@@ -58,14 +58,13 @@ class set_export extends set_abstract
         }
 
         if ($sstid != "") {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $Basket = $repository->findUserBasket($this->app, $sstid, $app['authentication']->getUser(), false);
             $this->exportName = str_replace(array(' ', '\\', '/'), '_', $Basket->getName()) . "_" . date("Y-n-d");
 
             foreach ($Basket->getElements() as $basket_element) {
-                /* @var $basket_element \Entities\BasketElement */
                 $base_id = $basket_element->getRecord($this->app)->get_base_id();
                 $record_id = $basket_element->getRecord($this->app)->get_record_id();
 
diff --git a/lib/classes/set/exportftp.php b/lib/classes/set/exportftp.php
index 170e8de46b..4b9e289503 100644
--- a/lib/classes/set/exportftp.php
+++ b/lib/classes/set/exportftp.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-use Entities\FtpExport;
-use Entities\FtpExportElement;
+use Alchemy\Phrasea\Model\Entities\FtpExport;
+use Alchemy\Phrasea\Model\Entities\FtpExportElement;
 
 class set_exportftp extends set_export
 {
diff --git a/lib/classes/set/selection.php b/lib/classes/set/selection.php
index 81edf5b9e9..d25e41eefc 100644
--- a/lib/classes/set/selection.php
+++ b/lib/classes/set/selection.php
@@ -10,7 +10,7 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 
 /**
  *
diff --git a/lib/classes/task/period/archive.php b/lib/classes/task/period/archive.php
index c6836096b4..226d88b94d 100644
--- a/lib/classes/task/period/archive.php
+++ b/lib/classes/task/period/archive.php
@@ -14,6 +14,7 @@ use Alchemy\Phrasea\Metadata\Tag as PhraseaTag;
 use Alchemy\Phrasea\Border\Attribute as BorderAttribute;
 use Alchemy\Phrasea\Border\MetadataBag;
 use Alchemy\Phrasea\Border\MetaFieldsBag;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use PHPExiftool\Driver\Metadata\MetadataBag as ExiftoolMetadataBag;
 use PHPExiftool\Driver\Metadata\Metadata;
 use Symfony\Component\Filesystem\Exception\IOException;
@@ -56,7 +57,7 @@ class task_period_archive extends task_abstract
 
     /**
      *
-     * @var \Entities\LazaretSession
+     * @var LazaretSession
      */
     protected $lazaretSession;
 
@@ -2051,7 +2052,7 @@ class task_period_archive extends task_abstract
     /**
      * Return a LazaretSession
      *
-     * @return \Entities\LazaretSession
+     * @return LazaretSession
      */
     protected function getLazaretSession()
     {
@@ -2059,7 +2060,7 @@ class task_period_archive extends task_abstract
             return $this->lazaretSession;
         }
 
-        $lazaretSession = new \Entities\LazaretSession();
+        $lazaretSession = new LazaretSession();
 
         $this->dependencyContainer['EM']->persist($lazaretSession);
         $this->dependencyContainer['EM']->flush();
diff --git a/lib/classes/task/period/ftp.php b/lib/classes/task/period/ftp.php
index 7ebd25c45d..903303ab97 100644
--- a/lib/classes/task/period/ftp.php
+++ b/lib/classes/task/period/ftp.php
@@ -12,8 +12,8 @@ use Alchemy\Phrasea\Core\Configuration\Configuration;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Notification\Mail\MailSuccessFTPSender;
 use Alchemy\Phrasea\Notification\Receiver;
-use Entities\FtpExport;
-use Entities\FtpExportElement;
+use Alchemy\Phrasea\Model\Entities\FtpExport;
+use Alchemy\Phrasea\Model\Entities\FtpExportElement;
 
 class task_period_ftp extends task_appboxAbstract
 {
@@ -258,14 +258,14 @@ class task_period_ftp extends task_appboxAbstract
     protected function retrieveContent(appbox $appbox)
     {
         foreach ($this->dependencyContainer['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findCrashedExports(new \DateTime('-1 month')) as $export) {
             $this->dependencyContainer['EM']->remove($export);
         }
         $this->dependencyContainer['EM']->flush();
 
         return $this->dependencyContainer['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findDoableExports();
     }
 
diff --git a/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php b/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
index 5431aeb40f..f9426ad976 100644
--- a/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
+++ b/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\Basket;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -30,7 +31,7 @@ class LoadFiveBaskets extends \PhraseaFixture\AbstractWZ implements FixtureInter
     public function load(ObjectManager $manager)
     {
         for ($i = 0; $i < 5; $i ++) {
-            $basket = new \Entities\Basket();
+            $basket = new Basket();
 
             $basket->setName('test ' . $i);
             $basket->setDescription('description');
diff --git a/lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php b/lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
index 7a03e7c047..b04d7b790c 100644
--- a/lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
+++ b/lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\Basket;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -22,14 +23,13 @@ use Doctrine\Common\Persistence\ObjectManager;
 class LoadOneBasket extends \PhraseaFixture\AbstractWZ implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\Basket
+     * @var Basket
      */
     public $basket;
 
     public function load(ObjectManager $manager)
     {
-        $basket = new \Entities\Basket();
+        $basket = new Basket();
 
         $basket->setName('test');
         $basket->setDescription('description');
diff --git a/lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php b/lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
index dfdb09895c..c0276751dc 100644
--- a/lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
+++ b/lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
@@ -11,6 +11,10 @@
 
 namespace PhraseaFixture\Basket;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\ValidationSession;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Doctrine\ORM\EntityManager;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
@@ -23,19 +27,16 @@ use Doctrine\Common\Persistence\ObjectManager;
 class LoadOneBasketEnv extends \PhraseaFixture\AbstractWZ implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\Basket
+     * @var Basket
      */
     public $basket;
 
     /**
-     *
      * @var Array
      */
     protected $participants = array();
 
     /**
-     *
      * @var Array
      */
     protected $basketElements = array();
@@ -52,7 +53,7 @@ class LoadOneBasketEnv extends \PhraseaFixture\AbstractWZ implements FixtureInte
 
     public function load(ObjectManager $manager)
     {
-        $basket = new \Entities\Basket();
+        $basket = new Basket();
 
         $basket->setName('test');
         $basket->setDescription('description');
@@ -65,7 +66,7 @@ class LoadOneBasketEnv extends \PhraseaFixture\AbstractWZ implements FixtureInte
 
         $this->addElementToBasket($manager, $basket);
 
-        $validationSession = new \Entities\ValidationSession();
+        $validationSession = new ValidationSession();
         $validationSession->setBasket($basket);
 
         $expires = new \DateTime();
@@ -84,14 +85,14 @@ class LoadOneBasketEnv extends \PhraseaFixture\AbstractWZ implements FixtureInte
         $this->basket = $basket;
     }
 
-    private function addParticipantsToSession(\Doctrine\ORM\EntityManager $manager, \Entities\ValidationSession $validationSession)
+    private function addParticipantsToSession(EntityManager $manager, ValidationSession $validationSession)
     {
         if (0 === count($this->participants)) {
             throw new \LogicException('Add new participants to validation session');
         }
 
         foreach ($this->participants as $participant) {
-            $validationParticipant = new \Entities\ValidationParticipant();
+            $validationParticipant = new ValidationParticipant();
 
             $validationParticipant->setUser($participant);
 
@@ -103,14 +104,14 @@ class LoadOneBasketEnv extends \PhraseaFixture\AbstractWZ implements FixtureInte
         $manager->flush();
     }
 
-    private function addElementToBasket(\Doctrine\ORM\EntityManager $manager, \Entities\Basket $basket)
+    private function addElementToBasket(EntityManager $manager, Basket $basket)
     {
         if (0 === count($this->basketElements)) {
             throw new \LogicException('Add new elements to basket');
         }
 
         foreach ($this->basketElements as $record) {
-            $basketElement = new \Entities\BasketElement();
+            $basketElement = new BasketElement();
 
             $basketElement->setRecord($record);
 
diff --git a/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php
index 61e9e8aec9..4db8fbf574 100644
--- a/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php
+++ b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php
@@ -11,16 +11,17 @@
 
 namespace PhraseaFixture\Feed;
 
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Entities\Feed;
 
 class LoadOneFeed extends AbstractFixture implements FixtureInterface
 {
     /**
      *
-     * @var \Entities\Feed
+     * @var Feed
      */
     public $feed;
     public $user;
@@ -35,7 +36,7 @@ class LoadOneFeed extends AbstractFixture implements FixtureInterface
 
         $feed = new Feed();
 
-        $publisher = new \Entities\FeedPublisher();
+        $publisher = new FeedPublisher();
         $publisher->setUsrId($this->user->get_id());
         $publisher->setIsOwner(true);
         $publisher->setFeed($feed);
diff --git a/lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php b/lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
index 4e36a97f99..a528d89d56 100644
--- a/lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
+++ b/lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
@@ -11,6 +11,8 @@
 
 namespace PhraseaFixture\Lazaret;
 
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -22,8 +24,7 @@ use Doctrine\Common\Persistence\ObjectManager;
 class LoadOneFile extends \PhraseaFixture\AbstractWZ implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\LazaretFile
+     * @var LazaretFile
      */
     public $file;
     public $collectionId;
@@ -34,12 +35,12 @@ class LoadOneFile extends \PhraseaFixture\AbstractWZ implements FixtureInterface
             throw new \LogicException('Fill a user to store a new basket');
         }
 
-        $lazaretSession = new \Entities\LazaretSession();
+        $lazaretSession = new LazaretSession();
         $lazaretSession->setUsrId($this->user->get_id());
         $lazaretSession->setUpdated(new \DateTime('now'));
         $lazaretSession->setCreated(new \DateTime('-1 day'));
 
-        $lazaretFile = new \Entities\LazaretFile();
+        $lazaretFile = new LazaretFile();
         $lazaretFile->setOriginalName('test');
         $lazaretFile->setFilename('test.jpg');
         $lazaretFile->setThumbFilename('thumb_test.jpg');
diff --git a/lib/conf.d/PhraseaFixture/Story/LoadOneStory.php b/lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
index 5c2e05d2be..e73acbcde3 100644
--- a/lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
+++ b/lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\Story;
 
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -23,13 +24,13 @@ class LoadOneStory extends \PhraseaFixture\AbstractWZ implements FixtureInterfac
 {
     /**
      *
-     * @var \Entities\StoryWZ
+     * @var StoryWZ
      */
     public $story;
 
     public function load(ObjectManager $manager)
     {
-        $story = new \Entities\StoryWZ();
+        $story = new StoryWZ();
 
         if (null === $this->record) {
             throw new \LogicException('Fill a record to store a new story');
diff --git a/lib/conf.d/PhraseaFixture/User/LoadOneUser.php b/lib/conf.d/PhraseaFixture/User/LoadOneUser.php
index 74f34c07cb..7121b4adaa 100644
--- a/lib/conf.d/PhraseaFixture/User/LoadOneUser.php
+++ b/lib/conf.d/PhraseaFixture/User/LoadOneUser.php
@@ -14,7 +14,7 @@ namespace PhraseaFixture\User;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\Persistence\ObjectManager;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 
 class LoadOneUser extends AbstractFixture implements FixtureInterface
 {
diff --git a/lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php b/lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
index ebb7992667..aa6085c85d 100644
--- a/lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
+++ b/lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\UsrLists;
 
+use Alchemy\Phrasea\Model\Entities\UsrList;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 
 /**
@@ -38,7 +39,7 @@ abstract class ListAbstract extends AbstractFixture
         return $this->list;
     }
 
-    public function setList(\Entities\UsrList $list)
+    public function setList(UsrList $list)
     {
         $this->list = $list;
     }
diff --git a/lib/conf.d/PhraseaFixture/UsrLists/UsrList.php b/lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
index c6475bb251..1b309f6944 100644
--- a/lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
+++ b/lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
@@ -11,6 +11,8 @@
 
 namespace PhraseaFixture\UsrLists;
 
+use Alchemy\Phrasea\Model\Entities\UsrList as UsrListEntity;
+use Alchemy\Phrasea\Model\Entities\UsrListOwner as UsrListOwnerEntity;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -23,20 +25,20 @@ class UsrList extends ListAbstract implements FixtureInterface
 {
     /**
      *
-     * @var \Entities\UsrList
+     * @var UsrList
      */
     public $list;
 
     public function load(ObjectManager $manager)
     {
-        $list = new \Entities\UsrList();
+        $list = new UsrListEntity();
 
         $owner = $this->getReference('one-listowner');
 
         $list->setName('new list');
         $list->addOwner($owner);
 
-        /* @var $owner \Entities\UsrListOwner */
+        /* @var $owner UsrListOwnerEntity */
         $owner->setList($list);
 
         $manager->persist($list);
diff --git a/lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php b/lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
index 181e1b7fbc..252851ddaa 100644
--- a/lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
+++ b/lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
@@ -17,6 +17,8 @@
 
 namespace PhraseaFixture\UsrLists;
 
+use Alchemy\Phrasea\Model\Entities\UsrList as UsrListEntity;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry as UsrListEntryEntity;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -28,14 +30,13 @@ use Doctrine\Common\Persistence\ObjectManager;
 class UsrListEntry extends ListAbstract implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\UsrListEntry
+     * @var UsrListEntry
      */
     public $entry;
 
     public function load(ObjectManager $manager)
     {
-        $entry = new \Entities\UsrListEntry();
+        $entry = new UsrListEntryEntity();
 
         if (null === $this->user) {
             throw new \LogicException('Fill a user to store a new basket');
@@ -46,7 +47,7 @@ class UsrListEntry extends ListAbstract implements FixtureInterface
         $entry->setUser($this->user);
         $entry->setList($list);
 
-        /* @var $list \Entities\UsrList */
+        /* @var $list UsrListEntity */
         $list->addEntrie($entry);
 
         $manager->persist($entry);
diff --git a/lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php b/lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
index 663f011c4e..a718c7b39f 100644
--- a/lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
+++ b/lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
@@ -11,6 +11,8 @@
 
 namespace PhraseaFixture\UsrLists;
 
+use Alchemy\Phrasea\Model\Entities\UsrListOwner as UsrListOwnerEntity;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -22,16 +24,15 @@ use Doctrine\Common\Persistence\ObjectManager;
 class UsrListOwner extends ListAbstract implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\StoryWZ
+     * @var StoryWZ
      */
     public $owner;
 
     public function load(ObjectManager $manager)
     {
-        $owner = new \Entities\UsrListOwner();
+        $owner = new UsrListOwnerEntity();
 
-        $owner->setRole(\Entities\UsrListOwner::ROLE_ADMIN);
+        $owner->setRole(UsrListOwnerEntity::ROLE_ADMIN);
 
         if (null === $this->user) {
             throw new \LogicException('Fill a user to store a new basket');
diff --git a/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php b/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
index 7eebe058f5..feaa4a1c84 100644
--- a/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
+++ b/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\ValidationParticipant;
 
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -23,13 +24,13 @@ class LoadOneParticipant extends \PhraseaFixture\AbstractWZ implements FixtureIn
 {
     /**
      *
-     * @var \Entities\ValidationParticipant
+     * @var ValidationParticipant
      */
     public $validationParticipant;
 
     public function load(ObjectManager $manager)
     {
-        $validationParticipant = new \Entities\ValidationParticipant();
+        $validationParticipant = new ValidationParticipant();
 
         if (null === $this->user) {
             throw new \LogicException('Fill a user to store a new validation Session');
diff --git a/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php b/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
index ddec7829a0..9ae0468fb6 100644
--- a/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
+++ b/lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
@@ -11,6 +11,8 @@
 
 namespace PhraseaFixture\ValidationParticipant;
 
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
+use Alchemy\Phrasea\Model\Entities\ValidationSession;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -22,20 +24,19 @@ use Doctrine\Common\Persistence\ObjectManager;
 class LoadParticipantWithSession extends \PhraseaFixture\AbstractWZ implements FixtureInterface
 {
     /**
-     *
-     * @var \Entities\ValidationParticipant
+     * @var Participant
      */
     public $validationParticipant;
 
     /**
      *
-     * @var \Entities\ValidationSession
+     * @var ValidationSession
      */
     private $session;
 
     public function load(ObjectManager $manager)
     {
-        $validationParticipant = new \Entities\ValidationParticipant();
+        $validationParticipant = new ValidationParticipant();
 
         if (null === $this->user) {
             throw new \LogicException('Fill a user to store a new validation Session');
@@ -53,7 +54,7 @@ class LoadParticipantWithSession extends \PhraseaFixture\AbstractWZ implements F
         $this->validationParticipant = $validationParticipant;
     }
 
-    public function setSession(\Entities\ValidationSession $session)
+    public function setSession(ValidationSession $session)
     {
         $this->session = $session;
     }
diff --git a/lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php b/lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
index 35f0ec1cad..f3c39ca89c 100644
--- a/lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
+++ b/lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
@@ -11,6 +11,7 @@
 
 namespace PhraseaFixture\ValidationSession;
 
+use Alchemy\Phrasea\Model\Entities\ValidationSession as ValidationSessionEntity;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
@@ -23,13 +24,13 @@ class LoadOneValidationSession extends \PhraseaFixture\AbstractWZ implements Fix
 {
     /**
      *
-     * @var \Entities\ValidationSession
+     * @var ValidationSessionEntity
      */
     public $validationSession;
 
     public function load(ObjectManager $manager)
     {
-        $validationSession = new \Entities\ValidationSession();
+        $validationSession = new ValidationSessionEntity();
 
         $validationSession->setBasket(
             $this->getReference('one-basket') // load the one-basket stored reference
diff --git a/plugins/account.less b/plugins/account.less
index e69de29bb2..7670144a87 100644
--- a/plugins/account.less
+++ b/plugins/account.less
@@ -0,0 +1 @@
+// This file is automatically generated, please do not edit it.
\ No newline at end of file
diff --git a/plugins/login.less b/plugins/login.less
index e69de29bb2..7670144a87 100644
--- a/plugins/login.less
+++ b/plugins/login.less
@@ -0,0 +1 @@
+// This file is automatically generated, please do not edit it.
\ No newline at end of file
diff --git a/templates/web/prod/actions/Feedback/List-Share.html.twig b/templates/web/prod/actions/Feedback/List-Share.html.twig
index 60b9fd82e2..4b9c26f18f 100644
--- a/templates/web/prod/actions/Feedback/List-Share.html.twig
+++ b/templates/web/prod/actions/Feedback/List-Share.html.twig
@@ -34,19 +34,19 @@
             </td>
             <td style="padding-right:10px;min-width:100px;">
               {% if app['authentication'].getUser().get_id() == owner.getUser(app).get_id() %}
-                {% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
+                {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
                   {% trans 'You are Admin' %}
                 {% endif %}
               {% else %}
               <label>{% trans 'Role' %}</label>
               <select name="role">
-                <option {% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_USER') %}selected {% endif %} value="{{ constant('\\Entities\\UsrListOwner::ROLE_USER') }}">
+                <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_USER') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_USER') }}">
                   {% trans 'Access' %}
                 </option>
-                <option {% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}selected {% endif %} value="{{ constant('\\Entities\\UsrListOwner::ROLE_EDITOR') }}">
+                <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') }}">
                   {% trans 'Editor' %}
                 </option>
-                <option {% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}selected {% endif %} value="{{ constant('\\Entities\\UsrListOwner::ROLE_ADMIN') }}">
+                <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') }}">
                   {% trans 'Admin' %}
                 </option>
               </select>
diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index 53896ac469..d8c78c94e1 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -179,7 +179,7 @@
 {% macro badgeReadonly(entry, role) %}
   <div class="badge">
     <input type="hidden" value="{{ entry.getUser(app).get_id() }}" name="id">
-    {% if role >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+    {% if role >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
       <a class="deleter" href="#">
         <img src="/skins/prod/Push/close_badge.png">
       </a>
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index 544bc6b483..6d3293b4dd 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -5,7 +5,7 @@
         <table style="height: 40px;">
             <tr>
                 <td style="white-space:nowrap;">
-                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                         <form class="form-inline" method="POST" name="SaveName" action="{{ path('prod_lists_list_update', { 'list_id' : list.getId() }) }}">
                             <label>{% trans 'List Name' %}</label>
                             <input type="text" name="name" style="margin: 0 5px;" value="{{ list.getName() }}"/>
@@ -16,14 +16,14 @@
                     {% endif %}
                 </td>
                 <td style="text-align:right;white-space:nowrap;">
-                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
+                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
                         <a href="{{ path('prod_lists_list_share', { 'list_id' : list.getId() }) }}" title="{% trans 'Share the list' %}" class="list_sharer">
                             <img src="/skins/prod/Push/list-icon.png" />
                             {% trans "Set sharing permission" %}
                         </a>
                     {% endif %}
                 </td>
-                {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
+                {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
                     <td style="text-align:right;white-space:nowrap;width:150px;">
                         <button class="deleter btn btn-inverse">
                             {% trans 'Delete' %}
@@ -40,7 +40,7 @@
                 <p>
                     {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
                     {% trans %}{{ length }} peoples{% endtrans %}
-                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                         <button class="EditToggle btn btn-inverse">{% trans 'Edit' %}</button>
                     {% endif %}
                 </p>
@@ -53,7 +53,7 @@
             </div>
         </div>
     </div>
-    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
         <div class="PNB content readwrite grey-bg" style="display:none;top:40px;">
             <form name="list-editor-search" method="POST" action="{{ path('prod_push_list_edit', { 'list_id' : list.getId() }) }}">
                 <div class="PNB10" style="height:160px;">
diff --git a/templates/web/prod/actions/Feedback/lists-all.html.twig b/templates/web/prod/actions/Feedback/lists-all.html.twig
index 0cfc0d617c..f80594e47f 100644
--- a/templates/web/prod/actions/Feedback/lists-all.html.twig
+++ b/templates/web/prod/actions/Feedback/lists-all.html.twig
@@ -14,7 +14,7 @@
             {% set length = '<span class="counter">' ~ list.getEntries().count() ~ '</span>' %}
             <li class="list" style="padding:2px;">
               <a href="{{ path('prod_push_list_edit', { 'list_id' : list.getId() }) }}" class="list_link">
-                {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                   <img src="/skins/prod/Push/list-icon.png" />
                 {% else %}
                   <img src="/skins/icons/SHARE16.png" />
diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig
index 52eb1f4ee1..535aa77a65 100644
--- a/templates/web/prod/actions/Push.html.twig
+++ b/templates/web/prod/actions/Push.html.twig
@@ -62,7 +62,7 @@
                         {% for list in lists %}
                             <li class="list" style="padding:2px;">
                                 <a class="list_loader" href="{{ path('prod_push_lists_list', { 'list_id' : list.getId() }) }}">
-                                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+                                    {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                                         <img src="/skins/prod/Push/list-icon.png" />
                                     {% else %}
                                         <img src="/skins/icons/SHARE16.png" />
diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
index 831ddcb0fd..d4a29e12a4 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
@@ -1979,7 +1979,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
 
     protected function getQuarantineItem()
     {
-        $lazaretSession = new \Entities\LazaretSession();
+        $lazaretSession = new \Alchemy\Phrasea\Model\Entities\LazaretSession();
         self::$DI['app']['EM']->persist($lazaretSession);
 
         $quarantineItem;
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
index 7b09915010..b8f3203d91 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
@@ -96,7 +96,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
 
         $em->expects($this->at(0))
             ->method('persist')
-            ->with($this->isInstanceOf('Entities\Session'))
+            ->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnCallback(function ($session) use ($sessionId) {
                 $ref = new \ReflectionObject($session);
                 $prop = $ref->getProperty('id');
@@ -109,7 +109,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
         $authenticator = new Authenticator($app, $browser, $session, $em);
         $phsession = $authenticator->openAccount($user);
 
-        $this->assertInstanceOf('Entities\Session', $phsession);
+        $this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\Session', $phsession);
         $this->assertEquals($sessionId, $session->get('session_id'));
     }
 
@@ -129,7 +129,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
         $usrId = $user->get_id();
         $sessionId = 4224242;
 
-        $session = new \Entities\Session();
+        $session = new \Alchemy\Phrasea\Model\Entities\Session();
         $session->setUsrId($usrId);
 
         $ref = new \ReflectionObject($session);
@@ -148,7 +148,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\Session'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnValue($repo));
 
         $authenticator = new Authenticator($app, $browser, $SFsession, $em);
@@ -171,7 +171,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
         $usrId = $user->get_id();
         $sessionId = 4224242;
 
-        $session = new \Entities\Session();
+        $session = new \Alchemy\Phrasea\Model\Entities\Session();
         $session->setUsrId($usrId);
 
         $ref = new \ReflectionObject($session);
@@ -190,7 +190,7 @@ class AuthenticatorTest extends \PhraseanetPHPUnitAbstract
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\Session'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnValue($repo));
 
         $authenticator = new Authenticator($app, $browser, $SFsession, $em);
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/ManagerTest.php
index 657447c1c8..257c2c0104 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/ManagerTest.php
@@ -18,7 +18,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $session = $this->getMock('Entities\Session');
+        $session = $this->getMock('Alchemy\Phrasea\Model\Entities\Session');
 
         $authenticator->expects($this->once())
             ->method('openAccount')
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
index d0a8f3ee22..e373c2f98c 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
@@ -3,7 +3,7 @@
 namespace Alchemy\Phrasea\Authentication\PersistentCookie;
 
 use Alchemy\Phrasea\Authentication\PersistentCookie\Manager;
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 
 class ManagerTest extends \PHPUnit_Framework_TestCase
 {
@@ -41,7 +41,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\Session'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnValue($repo));
 
         $encoder->expects($this->once())
@@ -86,7 +86,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\Session'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnValue($repo));
 
         $encoder->expects($this->once())
@@ -119,7 +119,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\Session'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
             ->will($this->returnValue($repo));
 
         $this->assertFalse($manager->getSession($tokenValue));
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
index ddb7d0f3ef..8f3d1fb195 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
@@ -3,7 +3,7 @@
 namespace Alchemy\Tests\Phrasea\Authentication\Phrasea;
 
 use Alchemy\Phrasea\Authentication\Phrasea\FailureManager;
-use Entities\AuthFailure;
+use Alchemy\Phrasea\Model\Entities\AuthFailure;
 use Gedmo\Timestampable\TimestampableListener;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -27,8 +27,8 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
             ->will($this->returnValue($ip));
 
         $oldFailures = array(
-            $this->getMock('Entities\AuthFailure'),
-            $this->getMock('Entities\AuthFailure')
+            $this->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure'),
+            $this->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure')
         );
 
         $repo->expects($this->once())
@@ -37,12 +37,12 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $em->expects($this->exactly(count($oldFailures)))
             ->method('remove')
-            ->with($this->isInstanceOf('Entities\AuthFailure'));
+            ->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\AuthFailure'));
 
         $catchFailure = null;
         $em->expects($this->once())
             ->method('persist')
-            ->with($this->isInstanceOf('Entities\AuthFailure'))
+            ->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\AuthFailure'))
             ->will($this->returnCallback(function ($failure) use (&$catchFailure) {
                 $catchFailure = $failure;
             }));
@@ -91,7 +91,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            return $phpunit->getMock('Entities\AuthFailure');
+            return $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
         }, 8);
 
         $repo->expects($this->once())
@@ -116,7 +116,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            return $phpunit->getMock('Entities\AuthFailure');
+            return $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
         }, 10);
 
         $repo->expects($this->once())
@@ -141,7 +141,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            $failure = $phpunit->getMock('Entities\AuthFailure');
+            $failure = $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
             $failure->expects($phpunit->once())
                 ->method('setLocked')
                 ->with($phpunit->equalTo(false));
@@ -172,7 +172,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            return $phpunit->getMock('Entities\AuthFailure');
+            return $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
         }, 10);
 
         $repo->expects($this->once())
@@ -194,7 +194,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            return $phpunit->getMock('Entities\AuthFailure');
+            return $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
         }, 2);
 
         $repo->expects($this->once())
@@ -232,7 +232,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $phpunit = $this;
         $oldFailures = $this->ArrayIze(function () use ($phpunit) {
-            return $phpunit->getMock('Entities\AuthFailure');
+            return $phpunit->getMock('Alchemy\Phrasea\Model\Entities\AuthFailure');
         }, 3);
 
         $repo->expects($this->once())
@@ -275,17 +275,17 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         self::$DI['app']['EM']->flush();
 
-        $this->assertCount(10, self::$DI['app']['EM']->getRepository('Entities\AuthFailure')
+        $this->assertCount(10, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
                 ->findOldFailures());
-        $this->assertCount(12, self::$DI['app']['EM']->getRepository('Entities\AuthFailure')
+        $this->assertCount(12, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
                 ->findAll());
 
         $manager = new FailureManager(self::$DI['app']['EM'], $recaptcha, 9);
         $manager->saveFailure($username, $request);
 
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Entities\AuthFailure')
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
                 ->findOldFailures());
-        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Entities\AuthFailure')
+        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
                 ->findAll());
 
         self::$DI['app']['EM']->getEventManager()->addEventSubscriber(new TimestampableListener());
@@ -310,7 +310,7 @@ class FailureManagerTest extends \PhraseanetPHPUnitAbstract
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Entities\AuthFailure'))
+            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\AuthFailure'))
             ->will($this->returnValue($repo));
 
         return $em;
diff --git a/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
index 68f3a0f34d..4bcef887dc 100644
--- a/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
@@ -38,7 +38,7 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
      */
     public function testCheck()
     {
-        $session = new \Entities\LazaretSession();
+        $session = new \Alchemy\Phrasea\Model\Entities\LazaretSession();
         self::$DI['app']['EM']->persist($session);
 
         self::$DI['app']['border-manager']->process($session, File::buildFromPathfile($this->media->getFile()->getPathname(), self::$DI['collection'], self::$DI['app']), null, Manager::FORCE_RECORD);
diff --git a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
index 28f9e7666b..583381e0ea 100644
--- a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
@@ -54,7 +54,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         parent::setUp();
         $this->object = new Manager(self::$DI['app']);
-        $this->session = new \Entities\LazaretSession();
+        $this->session = new \Alchemy\Phrasea\Model\Entities\LazaretSession();
 
         self::$DI['app']['EM']->persist($this->session);
     }
@@ -88,7 +88,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $phpunit = $this;
 
         $postProcess = function($element, $visa, $code) use ($phpunit, &$records) {
-                $phpunit->assertInstanceOf('\\Entities\\LazaretFile', $element);
+                $phpunit->assertInstanceOf('\\Alchemy\Phrasea\Model\Entities\\LazaretFile', $element);
                 $phpunit->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Visa', $visa);
                 $phpunit->assertEquals(Manager::LAZARET_CREATED, $code);
                 $records[] = $element;
@@ -310,7 +310,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $foundMeta = $foundField = array();
 
-        /* @var $lazaret \Entities\LazaretFile */
+        /* @var $lazaret \Alchemy\Phrasea\Model\Entities\LazaretFile */
         foreach ($lazaret->getAttributes() as $attr) {
             $attribute = Factory::getFileAttribute(self::$DI['app'], $attr->getName(), $attr->getValue());
 
@@ -385,9 +385,9 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $application = self::$DI['app'];
 
         $postProcess = function($element, $visa, $code) use ($phpunit, $application) {
-                $phpunit->assertInstanceOf('\\Entities\\LazaretFile', $element);
+                $phpunit->assertInstanceOf('\\Alchemy\Phrasea\Model\Entities\\LazaretFile', $element);
 
-                /* @var $element \Entities\LazaretFile */
+                /* @var $element \Alchemy\Phrasea\Model\Entities\LazaretFile */
                 foreach ($element->getAttributes() as $attribute) {
                     $phpunit->assertEquals('metadata', $attribute->getName());
                     $value = Factory::getFileAttribute($application, $attribute->getName(), $attribute->getValue());
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
index 624966da44..aa45c835ad 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
@@ -13,7 +13,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
         $crawler = self::$DI['client']->request('GET', '/admin/publications/list/');
         $pageContent = self::$DI['client']->getResponse()->getContent();
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
 
         foreach ($feeds as $feed) {
             $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->getId() . '/', $pageContent);
@@ -28,14 +28,14 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
 
     public function testCreate()
     {
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
         $count = sizeof($feeds);
 
         $crawler = self::$DI['client']->request('POST', '/admin/publications/create/', array("title"    => "hello", "subtitle" => "coucou", "base_id"  => self::$DI['collection']->get_base_id()));
 
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect('/admin/publications/list/'));
 
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
         $count_after = sizeof($feeds);
         $this->assertGreaterThan($count, $count_after);
     }
@@ -60,7 +60,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
             , 'public'   => '1'
         ));
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
 
         $this->assertTrue(
             strpos(
@@ -91,7 +91,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
                 , '/admin/publications/list/'
             ) === 0);
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
 
         $collection = $feed->getCollection(self::$DI['app']);
 
@@ -193,7 +193,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
         $publishers = $feed->getPublishers();
 
         $this->assertTrue($feed->isPublisher(self::$DI['user_alt1']));
@@ -210,7 +210,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/");
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
         $this->assertTrue(
@@ -231,7 +231,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
         $publishers = $feed->getPublishers();
 
         $this->assertFalse(isset($publishers[self::$DI['user_alt1']->get_id()]));
@@ -251,7 +251,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
 
         $this->assertTrue(
             strpos(
@@ -269,7 +269,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
         if (null !== $feed) {
             $this->fail("fail deleting feed");
         }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
index 60863392e6..7a6d3271a1 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
@@ -31,10 +31,10 @@ class BasketsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testCreateBasket()
     {
-       $nbBasketsBefore = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b')->getSingleScalarResult();
+       $nbBasketsBefore = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b')->getSingleScalarResult();
        self::$DI['client']->request("POST", "/client/baskets/new/", array('p0' => 'hello'));
        $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-       $nbBasketsAfter = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b')->getSingleScalarResult();
+       $nbBasketsAfter = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b')->getSingleScalarResult();
        $this->assertGreaterThan($nbBasketsBefore,$nbBasketsAfter);
     }
 
@@ -50,7 +50,7 @@ class BasketsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             'p0'         => self::$DI['record_1']->get_record_id()
         ));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
         $this->assertGreaterThan(0, $basket->getElements()->count());
     }
 
@@ -65,7 +65,7 @@ class BasketsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         ));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         try {
-            $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+            $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
             $this->fail('Basket is not deleted');
         } catch (\exception $e) {
 
@@ -81,7 +81,7 @@ class BasketsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $record = self::$DI['record_1'];
 
-        $basketElement = new \Entities\BasketElement();
+        $basketElement = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basketElement->setBasket($basket);
         $basketElement->setRecord($record);
         $basketElement->setLastInBasket();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
index 6e982f8a1b..78cedc5fa2 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -44,7 +44,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $count = $query->getSingleScalarResult();
 
@@ -52,12 +52,12 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertEquals(302, $response->getStatusCode());
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT b FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT b FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $result = $query->getResult();
 
         $basket = array_shift($result);
-        /* @var $basket \Entities\Basket */
+        /* @var $basket \Alchemy\Phrasea\Model\Entities\Basket */
         $this->assertEquals(2, $basket->getElements()->count());
     }
 
@@ -80,7 +80,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $count = $query->getSingleScalarResult();
 
@@ -128,7 +128,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $record = self::$DI['record_1'];
 
-        $basket_element = new \Entities\BasketElement();
+        $basket_element = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basket_element->setBasket($basket);
         $basket_element->setRecord($record);
         $basket_element->setLastInBasket();
@@ -159,7 +159,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $record = self::$DI['record_1'];
 
-        $basket_element = new \Entities\BasketElement();
+        $basket_element = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basket_element->setBasket($basket);
         $basket_element->setRecord($record);
         $basket_element->setLastInBasket();
@@ -197,7 +197,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $count = $query->getSingleScalarResult();
 
@@ -221,7 +221,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $count = $query->getSingleScalarResult();
 
@@ -244,7 +244,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertEquals('new_name', $basket->getName());
         $this->assertEquals('new_desc', $basket->getDescription());
@@ -268,7 +268,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertEquals('new_name', $basket->getName());
         $this->assertEquals('new_desc', $basket->getDescription());
@@ -334,7 +334,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertTrue($basket->getArchived());
 
@@ -364,7 +364,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertTrue($basket->getArchived());
 
@@ -407,19 +407,19 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertEquals(302, $response->getStatusCode());
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertEquals(2, $basket->getElements()->count());
     }
 
     public function testAddElementToValidationPost()
     {
-        $datas = self::$DI['app']['EM']->getRepository('Entities\ValidationData')->findAll();
+        $datas = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll();
         $countDatas = count($datas);
 
         $basket = $this->insertOneBasket();
 
-        $validationSession = new \Entities\ValidationSession();
+        $validationSession = new \Alchemy\Phrasea\Model\Entities\ValidationSession();
 
         $expires = new \DateTime();
         $expires->modify('+1 week');
@@ -433,7 +433,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $validationSession->setBasket($basket);
 
-        $validationParticipant = new \Entities\ValidationParticipant();
+        $validationParticipant = new \Alchemy\Phrasea\Model\Entities\ValidationParticipant();
         $validationParticipant->setSession($validationSession);
         $validationParticipant->setUser(self::$DI['user_alt1']);
 
@@ -462,11 +462,11 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertEquals(302, $response->getStatusCode());
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertEquals(2, $basket->getElements()->count());
 
-        $datas = self::$DI['app']['EM']->getRepository('Entities\ValidationData')->findAll();
+        $datas = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll();
 
         $this->assertTrue($countDatas < count($datas), 'assert that ' . count($datas) . ' > ' . $countDatas);
     }
@@ -494,7 +494,7 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $response = self::$DI['client']->getResponse();
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
 
         $this->assertEquals(200, $response->getStatusCode());
 
@@ -521,12 +521,12 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($response->isRedirect());
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($Basket_1->getId());
-        $this->assertInstanceOf('\Entities\Basket', $basket);
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($Basket_1->getId());
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\Basket', $basket);
         $this->assertEquals(0, $basket->getElements()->count());
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($Basket_2->getId());
-        $this->assertInstanceOf('\Entities\Basket', $basket);
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($Basket_2->getId());
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\Basket', $basket);
         $this->assertEquals(1, $basket->getElements()->count());
     }
 
@@ -559,12 +559,12 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertArrayHasKey('success', $datas);
         $this->assertTrue($datas['success']);
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($Basket_1->getId());
-        $this->assertInstanceOf('\Entities\Basket', $basket);
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($Basket_1->getId());
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\Basket', $basket);
         $this->assertEquals(0, $basket->getElements()->count());
 
-        $basket = self::$DI['app']['EM']->getRepository('Entities\Basket')->find($Basket_2->getId());
-        $this->assertInstanceOf('\Entities\Basket', $basket);
+        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($Basket_2->getId());
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\Basket', $basket);
         $this->assertEquals(1, $basket->getElements()->count());
     }
 
@@ -578,32 +578,32 @@ class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $basket = $this->insertOneBasketEnv();
 
-        $basket = self::$DI['app']['EM']->find("Entities\Basket", $basket->getId());
+        $basket = self::$DI['app']['EM']->find("Alchemy\Phrasea\Model\Entities\Basket", $basket->getId());
 
         self::$DI['app']['EM']->remove($basket);
         self::$DI['app']['EM']->flush();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Entities\ValidationParticipant v');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Alchemy\Phrasea\Model\Entities\ValidationParticipant v');
 
         $count = $query->getSingleScalarResult();
 
         $this->assertEquals(0, $count);
 
         $query = self::$DI['app']['EM']->createQuery(
-            'SELECT COUNT(b.id) FROM \Entities\BasketElement b'
+            'SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\BasketElement b'
         );
 
         $count = $query->getSingleScalarResult();
 
         $this->assertEquals(0, $count);
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Entities\ValidationSession v');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Alchemy\Phrasea\Model\Entities\ValidationSession v');
 
         $count = $query->getSingleScalarResult();
 
         $this->assertEquals(0, $count);
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
 
         $count = $query->getSingleScalarResult();
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
index 2dba86f37f..e1e6979651 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
@@ -3,7 +3,7 @@
 namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Application;
-use Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
 use Symfony\Component\CssSelector\CssSelector;
 
 class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
@@ -25,7 +25,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $crawler = self::$DI['client']->request('POST', '/prod/feeds/requestavailable/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
         foreach ($feeds as $one_feed) {
             if ($one_feed->isPublisher(self::$DI['user'])) {
                 $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->getId() . "' and @name='feed_proposal[]']")->count());
@@ -174,7 +174,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertTrue(is_string($pageContent->datas));
         $this->assertRegExp("/entry_" . $entry->getId() . "/", $pageContent->datas);
 
-        $retrievedentry = self::$DI['app']['EM']->getRepository('Entities\FeedEntry')->find($entry->getId());
+        $retrievedentry = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry->getId());
         $this->assertEquals($newfeed->getId(), $retrievedentry->getFeed()->getId());
     }
 
@@ -309,8 +309,8 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params);
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
-        $newItem1 = self::$DI['app']['EM']->getRepository('Entities\FeedItem')->find($item1->getId());
-        $newItem2 = self::$DI['app']['EM']->getRepository('Entities\FeedItem')->find($item2->getId());
+        $newItem1 = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item1->getId());
+        $newItem2 = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item2->getId());
 
         $this->assertEquals($ord1, (int) $newItem2->getOrd());
         $this->assertEquals($ord2, (int) $newItem1->getOrd());
@@ -332,7 +332,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertTrue(is_string($pageContent->message));
 
         try {
-            self::$DI["app"]['EM']->getRepository('Entities\FeedEntry')->find($entry->getId());
+            self::$DI["app"]['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry->getId());
             $this->fail("Failed to delete entry");
         } catch (\Exception $e) {
 
@@ -376,7 +376,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
 
         foreach ($feeds as $one_feed) {
 
@@ -396,7 +396,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $feed = $this->insertOneFeed(self::$DI['user']);
 
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
 
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $feed->getId() . "/");
         $pageContent = self::$DI['client']->getResponse()->getContent();
@@ -462,7 +462,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             ->will($this->returnValue('http://user-link/'));
         self::$DI['app']['feed.user-link-generator']->expects($this->once())
             ->method('generate')
-            ->with($this->isInstanceOf('\Entities\Feed'), $this->isInstanceOf('\User_Adapter'), 'rss', null, false)
+            ->with($this->isInstanceOf('\Alchemy\Phrasea\Model\Entities\Feed'), $this->isInstanceOf('\User_Adapter'), 'rss', null, false)
             ->will($this->returnValue($link));
 
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/' . $feed->getId() . '/');
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
index 28047ed2c1..11d5a21710 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
@@ -29,7 +29,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $originalEm = self::$DI['app']['EM'];
 
-        $fileLazaret = $this->getMock('Entities\LazaretFile', array('getRecordsToSubstitute', 'getSession', 'getCollection'), array(), '', false);
+        $fileLazaret = $this->getMock('Alchemy\Phrasea\Model\Entities\LazaretFile', array('getRecordsToSubstitute', 'getSession', 'getCollection'), array(), '', false);
 
         $fileLazaret
             ->expects($this->any())
@@ -39,7 +39,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $fileLazaret
             ->expects($this->any())
             ->method('getSession')
-            ->will($this->returnValue($this->getMock('Entities\LazaretSession')));
+            ->will($this->returnValue($this->getMock('Alchemy\Phrasea\Model\Entities\LazaretSession')));
 
         $fileLazaret
             ->expects($this->any())
@@ -58,7 +58,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->EqualTo('Entities\LazaretFile'))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'))
             ->will($this->returnValue($repo));
 
         $route = '/prod/lazaret/';
@@ -95,7 +95,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -139,7 +139,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue(null));
 
         self::$DI['app']['EM'] = $em;
@@ -177,7 +177,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $lazaretThumbFileName);
 
         //mock lazaret Attribute
-        $lazaretAttribute = $this->getMock('Entities\LazaretAttribute', array(), array(), '', false);
+        $lazaretAttribute = $this->getMock('Alchemy\Phrasea\Model\Entities\LazaretAttribute', array(), array(), '', false);
 
         //Expect to be called 3 times since we add 5 attribute to lazaretFile
         //and each one is called to verify if it is an attribute to keep
@@ -209,7 +209,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         //In any case we expect the deletion of the lazaret file
@@ -260,7 +260,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -322,7 +322,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertResponseOk($response);
         $this->assertGoodJsonContent(json_decode($response->getContent()));
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(l.id) FROM \Entities\LazaretFile l');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(l.id) FROM \Alchemy\Phrasea\Model\Entities\LazaretFile l');
 
         $count = $query->getSingleScalarResult();
 
@@ -347,7 +347,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertGoodJsonContent(json_decode($response->getContent()));
 
         $query = self::$DI['app']['EM']->createQuery(
-            'SELECT COUNT(l.id) FROM \Entities\LazaretFile l'
+            'SELECT COUNT(l.id) FROM \Alchemy\Phrasea\Model\Entities\LazaretFile l'
         );
 
         $count = $query->getSingleScalarResult();
@@ -404,7 +404,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             ->method('get_databox')
             ->will($this->returnValue($databox));
 
-        $lazaretFile = $this->getMock('Entities\LazaretFile', array(), array(), '', false);
+        $lazaretFile = $this->getMock('Alchemy\Phrasea\Model\Entities\LazaretFile', array(), array(), '', false);
 
         //expect to fetch possible records to subtitute
         $lazaretFile->expects($this->once())
@@ -430,7 +430,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         //In any case we expect the deletion of the lazaret file
@@ -482,7 +482,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //mock Doctrine\ORM\EntityManager
         $em = $this->getMock('Doctrine\ORM\EntityManager', array(), array(), '', false);
 
-        $lazaretFile = $this->getMockBuilder('Entities\LazaretFile')
+        $lazaretFile = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\LazaretFile')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -497,7 +497,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         $id = 1;
@@ -552,7 +552,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -582,7 +582,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //mock Doctrine\ORM\EntityManager
         $em = $this->getMock('Doctrine\ORM\EntityManager', array(), array(), '', false);
 
-        $lazaretFile = $this->getMock('Entities\LazaretFile', array(), array(), '', false);
+        $lazaretFile = $this->getMock('Alchemy\Phrasea\Model\Entities\LazaretFile', array(), array(), '', false);
 
         copy(__DIR__ . '/../../../../../files/cestlafete.jpg', __DIR__ . '/../../../../../../tmp/lazaret/cestlafete.jpg');
 
@@ -599,7 +599,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -635,13 +635,13 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     private function getOneLazaretFile()
     {
         //The lazaret session
-        $lazaretSession = new \Entities\LazaretSession();
+        $lazaretSession = new \Alchemy\Phrasea\Model\Entities\LazaretSession();
         $lazaretSession->setUsrId(self::$DI['user']->get_id());
         $lazaretSession->setUpdated(new \DateTime('now'));
         $lazaretSession->setCreated(new \DateTime('-1 day'));
 
         //The lazaret file
-        $lazaretFile = new \Entities\LazaretFile();
+        $lazaretFile = new \Alchemy\Phrasea\Model\Entities\LazaretFile();
         $lazaretFile->setOriginalName('test');
         $lazaretFile->setFilename('test001.jpg');
         $lazaretFile->setThumbFilename('test001.jpg');
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
index 94fdaa1893..a1f0dacbd2 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
@@ -2,8 +2,8 @@
 
 namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
-use Entities\Order;
-use Entities\OrderElement;
+use Alchemy\Phrasea\Model\Entities\Order;
+use Alchemy\Phrasea\Model\Entities\OrderElement;
 
 class OrderTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -197,7 +197,7 @@ class OrderTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         }
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/send/', array('elements' => $parameters));
 
-        $testOrder = self::$DI['app']['EM']->getRepository('Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
         $this->assertEquals(0, $testOrder->getTodo());
     }
 
@@ -218,13 +218,13 @@ class OrderTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $parameters = array($order->getElements()->first()->getId());
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/send/', array('elements' => $parameters));
-        $testOrder = self::$DI['app']['EM']->getRepository('Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
         $this->assertEquals(1, $testOrder->getTodo());
 
         $parameters = array($orderElement->getId());
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/deny/', array('elements' => $parameters));
 
-        $testOrder = self::$DI['app']['EM']->getRepository('Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
         $this->assertEquals(0, $testOrder->getTodo());
     }
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
index 7160907a52..3c942010bf 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
@@ -148,7 +148,7 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $basket = $this->insertOneBasket();
         $record = self::$DI['record_1'];
 
-        $basketElement = new \Entities\BasketElement();
+        $basketElement = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basketElement->setBasket($basket);
         $basketElement->setRecord($record);
         $basketElement->setLastInBasket();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
index f88dc50f59..9eeab9b5c3 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
@@ -28,7 +28,7 @@ class ControllerStoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertEquals(302, $response->getStatusCode());
 
         $query = self::$DI['app']['EM']->createQuery(
-            'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+            'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
index a186d312ff..6b9030d483 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
@@ -166,7 +166,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $this->assertNull($repository->find($list_id));
     }
@@ -194,7 +194,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrListEntry');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListEntry');
 
         $this->assertNull($repository->find($entry_id));
     }
@@ -221,7 +221,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -254,7 +254,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $route = '/prod/lists/list/' . $list->getId() . '/share/' . self::$DI['user_alt1']->get_id() . '/';
 
-        self::$DI['client']->request('POST', $route, array('role' => \Entities\UsrListOwner::ROLE_ADMIN));
+        self::$DI['client']->request('POST', $route, array('role' => \Alchemy\Phrasea\Model\Entities\UsrListOwner::ROLE_ADMIN));
 
         $response = self::$DI['client']->getResponse();
 
@@ -268,7 +268,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -284,7 +284,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $route = '/prod/lists/list/' . $list->getId() . '/share/' . self::$DI['user_alt1']->get_id() . '/';
 
-        self::$DI['client']->request('POST', $route, array('role' => \Entities\UsrListOwner::ROLE_ADMIN));
+        self::$DI['client']->request('POST', $route, array('role' => \Alchemy\Phrasea\Model\Entities\UsrListOwner::ROLE_ADMIN));
 
         $response = self::$DI['client']->getResponse();
 
@@ -298,7 +298,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -317,7 +317,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -335,7 +335,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $route = '/prod/lists/list/' . $list->getId() . '/share/' . self::$DI['user_alt1']->get_id() . '/';
 
-        self::$DI['client']->request('POST', $route, array('role' => \Entities\UsrListOwner::ROLE_ADMIN));
+        self::$DI['client']->request('POST', $route, array('role' => \Alchemy\Phrasea\Model\Entities\UsrListOwner::ROLE_ADMIN));
 
         $response = self::$DI['client']->getResponse();
 
@@ -351,7 +351,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $route = '/prod/lists/list/' . $list->getId() . '/share/' . self::$DI['user']->get_id() . '/';
 
-        self::$DI['client']->request('POST', $route, array('role' => \Entities\UsrListOwner::ROLE_USER));
+        self::$DI['client']->request('POST', $route, array('role' => \Alchemy\Phrasea\Model\Entities\UsrListOwner::ROLE_USER));
 
         $response = self::$DI['client']->getResponse();
 
@@ -367,7 +367,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $route = '/prod/lists/list/' . $list->getId() . '/share/' . self::$DI['user_alt1']->get_id() . '/';
 
-        self::$DI['client']->request('POST', $route, array('role' => \Entities\UsrListOwner::ROLE_USER));
+        self::$DI['client']->request('POST', $route, array('role' => \Alchemy\Phrasea\Model\Entities\UsrListOwner::ROLE_USER));
 
         $response = self::$DI['client']->getResponse();
 
@@ -381,7 +381,7 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->find($list->getId());
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
index 2b1e649824..ea0a334ed4 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
@@ -43,7 +43,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
         $query = $em->createQuery(
-                'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -67,7 +67,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
         $query = $em->createQuery(
-                'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -75,7 +75,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertEquals(2, $count);
 
         $query = $em->createQuery(
-                'SELECT w FROM \Entities\StoryWZ w'
+                'SELECT w FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $storyWZ = $query->getResult();
@@ -89,7 +89,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $story = self::$DI['record_story_1'];
         $route = sprintf("/prod/WorkZone/attachStories/");
 
-        $StoryWZ = new \Entities\StoryWZ();
+        $StoryWZ = new \Alchemy\Phrasea\Model\Entities\StoryWZ();
         $StoryWZ->setUser(self::$DI['app']['authentication']->getUser());
         $StoryWZ->setRecord($story);
 
@@ -104,7 +104,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
         $query = $em->createQuery(
-                'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -152,7 +152,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         self::$DI['client']->request('POST', $attachRoute, array('stories' => array($story->get_serialize_key())));
 
         $query = self::$DI['app']['EM']->createQuery(
-                'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -165,7 +165,7 @@ class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertEquals(302, $response->getStatusCode());
 
         $query = self::$DI['app']['EM']->createQuery(
-                'SELECT COUNT(w.id) FROM \Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
index 0511743470..5b62fb21fe 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
@@ -199,7 +199,7 @@ class RecordsRequestTest extends \PhraseanetPHPUnitAuthenticatedAbstract
             self::$DI['record_no_access_by_status'],
         );
 
-        $basket = new \Entities\Basket();
+        $basket = new \Alchemy\Phrasea\Model\Entities\Basket();
         $basket->setName('test');
         $basket->setOwner(self::$DI['app']['authentication']->getUser());
 
@@ -207,7 +207,7 @@ class RecordsRequestTest extends \PhraseanetPHPUnitAuthenticatedAbstract
         self::$DI['app']['EM']->flush();
 
         foreach ($elements as $element) {
-            $basket_element = new \Entities\BasketElement();
+            $basket_element = new \Alchemy\Phrasea\Model\Entities\BasketElement();
             $basket_element->setRecord($element);
             $basket_element->setBasket($basket);
             $basket->addElement($basket_element);
@@ -282,7 +282,7 @@ class RecordsRequestTest extends \PhraseanetPHPUnitAuthenticatedAbstract
 
     protected function getStoryWZ()
     {
-        $story = new \Entities\StoryWZ();
+        $story = new \Alchemy\Phrasea\Model\Entities\StoryWZ();
         $story->setRecord(self::$DI['record_story_2']);
         $story->setUser(self::$DI['app']['authentication']->getUser());
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
index 4d66aecdfc..dd575efb43 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
@@ -791,7 +791,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $provider = $this->getMock('Alchemy\Phrasea\Authentication\Provider\ProviderInterface');
         $this->addProvider('provider-test', $provider);
 
-        $entity = $this->getMock('Entities\UsrAuthProvider');
+        $entity = $this->getMock('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
         $entity->expects($this->any())
             ->method('getUser')
             ->with(self::$DI['app'])
@@ -963,7 +963,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $user = new \User_Adapter((int) $userId, self::$DI['app']);
 
-        $ret = self::$DI['app']['EM']->getRepository('\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->findBy(array('usr_id' => $userId, 'provider' => 'provider-test'));
         $this->assertCount(1, $ret);
 
@@ -1411,7 +1411,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $provider->expects($this->once())
             ->method('onCallback');
 
-        $entity = $this->getMock('Entities\UsrAuthProvider');
+        $entity = $this->getMock('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
         $entity->expects($this->any())
             ->method('getUser')
             ->with(self::$DI['app'])
@@ -1463,7 +1463,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertSame(302, self::$DI['client']->getResponse()->getStatusCode());
 
-        $ret = self::$DI['app']['EM']->getRepository('\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->findBy(array('usr_id' => self::$DI['user']->get_id(), 'provider' => 'provider-test'));
 
         $this->assertCount(1, $ret);
@@ -1538,7 +1538,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertSame(302, self::$DI['client']->getResponse()->getStatusCode());
 
-        $ret = self::$DI['app']['EM']->getRepository('\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->findBy(array('usr_id' => $createdUser->get_id(), 'provider' => 'provider-test'));
 
         $this->assertCount(1, $ret);
@@ -1703,7 +1703,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         self::$DI['app']['EM']->expects($this->at(0))
             ->method('getRepository')
-            ->with('Entities\UsrAuthProvider')
+            ->with('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->will($this->returnValue($repo));
 
         if ($participants) {
@@ -1717,7 +1717,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
             self::$DI['app']['EM']->expects($this->at(1))
                 ->method('getRepository')
-                ->with('Entities\ValidationParticipant')
+                ->with('Alchemy\Phrasea\Model\Entities\ValidationParticipant')
                 ->will($this->returnValue($repo));
         }
     }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
index 2c8a736492..4d7828dfd8 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
@@ -5,9 +5,9 @@ namespace Alchemy\Tests\Phrasea\Controller\Root;
 require_once __DIR__ . '/../../../../../classes/FeedValidator.inc';
 
 use Alchemy\Phrasea\Application;
-use Entities\Feed;
-use Entities\FeedEntry;
-use Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
 use Symfony\Component\HttpFoundation\Response;
 
 class RssFeedTest extends \PhraseanetWebTestCaseAbstract
@@ -173,7 +173,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract
         $this->insertOneFeed(self::$DI['user'], "test1", true);
         $this->insertOneFeed(self::$DI['user'], "test2", true);
 
-        $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
+        $all_feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
 
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->isPublic());
@@ -190,7 +190,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract
         $this->insertOneFeed(self::$DI['user'], "test1", true);
         $this->insertOneFeed(self::$DI['user'], "test2", true);
 
-        $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
+        $all_feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
 
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->isPublic());
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RootTest.php
index 6dc68ea199..b544b03db5 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RootTest.php
@@ -118,7 +118,7 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $app['browser'] = $browser;
 
-        $session = new \Entities\Session();
+        $session = new \Alchemy\Phrasea\Model\Entities\Session();
         $session->setUser(self::$DI['user'])
             ->setBrowserName($browser->getBrowser())
             ->setBrowserVersion($browser->getVersion())
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
index 93afb4d969..770f42da3a 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
@@ -89,7 +89,7 @@ class SessionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $originalEm = self::$DI['app']['EM'];
 
-        $session = $this->getMock('Entities\Session');
+        $session = $this->getMock('Alchemy\Phrasea\Model\Entities\Session');
 
         $session->expects($this->once())
             ->method('getUsrId')
@@ -123,7 +123,7 @@ class SessionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $originalEm = self::$DI['app']['EM'];
 
-        $session = $this->getMock('Entities\Session');
+        $session = $this->getMock('Alchemy\Phrasea\Model\Entities\Session');
 
         $session->expects($this->once())
             ->method('getUsrId')
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
index 61687d8aa9..74e43541bd 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Feed;
 
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator;
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
 class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
@@ -66,10 +66,10 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
                 $this->assertNotEquals($tokenValue, $capture['token']);
 
                 $this->assertCount(0, self::$DI['app']['EM']
-                    ->getRepository('Entities\AggregateToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
                     ->findBy(array('value' => $tokenValue)));
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Entities\AggregateToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
                     ->findBy(array('value' => $capture['token'])));
             } else {
                 $expectedParams = array(
@@ -84,7 +84,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
                 $this->assertEquals($expectedParams, $capture);
 
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Entities\AggregateToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
                     ->findBy(array('value' => $tokenValue)));
             }
         } else {
@@ -95,11 +95,11 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
             $this->assertEquals(12, strlen($capture['token']));
 
             $this->assertCount(1, self::$DI['app']['EM']
-                ->getRepository('Entities\AggregateToken')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
                 ->findBy(array('value' => $capture['token'])));
         }
         $token = self::$DI['app']['EM']
-            ->getRepository('Entities\AggregateToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
             ->findOneBy(array('usrId' => $user->get_id()));
         self::$DI['app']['EM']->remove($token);
         self::$DI['app']['EM']->flush();
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
index 8a5994d022..a4f2891176 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
@@ -59,10 +59,10 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
                 }
 
                 $this->assertCount(0, self::$DI['app']['EM']
-                    ->getRepository('Entities\FeedToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
                     ->findBy(array('value' => $tokenValue)));
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Entities\FeedToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
                     ->findBy(array('value' => $capture['token'])));
             } else {
                 $expectedParams = array(
@@ -78,7 +78,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
                 $this->assertEquals($expectedParams, $capture);
 
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Entities\FeedToken')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
                     ->findBy(array('value' => $tokenValue)));
             }
         } else {
@@ -90,11 +90,11 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
             $this->assertEquals(12, strlen($capture['token']));
 
             $this->assertCount(1, self::$DI['app']['EM']
-                ->getRepository('Entities\FeedToken')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
                 ->findBy(array('value' => $capture['token'])));
         }
         $token = self::$DI['app']['EM']
-            ->getRepository('Entities\FeedToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
             ->findOneBy(array('usrId' => $user->get_id(), 'feed' => $feed->getId()));
         self::$DI['app']['EM']->remove($token);
         self::$DI['app']['EM']->flush();
@@ -154,7 +154,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
             ->method('get_id')
             ->will($this->returnValue(42));
 
-        $feed = new \Entities\Feed();
+        $feed = new \Alchemy\Phrasea\Model\Entities\Feed();
         $feed->setTitle('Title');
 
         return array(
@@ -179,7 +179,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
 
     public function provideGenerationDataPublic()
     {
-        $feed = new \Entities\Feed();
+        $feed = new \Alchemy\Phrasea\Model\Entities\Feed();
         $feed->setTitle('Title');
 
         return array(
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
index 80cbe47202..e6e6b62721 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
@@ -12,16 +12,16 @@
 namespace Alchemy\Tests\Phrasea\Model\Manipulator;
 
 use Alchemy\Phrasea\Model\Manager\UserManager;
-use Entities\UserNotificationSetting;
-use Entities\UserQuery;
-use Entities\UserSetting;
+use Alchemy\Phrasea\Model\Entities\UserNotificationSetting;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class UserManagerTest extends \PhraseanetPHPUnitAbstract
 {
     public function testNewUser()
     {
         $user = self::$DI['app']['model.user-manager']->create();
-        $this->assertInstanceOf('\Entities\User', $user);
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\User', $user);
     }
 
     public function testDeleteUser()
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
index 9e1ae859ea..5cfb707899 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php
@@ -14,14 +14,14 @@ namespace Alchemy\Tests\Phrasea\Model\Manipulator;
 use Doctrine\Common\Collections\ArrayCollection;
 use Alchemy\Phrasea\Model\Manipulator\UserManipulator;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 
 class UserManipulatorTest extends \PhraseanetPHPUnitAbstract
 {
     public function testCreateUser()
     {
         $user = self::$DI['app']['manipulator.user']->createUser('login', 'pass');
-        $this->assertInstanceOf('\Entities\User', self::$DI['app']['manipulator.user']->getRepository()->findOneByLogin('login'));
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\User', self::$DI['app']['manipulator.user']->getRepository()->findOneByLogin('login'));
     }
 
     public function testCreateAdminUser()
diff --git a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoOrderDeliveredTest.php b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoOrderDeliveredTest.php
index cf6125256b..eedf0d9cba 100644
--- a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoOrderDeliveredTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoOrderDeliveredTest.php
@@ -29,7 +29,7 @@ class MailInfoOrderDeliveredTest extends MailTestCase
             $this->getMessage()
         );
 
-        $basket = $this->getMock('Entities\Basket');
+        $basket = $this->getMock('Alchemy\Phrasea\Model\Entities\Basket');
         $basket->expects($this->any())
             ->method('getName')
             ->will($this->returnValue('Hello basket'));
@@ -80,7 +80,7 @@ class MailInfoOrderDeliveredTest extends MailTestCase
             $this->getMessage()
         );
 
-        $basket = $this->getMock('Entities\Basket');
+        $basket = $this->getMock('Alchemy\Phrasea\Model\Entities\Basket');
         $basket->expects($this->any())
             ->method('getName')
             ->will($this->returnValue('Hello basket'));
diff --git a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoPushReceivedTest.php b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoPushReceivedTest.php
index 984ab735c5..8ebd5b5ae6 100644
--- a/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoPushReceivedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Notification/Mail/MailInfoPushReceivedTest.php
@@ -64,7 +64,7 @@ class MailInfoPushReceivedTest extends MailWithLinkTestCase
             $this->getExpiration()
         );
 
-        $basket = $this->getMock('Entities\Basket');
+        $basket = $this->getMock('Alchemy\Phrasea\Model\Entities\Basket');
         $basket->expects($this->any())
             ->method('getName')
             ->will($this->returnValue('Hello basket'));
@@ -102,7 +102,7 @@ class MailInfoPushReceivedTest extends MailWithLinkTestCase
             ->method('count')
             ->will($this->returnValue(5));
 
-        $basket = $this->getMock('Entities\Basket');
+        $basket = $this->getMock('Alchemy\Phrasea\Model\Entities\Basket');
         $basket->expects($this->any())
             ->method('getName')
             ->will($this->returnValue('Hello basket'));
diff --git a/tests/Doctrine/Tests/Entities/UserTest.php b/tests/Doctrine/Tests/Entities/UserTest.php
index 07e730d308..3712a2e4a1 100644
--- a/tests/Doctrine/Tests/Entities/UserTest.php
+++ b/tests/Doctrine/Tests/Entities/UserTest.php
@@ -12,8 +12,8 @@
 namespace Doctrine\Tests\Entities;
 
 use Alchemy\Phrasea\Application;
-use Entities\User;
-use Entities\UserSetting;
+use Alchemy\Phrasea\Model\Entities\User;
+use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class UserTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Doctrine/Tests/Repositories/FeedItemRepositoryTest.php b/tests/Doctrine/Tests/Repositories/FeedItemRepositoryTest.php
index 177b9b9711..657e434ac3 100644
--- a/tests/Doctrine/Tests/Repositories/FeedItemRepositoryTest.php
+++ b/tests/Doctrine/Tests/Repositories/FeedItemRepositoryTest.php
@@ -2,8 +2,8 @@
 
 namespace Doctrine\Tests\Repositories;
 
-use Entities\FtpExport;
-use Entities\FtpExportElement;
+use Alchemy\Phrasea\Model\Entities\FtpExport;
+use Alchemy\Phrasea\Model\Entities\FtpExportElement;
 use Gedmo\Timestampable\TimestampableListener;
 
 class FeedItemRepositoryTest extends \PhraseanetPHPUnitAbstract
@@ -12,31 +12,31 @@ class FeedItemRepositoryTest extends \PhraseanetPHPUnitAbstract
     {
         $item = $this->insertOneFeedItem(self::$DI['user'], true);
         $record = $item->getRecord(self::$DI['app']);
-        $this->assertTrue(self::$DI['app']['EM']->getRepository('Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
+        $this->assertTrue(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
     }
 
     public function testIs_record_in_public_feedInPrivateFeed()
     {
         $record = $this->insertOneFeedItem(self::$DI['user'], false)->getRecord(self::$DI['app']);
-        $this->assertFalse(self::$DI['app']['EM']->getRepository('Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
+        $this->assertFalse(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
     }
 
     public function testLoadLatestItems()
     {
         $this->insertOneFeedItem(self::$DI['user'], true, 2);
-        $this->assertCount(2, self::$DI['app']['EM']->getRepository('Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(2, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 
     public function testLoadLatestItemsLessItems()
     {
         $this->insertOneFeedItem(self::$DI['user'], true, 2);
-        $this->assertCount(1, self::$DI['app']['EM']->getRepository('Entities\FeedItem')->loadLatest(self::$DI['app'], 1));
+        $this->assertCount(1, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 1));
     }
 
     public function testLoadLatestItemsNoPublic()
     {
         $this->insertOneFeedItem(self::$DI['user'], false, 2);
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 
     public function testLoadLatestWithDeletedDatabox()
@@ -52,7 +52,7 @@ class FeedItemRepositoryTest extends \PhraseanetPHPUnitAbstract
             ->will($this->returnValue(self::$DI['record_1']->get_record_id()));
 
         $this->insertOneFeedItem(self::$DI['user'], true, 1, $record);
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 
     public function testLoadLatestWithDeletedRecord()
@@ -68,6 +68,6 @@ class FeedItemRepositoryTest extends \PhraseanetPHPUnitAbstract
             ->will($this->returnValue(0));
 
         $this->insertOneFeedItem(self::$DI['user'], true, 1, $record);
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 }
diff --git a/tests/Doctrine/Tests/Repositories/FtpExportRepositoryTest.php b/tests/Doctrine/Tests/Repositories/FtpExportRepositoryTest.php
index c62676cbc7..7ffe1dee30 100644
--- a/tests/Doctrine/Tests/Repositories/FtpExportRepositoryTest.php
+++ b/tests/Doctrine/Tests/Repositories/FtpExportRepositoryTest.php
@@ -2,8 +2,8 @@
 
 namespace Doctrine\Tests\Repositories;
 
-use Entities\FtpExport;
-use Entities\FtpExportElement;
+use Alchemy\Phrasea\Model\Entities\FtpExport;
+use Alchemy\Phrasea\Model\Entities\FtpExportElement;
 use Gedmo\Timestampable\TimestampableListener;
 
 class FtpExportRepositoryTest extends \PhraseanetPHPUnitAbstract
@@ -45,7 +45,7 @@ class FtpExportRepositoryTest extends \PhraseanetPHPUnitAbstract
         self::$DI['app']['EM']->flush();
 
         $crashed = self::$DI['app']['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findCrashedExports();
 
         $this->assertCount(2, $crashed);
@@ -105,7 +105,7 @@ class FtpExportRepositoryTest extends \PhraseanetPHPUnitAbstract
         self::$DI['app']['EM']->flush();
 
         $crashed = self::$DI['app']['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findCrashedExports(new \DateTime('-6 days'));
 
         $this->assertCount(2, $crashed);
@@ -187,7 +187,7 @@ class FtpExportRepositoryTest extends \PhraseanetPHPUnitAbstract
         self::$DI['app']['EM']->flush();
 
         $doables = self::$DI['app']['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findDoableExports();
 
         $this->assertCount(2, $doables);
@@ -219,7 +219,7 @@ class FtpExportRepositoryTest extends \PhraseanetPHPUnitAbstract
         self::$DI['app']['EM']->flush();
 
         $exports = self::$DI['app']['EM']
-                ->getRepository('Entities\FtpExport')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                 ->findByUser(self::$DI['user']);
 
         $this->assertCount(2, $exports);
diff --git a/tests/Doctrine/Tests/Repositories/UserRepositoryTest.php b/tests/Doctrine/Tests/Repositories/UserRepositoryTest.php
index 5f36e1590e..39d120c301 100644
--- a/tests/Doctrine/Tests/Repositories/UserRepositoryTest.php
+++ b/tests/Doctrine/Tests/Repositories/UserRepositoryTest.php
@@ -11,7 +11,7 @@
 
 namespace Doctrine\Tests\Repositories;
 
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 
 class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
 {
@@ -21,7 +21,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setLogin('login');
         $user->setPassword('toto');
         $this->insertOneUser($user);
-        $users = self::$DI['app']['EM']->getRepository('Entities\User')->findAdmins();
+        $users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins();
         $this->assertEquals(0, count($users));
     }
 
@@ -32,7 +32,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setPassword('toto');
         $user->setAdmin(true);
         $this->insertOneUser($user);
-        $users = self::$DI['app']['EM']->getRepository('Entities\User')->findAdmins();
+        $users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins();
         $this->assertEquals(1, count($users));
     }
 
@@ -42,14 +42,14 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setLogin('login');
         $user->setPassword('toto');
         $user->setAdmin(true);
-        
+
         $template = new User();
         $template->setLogin('logint');
         $template->setPassword('totot');
-        
+
         $user->setModelOf($template);
 
-        $users = self::$DI['app']['EM']->getRepository('Entities\User')->findAdmins();
+        $users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins();
         $this->assertEquals(0, count($users));
     }
 
@@ -61,7 +61,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setAdmin(true);
         $user->setDeleted(true);
 
-        $users = self::$DI['app']['EM']->getRepository('Entities\User')->findAdmins();
+        $users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins();
         $this->assertEquals(0, count($users));
     }
 
@@ -71,9 +71,9 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setLogin('login');
         $user->setPassword('toto');
         $this->insertOneUser($user);
-        $user = self::$DI['app']['EM']->getRepository('Entities\User')->findByLogin('login');
-        $this->assertInstanceOf('Entities\User', $user);
-        $this->assertNull(self::$DI['app']['EM']->getRepository('Entities\User')->findByLogin('wrong-login'));
+        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByLogin('login');
+        $this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
+        $this->assertNull(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByLogin('wrong-login'));
     }
 
     public function testFindUserByEmail()
@@ -83,8 +83,8 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setPassword('toto');
         $user->setEmail('toto@toto.to');
         $this->insertOneUser($user);
-        $user = self::$DI['app']['EM']->getRepository('Entities\User')->findByEmail('toto@toto.to');
-        $this->assertInstanceOf('Entities\User', $user);
+        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByEmail('toto@toto.to');
+        $this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
     }
 
     public function testFindUserByEmailButDeleted()
@@ -95,7 +95,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setEmail('toto@toto.to');
         $user->setDeleted(true);
         $this->insertOneUser($user);
-        $user = self::$DI['app']['EM']->getRepository('Entities\User')->findByEmail('toto@toto.to');
+        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByEmail('toto@toto.to');
         $this->assertNull($user);
     }
 
@@ -107,7 +107,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
         $user->setEmail(null);
         $user->setDeleted(true);
         $this->insertOneUser($user);
-        $user = self::$DI['app']['EM']->getRepository('Entities\User')->findByEmail('toto@toto.to');
+        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByEmail('toto@toto.to');
         $this->assertNull($user);
     }
 }
diff --git a/tests/classes/Doctrine/Entities/BasketTest.php b/tests/classes/Doctrine/Entities/BasketTest.php
index f0609c6fc9..d6fcc851eb 100644
--- a/tests/classes/Doctrine/Entities/BasketTest.php
+++ b/tests/classes/Doctrine/Entities/BasketTest.php
@@ -4,7 +4,7 @@ class EntityBasketTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
      *
-     * @var \Entities\Basket
+     * @var \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected $basket;
 
@@ -92,7 +92,7 @@ class EntityBasketTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
         $this->assertEquals(0, $elements->count());
 
-        $basketElement = new \Entities\BasketElement();
+        $basketElement = new \Alchemy\Phrasea\Model\Entities\BasketElement();
 
         $basketElement->setRecord(self::$DI['record_1']);
 
@@ -127,7 +127,7 @@ class EntityBasketTest extends PhraseanetPHPUnitAuthenticatedAbstract
     {
         $this->assertNull($this->basket->getValidation());
 
-        $validationSession = new \Entities\ValidationSession();
+        $validationSession = new \Alchemy\Phrasea\Model\Entities\ValidationSession();
         $validationSession->setBasket($this->basket);
 
         $expires = new \DateTime();
@@ -143,7 +143,7 @@ class EntityBasketTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
         $this->em->refresh($this->basket);
 
-        $this->assertInstanceOf('\Entities\ValidationSession', $this->basket->getValidation());
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\ValidationSession', $this->basket->getValidation());
     }
 
     public function testGetIsRead()
diff --git a/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php b/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
index 8f74943135..c70a14cd1b 100644
--- a/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
+++ b/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
@@ -1,19 +1,19 @@
 <?php
 
-use Entities\UsrAuthProvider;
+use Alchemy\Phrasea\Model\Entities\UsrAuthProvider;
 
 class UsrAuthProviderRepositoryTest extends \PhraseanetPHPUnitAbstract
 {
     public function testFindWithProviderAndIdIsNullWhenNotFound()
     {
-        $repo = self::$DI['app']['EM']->getRepository('Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
 
         $this->assertNull($repo->findWithProviderAndId('provider-test', 12345));
     }
 
     public function testFindWithProviderAndIdReturnsOneResultWhenFound()
     {
-        $repo = self::$DI['app']['EM']->getRepository('Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
 
         $auth = new UsrAuthProvider();
         $auth->setUsrId(42);
diff --git a/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
index bd4ede556d..8bd2ab9418 100644
--- a/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
+++ b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
@@ -10,7 +10,7 @@ class ValidationParticipantRepositoryTest extends PhraseanetPHPUnitAuthenticated
         ));
 
         $em = self::$DI['app']['EM'];
-        $repo = $em->getRepository('\Entities\ValidationParticipant');
+        $repo = $em->getRepository('\Alchemy\Phrasea\Model\Entities\ValidationParticipant');
         /* @var $repo \Repositories\ValidationParticipantRepository */
         $expireDate = new \DateTime('+2 days');
         $participants = $repo->findNotConfirmedAndNotRemindedParticipantsByExpireDate($expireDate);
diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php
index 8593a103c0..187903586f 100644
--- a/tests/classes/PhraseanetPHPUnitAbstract.php
+++ b/tests/classes/PhraseanetPHPUnitAbstract.php
@@ -4,13 +4,13 @@ use Alchemy\Phrasea\CLI;
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 use Doctrine\Common\DataFixtures\Loader;
-use Entities\AggregateToken;
-use Entities\Feed;
-use Entities\FeedEntry;
-use Entities\FeedItem;
-use Entities\FeedPublisher;
-use Entities\FeedToken;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\FeedToken;
+use Alchemy\Phrasea\Model\Entities\User;
 use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Client;
@@ -309,7 +309,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     /**
      * Insert one basket entry ans set current authenticated user as owner
      *
-     * @return \Entities\Basket
+     * @return \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected function insertOneBasket()
     {
@@ -332,7 +332,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     /**
      * Insert one feed
      *
-     * @return \Entities\Feed
+     * @return \Alchemy\Phrasea\Model\Entities\Feed
      */
     protected function insertOneFeed(\User_Adapter $user, $title = null, $public = null)
     {
@@ -361,7 +361,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
     /**
      *
-     * @return \Entities\FeedEntry
+     * @return \Alchemy\Phrasea\Model\Entities\FeedEntry
      */
     protected function insertOneFeedEntry(\User_Adapter $user, $public = false)
     {
@@ -370,7 +370,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
             $em = self::$DI['app']['EM'];
 
-            $entry = new \Entities\FeedEntry();
+            $entry = new \Alchemy\Phrasea\Model\Entities\FeedEntry();
             $entry->setFeed($feed);
             $entry->setTitle("test");
             $entry->setSubtitle("description");
@@ -434,7 +434,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
     /**
      *
-     * @return \Entities\FeedItem
+     * @return \Alchemy\Phrasea\Model\Entities\FeedItem
      */
     protected function insertOneFeedItem(\User_Adapter $user, $public = false, $qty = 1, \record_adapter $record = null)
     {
@@ -443,7 +443,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
             $entry = $this->insertOneFeedEntry($user, $public);
 
             for ($i = 0; $i < $qty; $i++) {
-                $item = new \Entities\FeedItem();
+                $item = new \Alchemy\Phrasea\Model\Entities\FeedItem();
                 $item->setEntry($entry);
 
                 if (null === $record) {
@@ -473,7 +473,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     /**
      * Insert one basket entry ans set current authenticated user as owner
      *
-     * @return \Entities\Basket
+     * @return \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected function insertOneLazaretFile()
     {
@@ -518,8 +518,8 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
     /**
      *
-     * @param  \Entities\UsrList      $UsrList
-     * @return \Entities\UsrListEntry
+     * @param  \Alchemy\Phrasea\Model\Entities\UsrList      $UsrList
+     * @return \Alchemy\Phrasea\Model\Entities\UsrListEntry
      */
     protected function insertOneUsrListEntry(\User_adapter $owner, \User_adapter $user)
     {
@@ -552,7 +552,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     /**
      * Insert five baskets and set current authenticated user as owner
      *
-     * @return \Entities\Basket
+     * @return \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected function insertFiveBasket()
     {
@@ -574,13 +574,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
     /**
      *
-     * @return \Entities\BasketElement
+     * @return \Alchemy\Phrasea\Model\Entities\BasketElement
      */
     protected function insertOneBasketElement()
     {
         $basket = $this->insertOneBasket();
 
-        $basketElement = new \Entities\BasketElement();
+        $basketElement = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basketElement->setRecord(self::$DI['record_1']);
         $basketElement->setBasket($basket);
 
@@ -599,7 +599,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
     /**
      *
-     * @return \Entities\Basket
+     * @return \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected function insertOneValidationBasket(array $parameters = array())
     {
@@ -608,7 +608,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
         $basketElement = $this->insertOneBasketElement();
         $basket = $basketElement->getBasket();
 
-        $Validation = new Entities\ValidationSession();
+        $Validation = new Alchemy\Phrasea\Model\Entities\ValidationSession();
         $Validation->setBasket($basket);
         $Validation->setInitiator(self::$DI['user']);
 
@@ -620,7 +620,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
         $em->persist($Validation);
         $em->merge($basket);
 
-        $Participant = new Entities\ValidationParticipant();
+        $Participant = new Alchemy\Phrasea\Model\Entities\ValidationParticipant();
         $Participant->setUser(self::$DI['user']);
         $Participant->setCanAgree(true);
         $Participant->setCanSeeOthers(true);
@@ -631,7 +631,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
         $em->persist($Participant);
         $em->merge($Validation);
 
-        $Data = new Entities\ValidationData();
+        $Data = new Alchemy\Phrasea\Model\Entities\ValidationData();
         $Data->setBasketElement($basketElement);
         $Data->setParticipant($Participant);
         $basketElement->addValidationData($Data);
@@ -651,7 +651,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
      * Add 2 records as elments of the newly created basket
      * Add 2 participants to the newly created sessionValidation
      *
-     * @return \Entities\Basket
+     * @return \Alchemy\Phrasea\Model\Entities\Basket
      */
     protected function insertOneBasketEnv()
     {
diff --git a/tests/classes/api/v1/api_v1_adapterTest.php b/tests/classes/api/v1/api_v1_adapterTest.php
index faf196d081..6010cd04fb 100644
--- a/tests/classes/api/v1/api_v1_adapterTest.php
+++ b/tests/classes/api/v1/api_v1_adapterTest.php
@@ -557,12 +557,12 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $this->assertArrayHasKey('basket', $response['response']);
 
         $em = self::$DI['app']['EM'];
-        $repo = $em->getRepository('\Entities\Basket');
+        $repo = $em->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repo \Repositories\BasketRepository */
         $basket = $repo->findUserBasket(self::$DI['app'], $response['response']['basket']['basket_id'], self::$DI['app']['authentication']->getUser(), true);
 
-        $this->assertTrue($basket instanceof \Entities\Basket);
+        $this->assertTrue($basket instanceof \Alchemy\Phrasea\Model\Entities\Basket);
         $em->remove($basket);
         $em->flush();
     }
@@ -574,7 +574,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
         $em = self::$DI['app']['EM'];
 
-        $Basket = new Entities\Basket();
+        $Basket = new Alchemy\Phrasea\Model\Entities\Basket();
         $Basket->setName('Delete test');
         $Basket->setOwner($user);
 
@@ -589,7 +589,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $this->assertEquals('application/json', $result->get_content_type());
         $this->assertTrue(is_array(json_decode($result->format(), true)));
 
-        $repo = $em->getRepository('\Entities\Basket');
+        $repo = $em->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
 
         try {
             $repo->findUserBasket(self::$DI['app'], $ssel_id, $user, true);
@@ -624,7 +624,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $this->assertEquals('application/json', $result->get_content_type());
         $this->assertTrue(is_array(json_decode($result->format(), true)));
 
-        $repository = self::$DI['app']['EM']->getRepository('\Entities\Basket');
+        $repository = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
 
         $ret_bask = $repository->find($basket->getId());
 
@@ -643,7 +643,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $this->assertEquals('application/json', $result->get_content_type());
         $this->assertTrue(is_array(json_decode($result->format(), true)));
 
-        $repository = self::$DI['app']['EM']->getRepository('\Entities\Basket');
+        $repository = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
 
         $ret_bask = $repository->find($basket->getId());
 
@@ -677,7 +677,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $feedItem = $this->insertOneFeedItem(self::$DI['user']);
         $feed = $feedItem->getEntry()->getFeed();
 
-        $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']);
+        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['user']);
         foreach ($feeds as $feed) {
             $result = $this->object->get_publication($request, $feed->getId(), self::$DI['user']);
             $this->checkResponseField($result, "feed", 'array');
diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php
index dc15515d56..5e8f066712 100644
--- a/tests/classes/record/adapterTest.php
+++ b/tests/classes/record/adapterTest.php
@@ -36,7 +36,7 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
      */
     public function testSetExport()
     {
-        $basket = new \Entities\Basket();
+        $basket = new \Alchemy\Phrasea\Model\Entities\Basket();
 
         $basket->setName('hello');
         $basket->setOwner(self::$DI['user']);
@@ -44,7 +44,7 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
         $em = self::$DI['app']['EM'];
 
-        $basketElement = new \Entities\BasketElement();
+        $basketElement = new \Alchemy\Phrasea\Model\Entities\BasketElement();
 
         $basketElement->setRecord(self::$DI['record_1']);
         $basketElement->setBasket($basket);
@@ -497,10 +497,10 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     public function testGet_container_baskets()
     {
         $basket = $this->insertOneBasket();
-        $this->assertInstanceOf('\Entities\Basket', $basket);
+        $this->assertInstanceOf('\Alchemy\Phrasea\Model\Entities\Basket', $basket);
 
-        /* @var $basket \Entities\Basket */
-        $basket_element = new \Entities\BasketElement();
+        /* @var $basket \Alchemy\Phrasea\Model\Entities\Basket */
+        $basket_element = new \Alchemy\Phrasea\Model\Entities\BasketElement();
         $basket_element->setRecord(self::$DI['record_1']);
         $basket_element->setBasket($basket);
 
diff --git a/tests/classes/task/period/task_period_archiveTest.php b/tests/classes/task/period/task_period_archiveTest.php
index 260de7ab2e..4191220a2b 100644
--- a/tests/classes/task/period/task_period_archiveTest.php
+++ b/tests/classes/task/period/task_period_archiveTest.php
@@ -405,7 +405,7 @@ class task_period_archiveTest extends \PhraseanetPHPUnitAbstract
     public function testGetLazaretSession()
     {
         $session = self::$object->getLazaretSessionTester();
-        $this->assertInstanceOf('\\Entities\\LazaretSession', $session);
+        $this->assertInstanceOf('\\Alchemy\Phrasea\Model\Entities\\LazaretSession', $session);
 
         $session_id = self::$object->getLazaretSessionTester()->getId();
 
diff --git a/tests/classes/userTest.php b/tests/classes/userTest.php
index 954474a449..61f5935ea1 100644
--- a/tests/classes/userTest.php
+++ b/tests/classes/userTest.php
@@ -35,7 +35,7 @@ class userTest extends PhraseanetPHPUnitAbstract
             $user = \User_Adapter::create(self::$DI['app'], 'test_phpunit_providers', 'any', null, false);
         }
 
-        $provider = new Entities\UsrAuthProvider();
+        $provider = new Alchemy\Phrasea\Model\Entities\UsrAuthProvider();
         $provider->setDistantId(12345);
         $provider->setProvider('custom-one');
         $provider->setUsrId($user->get_id());
@@ -45,7 +45,7 @@ class userTest extends PhraseanetPHPUnitAbstract
 
         $user->delete();
 
-        $repo = self::$DI['app']['EM']->getRepository('Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
         $this->assertNull($repo->findWithProviderAndId('custom-one', 12345));
     }
 }