diff --git a/lib/Alchemy/Phrasea/Setup/System/Information.php b/lib/Alchemy/Phrasea/Setup/Information.php
similarity index 94%
rename from lib/Alchemy/Phrasea/Setup/System/Information.php
rename to lib/Alchemy/Phrasea/Setup/Information.php
index cd65e17107..c31acdb31d 100644
--- a/lib/Alchemy/Phrasea/Setup/System/Information.php
+++ b/lib/Alchemy/Phrasea/Setup/Information.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 class Information implements InformationInterface
 {
diff --git a/lib/Alchemy/Phrasea/Setup/System/InformationInterface.php b/lib/Alchemy/Phrasea/Setup/InformationInterface.php
similarity index 92%
rename from lib/Alchemy/Phrasea/Setup/System/InformationInterface.php
rename to lib/Alchemy/Phrasea/Setup/InformationInterface.php
index c8c620d5c6..a642df1026 100644
--- a/lib/Alchemy/Phrasea/Setup/System/InformationInterface.php
+++ b/lib/Alchemy/Phrasea/Setup/InformationInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 interface InformationInterface
 {
diff --git a/lib/Alchemy/Phrasea/Setup/System/PhpIniRequirement.php b/lib/Alchemy/Phrasea/Setup/PhpIniRequirement.php
similarity index 98%
rename from lib/Alchemy/Phrasea/Setup/System/PhpIniRequirement.php
rename to lib/Alchemy/Phrasea/Setup/PhpIniRequirement.php
index bd193f114b..34dca2833b 100644
--- a/lib/Alchemy/Phrasea/Setup/System/PhpIniRequirement.php
+++ b/lib/Alchemy/Phrasea/Setup/PhpIniRequirement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 /**
  * @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php
diff --git a/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php b/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php
index 3c013324db..e48662554e 100644
--- a/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php
+++ b/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php
@@ -12,8 +12,11 @@
 namespace Alchemy\Phrasea\Setup\Probe;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\System\RequirementCollectionInterface;
+use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
 
+/**
+ * A probe is used to probe the system when installed and configured.
+ */
 interface ProbeInterface extends RequirementCollectionInterface
 {
     /**
diff --git a/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php
index d72e59fbd0..4da834b5f4 100644
--- a/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php
+++ b/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php
@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Setup\Probe;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
 
 class SearchEngineProbe extends RequirementCollection implements ProbeInterface
diff --git a/lib/Alchemy/Phrasea/Setup/System/Requirement.php b/lib/Alchemy/Phrasea/Setup/Requirement.php
similarity index 98%
rename from lib/Alchemy/Phrasea/Setup/System/Requirement.php
rename to lib/Alchemy/Phrasea/Setup/Requirement.php
index 35325e57c9..ffa562e27c 100644
--- a/lib/Alchemy/Phrasea/Setup/System/Requirement.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 /**
  * @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php
diff --git a/lib/Alchemy/Phrasea/Setup/System/RequirementCollection.php b/lib/Alchemy/Phrasea/Setup/RequirementCollection.php
similarity index 99%
rename from lib/Alchemy/Phrasea/Setup/System/RequirementCollection.php
rename to lib/Alchemy/Phrasea/Setup/RequirementCollection.php
index 188ac2672d..607352d9a7 100644
--- a/lib/Alchemy/Phrasea/Setup/System/RequirementCollection.php
+++ b/lib/Alchemy/Phrasea/Setup/RequirementCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 /**
  * @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php
diff --git a/lib/Alchemy/Phrasea/Setup/System/RequirementCollectionInterface.php b/lib/Alchemy/Phrasea/Setup/RequirementCollectionInterface.php
similarity index 99%
rename from lib/Alchemy/Phrasea/Setup/System/RequirementCollectionInterface.php
rename to lib/Alchemy/Phrasea/Setup/RequirementCollectionInterface.php
index f6ccf368c4..d50a10e8cd 100644
--- a/lib/Alchemy/Phrasea/Setup/System/RequirementCollectionInterface.php
+++ b/lib/Alchemy/Phrasea/Setup/RequirementCollectionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 /**
  * @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php
diff --git a/lib/Alchemy/Phrasea/Setup/System/RequirementInterface.php b/lib/Alchemy/Phrasea/Setup/RequirementInterface.php
similarity index 96%
rename from lib/Alchemy/Phrasea/Setup/System/RequirementInterface.php
rename to lib/Alchemy/Phrasea/Setup/RequirementInterface.php
index 35a66d7765..94338f2736 100644
--- a/lib/Alchemy/Phrasea/Setup/System/RequirementInterface.php
+++ b/lib/Alchemy/Phrasea/Setup/RequirementInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Setup\System;
+namespace Alchemy\Phrasea\Setup;
 
 interface RequirementInterface
 {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
index 8598e22f16..7ed3607e1d 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
@@ -11,10 +11,10 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 use Symfony\Component\Process\ExecutableFinder;
 
-class BinariesRequirements extends RequirementCollection
+class BinariesRequirements extends RequirementCollection implements RequirementInterface
 {
     const FILE_VERSION = '5.04';
     const IMAGICK_VERSION = '6.2.9';
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php b/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php
index b1a1c63e46..148b90e061 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 
-class CacheServerRequirement extends RequirementCollection
+class CacheServerRequirement extends RequirementCollection implements RequirementInterface
 {
     public function __construct()
     {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
index d158fac3fe..057734fe26 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 
-class FilesystemRequirements extends RequirementCollection
+class FilesystemRequirements extends RequirementCollection implements RequirementInterface
 {
     public function __construct()
     {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
index b8df2153c1..73fa124c32 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
@@ -11,10 +11,10 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 use Alchemy\Phrasea\Application as PhraseaApplication;
 
-class LocalesRequirements extends RequirementCollection
+class LocalesRequirements extends RequirementCollection implements RequirementInterface
 {
     public function __construct($locale = 'en_GB')
     {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php
index 236d92bc09..1e444a815c 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 
-class OpcodeCacheRequirement extends RequirementCollection
+class OpcodeCacheRequirement extends RequirementCollection implements RequirementInterface
 {
     public function __construct()
     {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php
index 11bbd6076f..0d5d5aacd6 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 
-class PhpRequirements extends RequirementCollection
+class PhpRequirements extends RequirementCollection implements RequirementInterface
 {
     public function __construct()
     {
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php
index 6272902927..4a71a30bb4 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php
@@ -11,10 +11,10 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 use Symfony\Component\Process\ExecutableFinder;
 
-class PhraseaRequirements extends RequirementCollection
+class PhraseaRequirements extends RequirementCollection implements RequirementInterface
 {
     const PHRASEA_EXTENSION_VERSION = '1.21.1.0';
     const PHRASEA_INDEXER_VERSION = '3.10.2.3';
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php b/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php
new file mode 100644
index 0000000000..f67e8264e2
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2013 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Setup\Requirements;
+
+use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
+
+/**
+ * A requirement is used to analyze the system even if Phraseanet is not installed
+ */
+interface RequirementInterface extends RequirementCollectionInterface
+{
+}
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php
index 8c13836ce5..9e7ade3bc6 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php
@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollection;
 
-class SystemRequirements extends RequirementCollection
+class SystemRequirements extends RequirementCollection implements RequirementInterface
 {
     const REQUIRED_PHP_VERSION = '5.3.3';
 
diff --git a/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
index fbb179c3fb..febe32f8d7 100644
--- a/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
@@ -150,7 +150,7 @@ class ConfigurationTesterTest extends AbstractSetupTester
     public function testGetRequirements()
     {
         foreach ($this->getTester()->getRequirements() as $requirements) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementCollectionInterface', $requirements);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementCollectionInterface', $requirements);
         }
     }
 
diff --git a/tests/Alchemy/Tests/Phrasea/Setup/Probe/ProbeTestCase.php b/tests/Alchemy/Tests/Phrasea/Setup/Probe/ProbeTestCase.php
index 5752d7011b..b89a0fee14 100644
--- a/tests/Alchemy/Tests/Phrasea/Setup/Probe/ProbeTestCase.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Probe/ProbeTestCase.php
@@ -23,7 +23,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
         $this->assertInternalType('array', $this->getProbe()->getRecommendations());
 
         foreach ($this->getProbe()->getRecommendations() as $recommandation) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $recommandation);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $recommandation);
         }
     }
 
@@ -32,7 +32,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
         $this->assertInternalType('array', $this->getProbe()->getRequirements());
 
         foreach ($this->getProbe()->getRequirements() as $requirement) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
         }
     }
 
@@ -41,7 +41,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
         $this->assertInternalType('array', $this->getProbe()->getInformations());
 
         foreach ($this->getProbe()->getInformations() as $information) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\InformationInterface', $information);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\InformationInterface', $information);
         }
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Setup/Requirements/RequirementsTestCase.php b/tests/Alchemy/Tests/Phrasea/Setup/Requirements/RequirementsTestCase.php
index 5f81230ba0..2e6b235efd 100644
--- a/tests/Alchemy/Tests/Phrasea/Setup/Requirements/RequirementsTestCase.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Requirements/RequirementsTestCase.php
@@ -2,8 +2,8 @@
 
 namespace Alchemy\Tests\Phrasea\Setup\Requirements;
 
-use Alchemy\Phrasea\Setup\System\RequirementCollection;
-use Alchemy\Phrasea\Setup\System\RequirementCollectionInterface;
+use Alchemy\Phrasea\Setup\RequirementCollection;
+use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
 
 abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -14,13 +14,13 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
 
     public function testIsInterface()
     {
-        $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementCollectionInterface', $this->provideRequirements());
+        $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementCollectionInterface', $this->provideRequirements());
     }
 
     public function testAdd()
     {
         $collection = $this->provideRequirements();
-        $requirement = $this->getMock('Alchemy\Phrasea\Setup\System\RequirementInterface');
+        $requirement = $this->getMock('Alchemy\Phrasea\Setup\RequirementInterface');
         $collection->add($requirement);
 
         $found = false;
@@ -39,7 +39,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
     {
         $collection = $this->provideRequirements();
 
-        $requirement = $this->getMock('Alchemy\Phrasea\Setup\System\RequirementInterface');
+        $requirement = $this->getMock('Alchemy\Phrasea\Setup\RequirementInterface');
         $coll = new RequirementCollection();
         $coll->add($requirement);
 
@@ -64,7 +64,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
         $this->assertInternalType('array', $collection->all());
 
         foreach ($collection->all() as $requirement) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
         }
     }
 
@@ -75,7 +75,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
         $this->assertInternalType('array', $collection->getFailedRecommendations());
 
         foreach ($collection->getFailedRecommendations() as $requirement) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
         }
     }
 
@@ -86,7 +86,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
         $this->assertInternalType('array', $collection->getFailedRequirements());
 
         foreach ($collection->getFailedRequirements() as $requirement) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
         }
     }
 
@@ -97,7 +97,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
         $this->assertInternalType('array', $collection->getInformations());
 
         foreach ($collection->getInformations() as $requirement) {
-            $this->assertInstanceOf('Alchemy\Phrasea\Setup\System\InformationInterface', $requirement);
+            $this->assertInstanceOf('Alchemy\Phrasea\Setup\InformationInterface', $requirement);
         }
     }