diff --git a/src/Annotation/RestAnnotationInterface.php b/src/Annotation/RestAnnotationInterface.php
index 4501bd3..56ecc94 100644
--- a/src/Annotation/RestAnnotationInterface.php
+++ b/src/Annotation/RestAnnotationInterface.php
@@ -1,11 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Paysera\Bundle\ApiBundle\Annotation;
 
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
-use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
-
 interface RestAnnotationInterface
 {
     public function isSeveralSupported(): bool;
diff --git a/src/Attribute/Body.php b/src/Attribute/Body.php
index 0440893..ed8ec65 100644
--- a/src/Attribute/Body.php
+++ b/src/Attribute/Body.php
@@ -7,7 +7,7 @@
 use Attribute;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_METHOD)]
 class Body implements RestAttributeInterface
diff --git a/src/Attribute/BodyContentType.php b/src/Attribute/BodyContentType.php
index 61cff9f..4507be8 100644
--- a/src/Attribute/BodyContentType.php
+++ b/src/Attribute/BodyContentType.php
@@ -6,7 +6,7 @@
 
 use Attribute;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_METHOD)]
 class BodyContentType implements RestAttributeInterface
diff --git a/src/Attribute/PathAttribute.php b/src/Attribute/PathAttribute.php
index 11b67df..860570b 100644
--- a/src/Attribute/PathAttribute.php
+++ b/src/Attribute/PathAttribute.php
@@ -8,7 +8,7 @@
 use Paysera\Bundle\ApiBundle\Entity\PathAttributeResolverOptions;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 class PathAttribute implements RestAttributeInterface
diff --git a/src/Attribute/Query.php b/src/Attribute/Query.php
index f651030..e47ff38 100644
--- a/src/Attribute/Query.php
+++ b/src/Attribute/Query.php
@@ -9,7 +9,7 @@
 use Paysera\Bundle\ApiBundle\Entity\QueryResolverOptions;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 class Query implements RestAttributeInterface
diff --git a/src/Attribute/RequiredPermissions.php b/src/Attribute/RequiredPermissions.php
index 062549f..0880414 100644
--- a/src/Attribute/RequiredPermissions.php
+++ b/src/Attribute/RequiredPermissions.php
@@ -6,7 +6,7 @@
 
 use Attribute;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 class RequiredPermissions implements RestAttributeInterface
diff --git a/src/Attribute/ResponseNormalization.php b/src/Attribute/ResponseNormalization.php
index c6f740c..22c1993 100644
--- a/src/Attribute/ResponseNormalization.php
+++ b/src/Attribute/ResponseNormalization.php
@@ -6,7 +6,7 @@
 
 use Attribute;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 #[Attribute(Attribute::TARGET_METHOD)]
 class ResponseNormalization implements RestAttributeInterface
diff --git a/src/Attribute/RestAttributeInterface.php b/src/Attribute/RestAttributeInterface.php
index c038606..957fd3d 100644
--- a/src/Attribute/RestAttributeInterface.php
+++ b/src/Attribute/RestAttributeInterface.php
@@ -5,7 +5,7 @@
 namespace Paysera\Bundle\ApiBundle\Attribute;
 
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 
 interface RestAttributeInterface
 {
diff --git a/src/Attribute/Validation.php b/src/Attribute/Validation.php
index 19cf05f..a336355 100644
--- a/src/Attribute/Validation.php
+++ b/src/Attribute/Validation.php
@@ -7,7 +7,7 @@
 use Attribute;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
 use Paysera\Bundle\ApiBundle\Entity\ValidationOptions;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 use Symfony\Component\Validator\Constraint;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
diff --git a/src/DependencyInjection/PayseraApiExtension.php b/src/DependencyInjection/PayseraApiExtension.php
index 39c3ae0..ac3d87b 100644
--- a/src/DependencyInjection/PayseraApiExtension.php
+++ b/src/DependencyInjection/PayseraApiExtension.php
@@ -25,15 +25,10 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config/services'));
-        if (class_exists(AttributeRouteControllerLoader::class)) {
-            $loader->load('annotations.xml');
-
-            if (PHP_VERSION_ID >= 80000) {
-                $loader->load('attributes.xml');
-            }
-        } else {
-            $loader->load('annotations_legacy.xml');
-        }
+        class_exists(AttributeRouteControllerLoader::class)
+            ? $loader->load('attributes.xml')
+            : $loader->load('annotations.xml')
+        ;
 
         $container->setParameter('paysera_api.locales', $config['locales']);
         if (count($config['locales']) === 0) {
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index d282980..c50611c 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -18,6 +18,11 @@
             <argument id="paysera_api.rest_request_options_registry" type="service"/>
         </service>
 
+        <service id="paysera_api.annotations.options_builder"
+                 class="Paysera\Bundle\ApiBundle\Service\RoutingLoader\RestRequestOptionsBuilder">
+            <argument type="service" id="paysera_api.rest_request_options_validator"/>
+        </service>
+
         <service class="Paysera\Bundle\ApiBundle\Service\ResponseBuilder" id="paysera_api.response_builder"/>
         <service class="\Paysera\Bundle\ApiBundle\Service\ErrorBuilder" id="paysera_api.error_builder">
             <call method="configureError">
diff --git a/src/Resources/config/services/annotations.xml b/src/Resources/config/services/annotations.xml
index bfd252d..35b69eb 100644
--- a/src/Resources/config/services/annotations.xml
+++ b/src/Resources/config/services/annotations.xml
@@ -2,13 +2,13 @@
 
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
-        <service decorates="routing.loader.attribute"
-                 parent="routing.loader.attribute"
-                 id="paysera_api.loader.attribute"
-                 class="Paysera\Bundle\ApiBundle\Service\Annotation\RoutingAnnotationLoader">
+        <service decorates="routing.loader.annotation"
+                 parent="routing.loader.annotation"
+                 id="paysera_api.annotations.loader"
+                 class="Paysera\Bundle\ApiBundle\Service\RoutingLoader\RoutingAnnotationLoader">
             <call method="setRequestHelper">
                 <argument type="service" id="paysera_api.rest_request_helper"/>
             </call>
@@ -16,10 +16,5 @@
                 <argument type="service" id="paysera_api.annotations.options_builder"/>
             </call>
         </service>
-
-        <service id="paysera_api.annotations.options_builder"
-                class="Paysera\Bundle\ApiBundle\Service\Annotation\RestRequestOptionsBuilder">
-            <argument type="service" id="paysera_api.rest_request_options_validator"/>
-        </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/annotations_legacy.xml b/src/Resources/config/services/annotations_legacy.xml
deleted file mode 100644
index 06531f1..0000000
--- a/src/Resources/config/services/annotations_legacy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service decorates="routing.loader.annotation"
-                 parent="routing.loader.annotation"
-                 id="paysera_api.annotations.loader"
-                 class="Paysera\Bundle\ApiBundle\Service\Annotation\RoutingAnnotationLoader">
-            <call method="setRequestHelper">
-                <argument type="service" id="paysera_api.rest_request_helper"/>
-            </call>
-            <call method="setRestRequestOptionsBuilder">
-                <argument type="service" id="paysera_api.annotations.options_builder"/>
-            </call>
-        </service>
-
-        <service id="paysera_api.annotations.options_builder"
-                class="Paysera\Bundle\ApiBundle\Service\Annotation\RestRequestOptionsBuilder">
-            <argument type="service" id="paysera_api.rest_request_options_validator"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/attributes.xml b/src/Resources/config/services/attributes.xml
index 0bec16e..77d4b6f 100644
--- a/src/Resources/config/services/attributes.xml
+++ b/src/Resources/config/services/attributes.xml
@@ -4,13 +4,17 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-<!--        <service id="paysera_api.attribute.loader"-->
-<!--                 class="Paysera\Bundle\ApiBundle\Service\Attribute\RoutingAttributeLoader">-->
-<!--            <tag name="routing.loader"/>-->
 
-<!--            <argument type="service" id="paysera_api.rest_request_helper"/>-->
-<!--            <argument type="service" id="paysera_api.rest_request_options_validator"/>-->
-<!--            <argument type="string">%kernel.environment%</argument>-->
-<!--        </service>-->
+        <service decorates="routing.loader.attribute"
+                 parent="routing.loader.attribute"
+                 id="paysera_api.loader.attribute"
+                 class="Paysera\Bundle\ApiBundle\Service\RoutingLoader\RoutingAnnotationLoader">
+            <call method="setRequestHelper">
+                <argument type="service" id="paysera_api.rest_request_helper"/>
+            </call>
+            <call method="setRestRequestOptionsBuilder">
+                <argument type="service" id="paysera_api.annotations.options_builder"/>
+            </call>
+        </service>
     </services>
 </container>
diff --git a/src/Service/Annotation/ReflectionMethodWrapper.php b/src/Service/RoutingLoader/ReflectionMethodWrapper.php
similarity index 96%
rename from src/Service/Annotation/ReflectionMethodWrapper.php
rename to src/Service/RoutingLoader/ReflectionMethodWrapper.php
index 9e22eb2..20fc145 100644
--- a/src/Service/Annotation/ReflectionMethodWrapper.php
+++ b/src/Service/RoutingLoader/ReflectionMethodWrapper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Paysera\Bundle\ApiBundle\Service\Annotation;
+namespace Paysera\Bundle\ApiBundle\Service\RoutingLoader;
 
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
 use ReflectionMethod;
diff --git a/src/Service/Annotation/RestRequestOptionsBuilder.php b/src/Service/RoutingLoader/RestRequestOptionsBuilder.php
similarity index 96%
rename from src/Service/Annotation/RestRequestOptionsBuilder.php
rename to src/Service/RoutingLoader/RestRequestOptionsBuilder.php
index eb006c9..fa5ef46 100644
--- a/src/Service/Annotation/RestRequestOptionsBuilder.php
+++ b/src/Service/RoutingLoader/RestRequestOptionsBuilder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Paysera\Bundle\ApiBundle\Service\Annotation;
+namespace Paysera\Bundle\ApiBundle\Service\RoutingLoader;
 
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
 use Paysera\Bundle\ApiBundle\Service\RestRequestOptionsValidator;
diff --git a/src/Service/Annotation/RoutingAnnotationLoader.php b/src/Service/RoutingLoader/RoutingAnnotationLoader.php
similarity index 96%
rename from src/Service/Annotation/RoutingAnnotationLoader.php
rename to src/Service/RoutingLoader/RoutingAnnotationLoader.php
index 7ac1f13..e3dfc21 100644
--- a/src/Service/Annotation/RoutingAnnotationLoader.php
+++ b/src/Service/RoutingLoader/RoutingAnnotationLoader.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Paysera\Bundle\ApiBundle\Service\Annotation;
+namespace Paysera\Bundle\ApiBundle\Service\RoutingLoader;
 
 use Paysera\Bundle\ApiBundle\Annotation\RestAnnotationInterface;
 use Paysera\Bundle\ApiBundle\Service\RestRequestHelper;
diff --git a/src/Service/Attribute/RoutingAttributeLoader.php b/src/Service/RoutingLoader/RoutingAttributeLoader.php
similarity index 97%
rename from src/Service/Attribute/RoutingAttributeLoader.php
rename to src/Service/RoutingLoader/RoutingAttributeLoader.php
index 76dc774..0684a2d 100644
--- a/src/Service/Attribute/RoutingAttributeLoader.php
+++ b/src/Service/RoutingLoader/RoutingAttributeLoader.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Paysera\Bundle\ApiBundle\Service\Attribute;
+namespace Paysera\Bundle\ApiBundle\Service\RoutingLoader;
 
 use Paysera\Bundle\ApiBundle\Attribute\RestAttributeInterface;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
diff --git a/tests/Unit/Service/Annotation/ReflectionMethodWrapperTest.php b/tests/Unit/Service/Annotation/ReflectionMethodWrapperTest.php
index a271b98..6a746d6 100644
--- a/tests/Unit/Service/Annotation/ReflectionMethodWrapperTest.php
+++ b/tests/Unit/Service/Annotation/ReflectionMethodWrapperTest.php
@@ -5,7 +5,7 @@
 
 use DateTime;
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
-use Paysera\Bundle\ApiBundle\Service\Annotation\ReflectionMethodWrapper;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\ReflectionMethodWrapper;
 use PHPUnit\Framework\TestCase;
 use ReflectionMethod;
 
diff --git a/tests/Unit/Service/Annotation/RestRequestOptionsBuilderTest.php b/tests/Unit/Service/Annotation/RestRequestOptionsBuilderTest.php
index d5b93f8..c56ae70 100644
--- a/tests/Unit/Service/Annotation/RestRequestOptionsBuilderTest.php
+++ b/tests/Unit/Service/Annotation/RestRequestOptionsBuilderTest.php
@@ -9,7 +9,7 @@
 use Paysera\Bundle\ApiBundle\Annotation\RestAnnotationInterface;
 use Paysera\Bundle\ApiBundle\Entity\RestRequestOptions;
 use Paysera\Bundle\ApiBundle\Exception\ConfigurationException;
-use Paysera\Bundle\ApiBundle\Service\Annotation\RestRequestOptionsBuilder;
+use Paysera\Bundle\ApiBundle\Service\RoutingLoader\RestRequestOptionsBuilder;
 use Paysera\Bundle\ApiBundle\Service\RestRequestOptionsValidator;
 use ReflectionMethod;