diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index c8f9529..4ce742b 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -5,15 +5,18 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <!-- Public services -->
+        <!-- Public -->
         <service id="Ansien\FormToJsonBundle\Transformer\Service\FormTransformerInterface"
                  class="Ansien\FormToJsonBundle\Transformer\Service\FormTransformer"
                  public="true">
             <argument type="service" id="Ansien\FormToJsonBundle\Transformer\Context\TransformerContext"/>
         </service>
 
-        <!-- Private services -->
+        <!-- Private -->
         <service id="Ansien\FormToJsonBundle\Transformer\Context\TransformerContext" />
+        <instanceof id="Ansien\FormToJsonBundle\Transformer\TypeTransformerInterface">
+            <tag name="form_to_json_bundle.type_transformer"/>
+        </instanceof>
 
         <!-- Builtin Transformers -->
         <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\FormTypeTransformer">
@@ -89,10 +92,10 @@
         </service>
 
         <!-- DateTime -->
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\DateTypeTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\DateTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\DateIntervalTypeTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\DateIntervalTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
         <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\DateTimeTypeTransformer">
@@ -109,13 +112,13 @@
         </service>
 
         <!-- Other -->
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\CheckboxTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Other\CheckboxTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\FileTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Other\FileTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\DateTime\RadioTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Other\RadioTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
 
@@ -133,24 +136,14 @@
         </service>
 
         <!-- Button -->
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Hidden\ButtonTypeTransformer">
-            <argument type="service" id="translator"/>
-        </service>
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Hidden\ResetTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ButtonTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Hidden\SubmitTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ResetTypeTransformer">
             <argument type="service" id="translator"/>
         </service>
-
-        <!-- Field Groups -->
-        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\CollectionTypeTransformer">
+        <service id="Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\SubmitTypeTransformer">
             <argument type="service" id="translator"/>
-            <argument type="service" id="Ansien\FormToJsonBundle\Transformer\Service\FormTransformerInterface"/>
         </service>
-        <!-- Transformers -->
-        <instanceof id="Ansien\FormToJsonBundle\Transformer\TypeTransformerInterface">
-            <tag name="form_to_json_bundle.type_transformer"/>
-        </instanceof>
     </services>
 </container>
diff --git a/src/Transformer/BuiltIn/Button/ButtonTypeTypeTransformer.php b/src/Transformer/BuiltIn/Button/ButtonTypeTransformer.php
similarity index 92%
rename from src/Transformer/BuiltIn/Button/ButtonTypeTypeTransformer.php
rename to src/Transformer/BuiltIn/Button/ButtonTypeTransformer.php
index 52e4c91..d9437c4 100644
--- a/src/Transformer/BuiltIn/Button/ButtonTypeTypeTransformer.php
+++ b/src/Transformer/BuiltIn/Button/ButtonTypeTransformer.php
@@ -11,7 +11,7 @@
 /**
  * @see https://symfony.com/doc/current/reference/forms/types/button.html
  */
-class ButtonTypeTypeTransformer extends AbstractTypeTransformer
+class ButtonTypeTransformer extends AbstractTypeTransformer
 {
     public function __construct(protected TranslatorInterface $translator)
     {
diff --git a/src/Transformer/BuiltIn/Button/ResetTypeTypeTransformer.php b/src/Transformer/BuiltIn/Button/ResetTypeTransformer.php
similarity index 92%
rename from src/Transformer/BuiltIn/Button/ResetTypeTypeTransformer.php
rename to src/Transformer/BuiltIn/Button/ResetTypeTransformer.php
index ff296ad..3db0c9d 100644
--- a/src/Transformer/BuiltIn/Button/ResetTypeTypeTransformer.php
+++ b/src/Transformer/BuiltIn/Button/ResetTypeTransformer.php
@@ -11,7 +11,7 @@
 /**
  * @see https://symfony.com/doc/current/reference/forms/types/reset.html
  */
-class ResetTypeTypeTransformer extends AbstractTypeTransformer
+class ResetTypeTransformer extends AbstractTypeTransformer
 {
     public function __construct(protected TranslatorInterface $translator)
     {
diff --git a/src/Transformer/BuiltIn/Button/SubmitTypeTypeTransformer.php b/src/Transformer/BuiltIn/Button/SubmitTypeTransformer.php
similarity index 93%
rename from src/Transformer/BuiltIn/Button/SubmitTypeTypeTransformer.php
rename to src/Transformer/BuiltIn/Button/SubmitTypeTransformer.php
index 948de5e..d278aa2 100644
--- a/src/Transformer/BuiltIn/Button/SubmitTypeTypeTransformer.php
+++ b/src/Transformer/BuiltIn/Button/SubmitTypeTransformer.php
@@ -11,7 +11,7 @@
 /**
  * @see https://symfony.com/doc/current/reference/forms/types/submit.html
  */
-class SubmitTypeTypeTransformer extends AbstractTypeTransformer
+class SubmitTypeTransformer extends AbstractTypeTransformer
 {
     public const OPTIONS = [
         'validate',
diff --git a/tests/TransformTest.php b/tests/TransformTest.php
index 5f504ae..89b2930 100644
--- a/tests/TransformTest.php
+++ b/tests/TransformTest.php
@@ -5,9 +5,9 @@
 namespace Ansien\FormToJsonBundle\Tests;
 
 use Ansien\FormToJsonBundle\Tests\TestClasses\SuperFormType;
-use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ButtonTypeTypeTransformer;
-use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ResetTypeTypeTransformer;
-use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\SubmitTypeTypeTransformer;
+use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ButtonTypeTransformer;
+use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\ResetTypeTransformer;
+use Ansien\FormToJsonBundle\Transformer\BuiltIn\Button\SubmitTypeTransformer;
 use Ansien\FormToJsonBundle\Transformer\BuiltIn\Choice\ChoiceTypeTypeTransformer;
 use Ansien\FormToJsonBundle\Transformer\BuiltIn\Choice\CountryTypeTypeTransformer;
 use Ansien\FormToJsonBundle\Transformer\BuiltIn\Choice\CurrencyTypeTypeTransformer;
@@ -1884,9 +1884,9 @@ public function test(): void
         // Hidden
         $transformerContext->addTransformer(new HiddenTypeTransformer($this->translator));
         // Button
-        $transformerContext->addTransformer(new ButtonTypeTypeTransformer($this->translator));
-        $transformerContext->addTransformer(new ResetTypeTypeTransformer($this->translator));
-        $transformerContext->addTransformer(new SubmitTypeTypeTransformer($this->translator));
+        $transformerContext->addTransformer(new ButtonTypeTransformer($this->translator));
+        $transformerContext->addTransformer(new ResetTypeTransformer($this->translator));
+        $transformerContext->addTransformer(new SubmitTypeTransformer($this->translator));
 
         $result = $transformer->transform($form);