diff --git a/lib/unitTest/Bridge/ApplicationTest.php b/lib/unitTest/Bridge/ApplicationTest.php
index 8287188a48..a71ccbb2e9 100644
--- a/lib/unitTest/Bridge/ApplicationTest.php
+++ b/lib/unitTest/Bridge/ApplicationTest.php
@@ -57,7 +57,7 @@ class Bridge_Application extends PhraseanetWebTestCaseAuthenticatedAbstract
 
   public function createApplication()
   {
-    $app = require __DIR__ . '/../../classes/module/Prod.php';
+    $app = require __DIR__ . '/../../Alchemy/Phrasea/Application/Prod.php';
 
     return $app;
   }
diff --git a/lib/unitTest/Feed/rssfeedsTest.php b/lib/unitTest/Feed/rssfeedsTest.php
index 5573fdba4c..479c034b0e 100644
--- a/lib/unitTest/Feed/rssfeedsTest.php
+++ b/lib/unitTest/Feed/rssfeedsTest.php
@@ -165,7 +165,7 @@ class Feed_rssfeedsTest extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../lib/classes/module/Root.php';
+    return require dirname(__FILE__) . '/../../../lib/Alchemy/Phrasea/Application/Root.php';
   }
 
 //$app->get('/feeds/aggregated/{format}/', function($format) use ($app, $appbox, $display_feed)
diff --git a/lib/unitTest/api/oauthv2/applicationTest.php b/lib/unitTest/api/oauthv2/applicationTest.php
index 16ec37de92..615652e611 100644
--- a/lib/unitTest/api/oauthv2/applicationTest.php
+++ b/lib/unitTest/api/oauthv2/applicationTest.php
@@ -150,7 +150,7 @@ class oauthv2_application_test extends PhraseanetWebTestCaseAuthenticatedAbstrac
 
   public function createApplication()
   {
-    return require __DIR__ . '/../../../../lib/classes/module/api/OAuthv2.php';
+    return require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
   }
 
   public function testAuthorizeRedirect()
diff --git a/lib/unitTest/api/v1/aplicationTest.php b/lib/unitTest/api/v1/aplicationTest.php
index e5864bdf71..130a358e33 100644
--- a/lib/unitTest/api/v1/aplicationTest.php
+++ b/lib/unitTest/api/v1/aplicationTest.php
@@ -41,7 +41,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../lib/classes/module/api/V1.php';
+    return require dirname(__FILE__) . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
   }
 
   public function testRouteNotFound()
diff --git a/lib/unitTest/api/v1/aplicationYamlTest.php b/lib/unitTest/api/v1/aplicationYamlTest.php
index 31fd492ad8..ea3d70333e 100644
--- a/lib/unitTest/api/v1/aplicationYamlTest.php
+++ b/lib/unitTest/api/v1/aplicationYamlTest.php
@@ -50,7 +50,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../lib/classes/module/api/V1.php';
+    return require dirname(__FILE__) . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
   }
 
   public function testRouteNotFound()
diff --git a/lib/unitTest/module/admin/route/publicationTest.php b/lib/unitTest/module/admin/route/publicationTest.php
index acae742b67..3dfd8723b1 100644
--- a/lib/unitTest/module/admin/route/publicationTest.php
+++ b/lib/unitTest/module/admin/route/publicationTest.php
@@ -35,7 +35,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
   public function createApplication()
   {
-    $app = require dirname(__FILE__) . '/../../../../classes/module/Admin.php';
+    $app = require dirname(__FILE__) . '/../../../../Alchemy/Phrasea/Application/Admin.php';
 
     return $app;
   }
diff --git a/lib/unitTest/module/lightboxTest.php b/lib/unitTest/module/lightboxTest.php
index 9f6f4fd692..dbc5573985 100644
--- a/lib/unitTest/module/lightboxTest.php
+++ b/lib/unitTest/module/lightboxTest.php
@@ -40,7 +40,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../classes/module/Lightbox.php';
+    return require dirname(__FILE__) . '/../../Alchemy/Phrasea/Application/Lightbox.php';
   }
 
   /**
diff --git a/lib/unitTest/module/prod/overviewAppTest.php b/lib/unitTest/module/prod/overviewAppTest.php
index 00d861f243..331973658f 100644
--- a/lib/unitTest/module/prod/overviewAppTest.php
+++ b/lib/unitTest/module/prod/overviewAppTest.php
@@ -45,7 +45,7 @@ class Feed_overviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../lib/classes/module/Overview.php';
+    return require dirname(__FILE__) . '/../../../../lib/Alchemy/Phrasea/Application/Overview.php';
   }
 
 //$deliver_content = function(session $session, record_adapter $record, $subdef, $watermark, $stamp, $app)
diff --git a/lib/unitTest/module/prod/route/record/feedApplicatonTest.php b/lib/unitTest/module/prod/route/record/feedApplicatonTest.php
index 5ab1a096c8..a3f7c70ada 100644
--- a/lib/unitTest/module/prod/route/record/feedApplicatonTest.php
+++ b/lib/unitTest/module/prod/route/record/feedApplicatonTest.php
@@ -63,7 +63,7 @@ class Module_Prod_Route_RecordFeedApp extends PhraseanetWebTestCaseAuthenticated
 
   public function createApplication()
   {
-    $app = require __DIR__ . '/../../../../../classes/module/Prod.php';
+    $app = require __DIR__ . '/../../../../../Alchemy/Phrasea/Application/Prod.php';
     return $app;
   }
 
diff --git a/lib/unitTest/module/prod/route/tooltipapplicationTest.php b/lib/unitTest/module/prod/route/tooltipapplicationTest.php
index 72c5d286ee..a93ed143c0 100644
--- a/lib/unitTest/module/prod/route/tooltipapplicationTest.php
+++ b/lib/unitTest/module/prod/route/tooltipapplicationTest.php
@@ -21,7 +21,7 @@ class Module_Prod_Route_TooltipTest extends PhraseanetWebTestCaseAuthenticatedAb
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../../../classes/module/Prod.php';
+    return require dirname(__FILE__) . '/../../../../Alchemy/Phrasea/Application/Prod.php';
   }
 
   public function testRouteBasket()
diff --git a/lib/unitTest/module/rssFeedTest.php b/lib/unitTest/module/rssFeedTest.php
index 6b50a92b76..e462b62846 100644
--- a/lib/unitTest/module/rssFeedTest.php
+++ b/lib/unitTest/module/rssFeedTest.php
@@ -42,7 +42,7 @@ class Module_RssFeedTest extends PhraseanetWebTestCaseAbstract
 
   public function createApplication()
   {
-    return require dirname(__FILE__) . '/../../classes/module/Root.php';
+    return require dirname(__FILE__) . '/../../Alchemy/Phrasea/Application/Root.php';
   }
 
   public function testAggregatedRss()
diff --git a/lib/unitTest/testfiles/cestlafete.jpg b/lib/unitTest/testfiles/cestlafete.jpg
old mode 100644
new mode 100755