diff --git a/Manager.php b/Manager/RepositoryManager.php
similarity index 94%
rename from Manager.php
rename to Manager/RepositoryManager.php
index 904dcb1..2022754 100644
--- a/Manager.php
+++ b/Manager/RepositoryManager.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOQ\ElasticaBundle\Manager;
 
+use FOQ\ElasticaBundle\Repository;
 use RuntimeException;
 
 /**
@@ -10,7 +11,7 @@ use RuntimeException;
  * Allows retrieval of basic or custom repository for mapped Doctrine
  * entities/documents.
  */
-class Manager
+class RepositoryManager
 {
     protected $entities;
     protected $repositories;
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index b62d901..5f1fe60 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -10,7 +10,7 @@
         <parameter key="foq_elastica.type.class">Elastica_Type</parameter>
         <parameter key="foq_elastica.logger.class">FOQ\ElasticaBundle\Logger\ElasticaLogger</parameter>
         <parameter key="foq_elastica.data_collector.class">FOQ\ElasticaBundle\DataCollector\ElasticaDataCollector</parameter>
-        <parameter key="foq_elastica.manager.class">FOQ\ElasticaBundle\Manager</parameter>
+        <parameter key="foq_elastica.manager.class">FOQ\ElasticaBundle\Manager\RepositoryManager</parameter>
     </parameters>
 
 
diff --git a/Tests/ManagerTest.php b/Tests/Manager/RepositoryManagerTest.php
similarity index 78%
rename from Tests/ManagerTest.php
rename to Tests/Manager/RepositoryManagerTest.php
index a1175a0..65641a1 100644
--- a/Tests/ManagerTest.php
+++ b/Tests/Manager/RepositoryManagerTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests;
+namespace FOQ\ElasticaBundle\Tests\Manager;
 
-use FOQ\ElasticaBundle\Manager;
+use FOQ\ElasticaBundle\Manager\RepositoryManager;
 
 class CustomRepository{}
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
  */
-class ManagerTest extends \PHPUnit_Framework_TestCase
+class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testThatGetRepositoryReturnsDefaultRepository()
@@ -20,7 +20,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $entityName = 'Test Entity';
 
-        $manager = new Manager($finderMock);
+        $manager = new RepositoryManager($finderMock);
         $manager->addEntity($entityName, $finderMock);
         $repository = $manager->getRepository($entityName);
         $this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
@@ -34,10 +34,10 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $entityName = 'Test Entity';
 
-        $manager = new Manager($finderMock);
-        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\CustomRepository');
+        $manager = new RepositoryManager($finderMock);
+        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\Manager\CustomRepository');
         $repository = $manager->getRepository($entityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Tests\CustomRepository', $repository);
+        $this->assertInstanceOf('FOQ\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
     }
 
     /**
@@ -51,7 +51,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $entityName = 'Test Entity';
 
-        $manager = new Manager($finderMock);
+        $manager = new RepositoryManager($finderMock);
         $manager->addEntity($entityName, $finderMock);
         $manager->getRepository('Missing Entity');
     }
@@ -67,7 +67,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
 
         $entityName = 'Test Entity';
 
-        $manager = new Manager($finderMock);
+        $manager = new RepositoryManager($finderMock);
         $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\MissingRepository');
         $manager->getRepository('Missing Entity');
     }