diff --git a/DependencyInjection/AddValidatorInitializersPass.php b/DependencyInjection/AddValidatorInitializersPass.php
deleted file mode 100644
index 58cc93a..0000000
--- a/DependencyInjection/AddValidatorInitializersPass.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace Symfony\Component\Validator\DependencyInjection;
-use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
-use Symfony\Component\Validator\Util\LegacyTranslatorProxy;
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Robin Chalas <robin.chalas@gmail.com>
- */
-class AddValidatorInitializersPass implements CompilerPassInterface
-{
-    private $builderService;
-    private $initializerTag;
-
-    public function __construct(string $builderService = 'validator.builder', string $initializerTag = 'validator.initializer')
-    {
-        $this->builderService = $builderService;
-        $this->initializerTag = $initializerTag;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->builderService)) {
-            return;
-        }
-        $initializers = [];
-        foreach ($container->findTaggedServiceIds($this->initializerTag, true) as $id => $attributes) {
-            $initializers[] = new Reference($id);
-        }
-        $container->getDefinition($this->builderService)->addMethodCall('addObjectInitializers', [$initializers]);
-        // @deprecated logic, to be removed in Symfony 5.0
-        $builder = $container->getDefinition($this->builderService);
-        $calls = [];
-        foreach ($builder->getMethodCalls() as list($method, $arguments)) {
-            if ('setTranslator' === $method) {
-                if (!$arguments[0] instanceof Reference) {
-                    $translator = $arguments[0];
-                } elseif ($container->has($arguments[0])) {
-                    $translator = $container->findDefinition($arguments[0]);
-                } else {
-                    continue;
-                }
-                while (!($class = $translator->getClass()) && $translator instanceof ChildDefinition) {
-                    $translator = $translator->getParent();
-                }
-                if (!is_subclass_of($class, LegacyTranslatorInterface::class)) {
-                    $arguments[0] = (new Definition(LegacyTranslatorProxy::class))->addArgument($arguments[0]);
-                }
-            }
-            $calls[] = [$method, $arguments];
-        }
-        $builder->setMethodCalls($calls);
-    }
-}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
new file mode 100644
index 0000000..1b31c83
--- /dev/null
+++ b/DependencyInjection/Configuration.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Bluesquare\ValidatorBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class Configuration implements ConfigurationInterface
+{
+
+    /**
+     * Generates the configuration tree builder.
+     *
+     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $treeBuilder->root('validator');
+        return ($treeBuilder);
+    }
+}
diff --git a/DependencyInjection/ValidatorExtension.php b/DependencyInjection/ValidatorExtension.php
new file mode 100644
index 0000000..d17a1f2
--- /dev/null
+++ b/DependencyInjection/ValidatorExtension.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Bluesquare\ValidatorBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ValidatorExtension extends Extension
+{
+
+    /**
+     * Loads a specific configuration.
+     *
+     * @throws \InvalidArgumentException When provided tag is not defined in this extension
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config'));
+        $loader->load('services.yaml');
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        return $config;
+    }
+
+    public function getAlias()
+    {
+        return parent::getAlias(); // TODO: Change the autogenerated stub
+    }
+}
diff --git a/Ressources/config/services.yaml b/Ressources/config/services.yaml
index 118830d..cd3ba03 100644
--- a/Ressources/config/services.yaml
+++ b/Ressources/config/services.yaml
@@ -1,6 +1,7 @@
 services:
-  _default:
+  bluesquare.validator:
+    class: Bluesquare\ValidatorBundle\Services\Validator
     autowire: true
-    autoconfigure: true
-    public: false
-    tags: ['controller.service_arguments']
+    public: true
+    arguments: ['@request_stack', '@translator.data_collector']
+  Bluesquare\ValidatorBundle\Services\Validator: '@bluesquare.validator'
diff --git a/src/ValidatorBundle.php b/Services/Validator.php
similarity index 98%
rename from src/ValidatorBundle.php
rename to Services/Validator.php
index e99218a..a2432fa 100644
--- a/src/ValidatorBundle.php
+++ b/Services/Validator.php
@@ -1,14 +1,11 @@
 <?php
 
-namespace Bluesquare;
+namespace Bluesquare\ValidatorBundle\Services;
 
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Traversable;
 
-class ValidatorBundle extends Bundle
+class Validator
 {
     protected $request;
     protected $context;
diff --git a/ValidatorBundle.php b/ValidatorBundle.php
new file mode 100644
index 0000000..08195a2
--- /dev/null
+++ b/ValidatorBundle.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Bluesquare\ValidatorBundle;
+
+use Bluesquare\ValidatorBundle\DependencyInjection\ValidatorExtension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ValidatorBundle extends Bundle
+{
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+    }
+
+    public function getContainerExtension()
+    {
+        if (null === $this->extension)
+            $this->extension = new ValidatorExtension();
+        return $this->extension;
+    }
+}
diff --git a/composer.json b/composer.json
index 3980cd7..9501e2e 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Bluesquare\\": "src/"
+            "Bluesquare\\": "/"
         }
     }
 }