diff --git a/Transformer/ElasticaToModelAbstractDoctrineTransformer.php b/Doctrine/AbstractElasticaToModelTransformer.php
similarity index 91%
rename from Transformer/ElasticaToModelAbstractDoctrineTransformer.php
rename to Doctrine/AbstractElasticaToModelTransformer.php
index 6668660..3db7628 100644
--- a/Transformer/ElasticaToModelAbstractDoctrineTransformer.php
+++ b/Doctrine/AbstractElasticaToModelTransformer.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOQ\ElasticaBundle\Doctrine;
 
+use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
 use Elastica_Document;
 
 /**
@@ -9,7 +10,7 @@ use Elastica_Document;
  * This mapper assumes an exact match between
  * elastica documents ids and doctrine object ids
  */
-abstract class ElasticaToModelAbstractDoctrineTransformer implements ElasticaToModelTransformerInterface
+abstract class AbstractElasticaToModelTransformer implements ElasticaToModelTransformerInterface
 {
     /**
      * Repository to fetch the objects from
diff --git a/Provider/AbstractDoctrineProvider.php b/Doctrine/AbstractProvider.php
similarity index 95%
rename from Provider/AbstractDoctrineProvider.php
rename to Doctrine/AbstractProvider.php
index cb45f4f..b717390 100644
--- a/Provider/AbstractDoctrineProvider.php
+++ b/Doctrine/AbstractProvider.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOQ\ElasticaBundle\Doctrine;
 
+use FOQ\ElasticaBundle\Provider\ProviderInterface;
 use FOQ\ElasticaBundle\Transformer\ModelToElasticaTransformerInterface;
 use Elastica_Type;
 use Elastica_Document;
 use Closure;
 use InvalidArgumentException;
 
-abstract class AbstractDoctrineProvider implements ProviderInterface
+abstract class AbstractProvider implements ProviderInterface
 {
     protected $type;
     protected $objectManager;
diff --git a/Transformer/ElasticaToModelDoctrineMongoDBTransformer.php b/Doctrine/MongoDB/ElasticaToModelTransformer.php
similarity index 82%
rename from Transformer/ElasticaToModelDoctrineMongoDBTransformer.php
rename to Doctrine/MongoDB/ElasticaToModelTransformer.php
index e8fdb43..ae1bc96 100644
--- a/Transformer/ElasticaToModelDoctrineMongoDBTransformer.php
+++ b/Doctrine/MongoDB/ElasticaToModelTransformer.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOQ\ElasticaBundle\Doctrine\MongoDB;
 
+use FOQ\ElasticaBundle\Doctrine\AbstractElasticaToModelTransformer;
 use Elastica_Document;
 
 /**
@@ -9,7 +10,7 @@ use Elastica_Document;
  * This mapper assumes an exact match between
  * elastica documents ids and doctrine object ids
  */
-class ElasticaToModelDoctrineMongoDBTransformer extends ElasticaToModelAbstractDoctrineTransformer
+class ElasticaToModelTransformer extends AbstractElasticaToModelTransformer
 {
     /**
      * Fetch objects for theses identifier values
diff --git a/Provider/DoctrineMongoDBProvider.php b/Doctrine/MongoDB/Provider.php
similarity index 86%
rename from Provider/DoctrineMongoDBProvider.php
rename to Doctrine/MongoDB/Provider.php
index c4c8279..513ebb9 100644
--- a/Provider/DoctrineMongoDBProvider.php
+++ b/Doctrine/MongoDB/Provider.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOQ\ElasticaBundle\Doctrine\MongoDB;
 
-class DoctrineMongoDBProvider extends AbstractDoctrineProvider
+use FOQ\ElasticaBundle\Doctrine\AbstractProvider;
+
+class Provider extends AbstractProvider
 {
     /**
      * Counts the objects of a query builder
diff --git a/Transformer/ElasticaToModelDoctrineORMTransformer.php b/Doctrine/ORM/ElasticaToModelTransformer.php
similarity index 85%
rename from Transformer/ElasticaToModelDoctrineORMTransformer.php
rename to Doctrine/ORM/ElasticaToModelTransformer.php
index 9fc8b97..5d6ab0e 100644
--- a/Transformer/ElasticaToModelDoctrineORMTransformer.php
+++ b/Doctrine/ORM/ElasticaToModelTransformer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOQ\ElasticaBundle\Doctrine\ORM;
 
 use Elastica_Document;
 
@@ -9,7 +9,7 @@ use Elastica_Document;
  * This mapper assumes an exact match between
  * elastica documents ids and doctrine object ids
  */
-class ElasticaToModelDoctrineORMTransformer extends ElasticaToModelAbstractDoctrineTransformer
+class ElasticaToModelTransformer extends AbstractElasticaToModelTransformer
 {
     /**
      * Fetch objects for theses identifier values
diff --git a/Provider/DoctrineORMProvider.php b/Doctrine/ORM/Provider.php
similarity index 90%
rename from Provider/DoctrineORMProvider.php
rename to Doctrine/ORM/Provider.php
index 831deb4..3dc0628 100644
--- a/Provider/DoctrineORMProvider.php
+++ b/Doctrine/ORM/Provider.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOQ\ElasticaBundle\Doctrine\ORM;
 
-class DoctrineORMProvider extends AbstractDoctrineProvider
+use FOQ\ElasticaBundle\Doctrine\AbstractProvider;
+
+class Provider extends AbstractProvider
 {
     /**
      * Counts the objects of a query builder
diff --git a/Paginator/DoctrinePaginatorAdapter.php b/Doctrine/PaginatorAdapter.php
similarity index 90%
rename from Paginator/DoctrinePaginatorAdapter.php
rename to Doctrine/PaginatorAdapter.php
index 2c5fa30..1fd0b69 100644
--- a/Paginator/DoctrinePaginatorAdapter.php
+++ b/Doctrine/PaginatorAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOQ\ElasticaBundle\Doctrine;
 
 use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
 use Elastica_Searchable;
@@ -11,7 +11,7 @@ use Elastica_Query;
  *
  * Allows pagination of Elastica_Query
  */
-class DoctrinePaginatorAdapter extends AbstractPaginatorAdapter
+class PaginatorAdapter extends AbstractPaginatorAdapter
 {
     protected $transformer;
 
diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
index c95a4eb..fddb4f2 100644
--- a/Resources/config/mongodb.xml
+++ b/Resources/config/mongodb.xml
@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="foq_elastica.provider.prototype.mongodb" class="FOQ\ElasticaBundle\Provider\DoctrineMongoDBProvider" public="false" abstract="true">
+        <service id="foq_elastica.provider.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\Provider" public="false" abstract="true">
             <argument /> <!-- index -->
             <argument type="service" id="doctrine.odm.mongodb.document_manager" />
             <argument /> <!-- transformer -->
@@ -14,7 +14,7 @@
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.prototype.mongodb" class="FOQ\ElasticaBundle\Transformer\ElasticaToModelDoctrineMongoDBTransformer" public="false">
+        <service id="foq_elastica.elastica_to_model_transformer.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\ElasticaToModelTransformer" public="false">
             <argument type="service" id="doctrine.odm.mongodb.document_manager" />
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index bf3e0e9..4bab18f 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="foq_elastica.provider.prototype.orm" class="FOQ\ElasticaBundle\Provider\DoctrineORMProvider" public="false" abstract="true">
+        <service id="foq_elastica.provider.prototype.orm" class="FOQ\ElasticaBundle\Doctrine\ORM\Provider" public="false" abstract="true">
             <argument /> <!-- index -->
             <argument type="service" id="doctrine.orm.entity_manager" />
             <argument /> <!-- transformer -->
@@ -14,7 +14,7 @@
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.prototype.orm" class="FOQ\ElasticaBundle\Transformer\ElasticaToModelDoctrineTransformer" public="false">
+        <service id="foq_elastica.elastica_to_model_transformer.prototype.orm" class="FOQ\ElasticaBundle\Doctrine\ORM\Transformer" public="false">
             <argument type="service" id="doctrine.orm.entity_manager" />
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->