diff --git a/src/CliProgram/AutoDiscoveryDirectory.php b/src/CliProgram/AutoDiscovery/AutoDiscoveryDirectory.php
similarity index 98%
rename from src/CliProgram/AutoDiscoveryDirectory.php
rename to src/CliProgram/AutoDiscovery/AutoDiscoveryDirectory.php
index 6d8b2ac..e408dc1 100644
--- a/src/CliProgram/AutoDiscoveryDirectory.php
+++ b/src/CliProgram/AutoDiscovery/AutoDiscoveryDirectory.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoDiscovery;
 
 use FilesystemIterator;
 use jrosset\BetterPhpToken\BetterPhpToken;
+use jrosset\CliProgram\AutoPrefix\TAutoPrefixManagement;
 use ReflectionClass;
 use ReflectionException;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/CliProgram/IAutoDiscoverySpot.php b/src/CliProgram/AutoDiscovery/IAutoDiscoverySpot.php
similarity index 85%
rename from src/CliProgram/IAutoDiscoverySpot.php
rename to src/CliProgram/AutoDiscovery/IAutoDiscoverySpot.php
index 39b899b..3dae964 100644
--- a/src/CliProgram/IAutoDiscoverySpot.php
+++ b/src/CliProgram/AutoDiscovery/IAutoDiscoverySpot.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoDiscovery;
 
 use Symfony\Component\Console\Command\Command;
 
diff --git a/src/CliProgram/TAutoDiscoveryApplication.php b/src/CliProgram/AutoDiscovery/TAutoDiscoveryApplication.php
similarity index 95%
rename from src/CliProgram/TAutoDiscoveryApplication.php
rename to src/CliProgram/AutoDiscovery/TAutoDiscoveryApplication.php
index 4635e90..815a455 100644
--- a/src/CliProgram/TAutoDiscoveryApplication.php
+++ b/src/CliProgram/AutoDiscovery/TAutoDiscoveryApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoDiscovery;
 
 use jrosset\Collections\Collection;
 use jrosset\Collections\ICollection;
diff --git a/src/CliProgram/AutoPrefixNamespaceManager.php b/src/CliProgram/AutoPrefix/AutoPrefixNamespaceManager.php
similarity index 98%
rename from src/CliProgram/AutoPrefixNamespaceManager.php
rename to src/CliProgram/AutoPrefix/AutoPrefixNamespaceManager.php
index b19044e..3a51e3f 100644
--- a/src/CliProgram/AutoPrefixNamespaceManager.php
+++ b/src/CliProgram/AutoPrefix/AutoPrefixNamespaceManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoPrefix;
 
 use ReflectionClass;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/CliProgram/IAutoPrefixManager.php b/src/CliProgram/AutoPrefix/IAutoPrefixManager.php
similarity index 90%
rename from src/CliProgram/IAutoPrefixManager.php
rename to src/CliProgram/AutoPrefix/IAutoPrefixManager.php
index 5a248f9..5d8db7e 100644
--- a/src/CliProgram/IAutoPrefixManager.php
+++ b/src/CliProgram/AutoPrefix/IAutoPrefixManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoPrefix;
 
 use Symfony\Component\Console\Command\Command;
 
diff --git a/src/CliProgram/TAutoPrefixManagement.php b/src/CliProgram/AutoPrefix/TAutoPrefixManagement.php
similarity index 97%
rename from src/CliProgram/TAutoPrefixManagement.php
rename to src/CliProgram/AutoPrefix/TAutoPrefixManagement.php
index 5a0e487..3c1dc87 100644
--- a/src/CliProgram/TAutoPrefixManagement.php
+++ b/src/CliProgram/AutoPrefix/TAutoPrefixManagement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace jrosset\CliProgram;
+namespace jrosset\CliProgram\AutoPrefix;
 
 use jrosset\Collections\Collection;
 use jrosset\Collections\ICollection;
diff --git a/tests/Application.php b/tests/Application.php
index 8b32fa9..9658070 100644
--- a/tests/Application.php
+++ b/tests/Application.php
@@ -2,9 +2,9 @@
 
 namespace jrosset\Tests;
 
-use jrosset\CliProgram\TAutoDiscoveryApplication;
-use jrosset\CliProgram\AutoDiscoveryDirectory;
-use jrosset\CliProgram\AutoPrefixNamespaceManager;
+use jrosset\CliProgram\AutoDiscovery\AutoDiscoveryDirectory;
+use jrosset\CliProgram\AutoDiscovery\TAutoDiscoveryApplication;
+use jrosset\CliProgram\AutoPrefix\AutoPrefixNamespaceManager;
 
 class Application extends \Symfony\Component\Console\Application {
     use TAutoDiscoveryApplication;