diff --git a/src/Compatibility/DependencyLoader.php b/src/Compatibility/DependencyLoader.php
index 4d089e1e1..ba60218de 100644
--- a/src/Compatibility/DependencyLoader.php
+++ b/src/Compatibility/DependencyLoader.php
@@ -59,8 +59,6 @@ public function loadServices(): void
         # load other data
         if ($versionCompare->gte('6.4')) {
             $loader->load('compatibility/services_6.4.xml');
-        } elseif ($versionCompare->gte('6.3.5.0')) {
-            $loader->load('compatibility/services_6.3.5.0.xml');
         }
 
         if ($versionCompare->gte('6.5')) {
diff --git a/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php b/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php
deleted file mode 100644
index 0a4112bfb..000000000
--- a/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute;
-
-use Kiener\MolliePayments\Service\Payment\Remover\PaymentMethodRemoverInterface;
-use Shopware\Core\Checkout\Payment\SalesChannel\AbstractPaymentMethodRoute;
-use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Symfony\Component\HttpFoundation\Request;
-
-class RemovePaymentMethodRoute63 extends AbstractPaymentMethodRoute
-{
-    /**
-     * @var AbstractPaymentMethodRoute
-     */
-    private $corePaymentMethodRoute;
-
-    /**
-     * @var PaymentMethodRemoverInterface[]
-     */
-    private $paymentMethodRemovers;
-
-    /**
-     * @param AbstractPaymentMethodRoute                  $corePaymentMethodRoute
-     * @param \Traversable<PaymentMethodRemoverInterface> $paymentMethodRemovers
-     */
-    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, \Traversable $paymentMethodRemovers)
-    {
-        $this->corePaymentMethodRoute = $corePaymentMethodRoute;
-        $this->paymentMethodRemovers = iterator_to_array($paymentMethodRemovers);
-    }
-
-    /**
-     * @return AbstractPaymentMethodRoute
-     */
-    public function getDecorated(): AbstractPaymentMethodRoute
-    {
-        return $this->corePaymentMethodRoute;
-    }
-
-    /**
-     * @param Request             $request
-     * @param SalesChannelContext $context
-     * @return PaymentMethodRouteResponse
-     */
-    public function load(Request $request, SalesChannelContext $context): PaymentMethodRouteResponse
-    {
-        $originalData = $this->corePaymentMethodRoute->load($request, $context);
-
-        foreach ($this->paymentMethodRemovers as $paymentMethodRemover) {
-            $originalData = $paymentMethodRemover->removePaymentMethods($originalData, $context);
-        }
-
-        return $originalData;
-    }
-}
diff --git a/src/Controller/Api/Order/Sw6/OrderController.php b/src/Controller/Api/Order/Sw6/OrderController.php
deleted file mode 100644
index eeef3cfad..000000000
--- a/src/Controller/Api/Order/Sw6/OrderController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class OrderController extends OrderControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw6/RefundController.php b/src/Controller/Api/Order/Sw6/RefundController.php
deleted file mode 100644
index 012b9059a..000000000
--- a/src/Controller/Api/Order/Sw6/RefundController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class RefundController extends RefundControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw6/ShippingController.php b/src/Controller/Api/Order/Sw6/ShippingController.php
deleted file mode 100644
index c7a9086f2..000000000
--- a/src/Controller/Api/Order/Sw6/ShippingController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class ShippingController extends ShippingControllerBase
-{
-}
diff --git a/src/Controller/Api/Payment/Sw6/ReturnController.php b/src/Controller/Api/Payment/Sw6/ReturnController.php
deleted file mode 100644
index 2ce3887b9..000000000
--- a/src/Controller/Api/Payment/Sw6/ReturnController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Payment\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=false, "auth_enabled"=false})
- */
-class ReturnController extends ReturnControllerBase
-{
-}
diff --git a/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php b/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php
deleted file mode 100644
index ee0e442e6..000000000
--- a/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\PaymentMethod\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class PaymentMethodController extends PaymentMethodControllerBase
-{
-}
diff --git a/src/Controller/Api/PluginConfig/Sw6/ConfigController.php b/src/Controller/Api/PluginConfig/Sw6/ConfigController.php
deleted file mode 100644
index fe2ec2cfe..000000000
--- a/src/Controller/Api/PluginConfig/Sw6/ConfigController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\PluginConfig\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class ConfigController extends ConfigControllerBase
-{
-}
diff --git a/src/Controller/Api/Subscription/Sw6/SubscriptionController.php b/src/Controller/Api/Subscription/Sw6/SubscriptionController.php
deleted file mode 100755
index dfa011bbc..000000000
--- a/src/Controller/Api/Subscription/Sw6/SubscriptionController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Subscription\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class SubscriptionController extends SubscriptionControllerBase
-{
-}
diff --git a/src/Controller/Api/Support/Sw6/SupportController.php b/src/Controller/Api/Support/Sw6/SupportController.php
deleted file mode 100644
index 9cec02f01..000000000
--- a/src/Controller/Api/Support/Sw6/SupportController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Support\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class SupportController extends SupportControllerBase
-{
-}
diff --git a/src/Controller/Api/Webhook/Sw6/WebhookController.php b/src/Controller/Api/Webhook/Sw6/WebhookController.php
deleted file mode 100644
index ec196b66b..000000000
--- a/src/Controller/Api/Webhook/Sw6/WebhookController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Webhook\Sw6;
-
-use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionSkippedException;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade;
-use Kiener\MolliePayments\Repository\Order\OrderRepository;
-use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=false, "auth_enabled"=false})
- */
-class WebhookController extends WebhookControllerBase
-{
-}
diff --git a/src/Controller/Storefront/POS/Sw6/PosController.php b/src/Controller/Storefront/POS/Sw6/PosController.php
deleted file mode 100644
index aa46ec5c4..000000000
--- a/src/Controller/Storefront/POS/Sw6/PosController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\POS\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class PosController extends PosControllerBase
-{
-}
diff --git a/src/Controller/Storefront/iDEAL/Sw6/iDealController.php b/src/Controller/Storefront/iDEAL/Sw6/iDealController.php
deleted file mode 100644
index f9b0e39bc..000000000
--- a/src/Controller/Storefront/iDEAL/Sw6/iDealController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\iDEAL\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class iDealController extends iDealControllerBase
-{
-}
diff --git a/src/Resources/config/compatibility/services_6.2.xml b/src/Resources/config/compatibility/services_6.2.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Resources/config/compatibility/services_6.3.5.0.xml b/src/Resources/config/compatibility/services_6.3.5.0.xml
deleted file mode 100644
index 6ea7930c7..000000000
--- a/src/Resources/config/compatibility/services_6.3.5.0.xml
+++ /dev/null
@@ -1,24 +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 id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute63"
-                 decorates="Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRoute">
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute63.inner"/>
-
-            <argument type="tagged" tag="mollie_payments.payment_method.remover.sw63"/>
-        </service>
-
-        <service id="mollie_payments.mail_service" class="Kiener\MolliePayments\Service\Mail\MailService63">
-            <argument type="service" id="Shopware\Core\Framework\Validation\DataValidator"/>
-            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MessageFactory"/>
-            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MailSender"/>
-        </service>
-
-    </services>
-
-</container>
diff --git a/src/Resources/config/routes/admin-api/order.xml b/src/Resources/config/routes/admin-api/order.xml
index 0b0630af4..8163d0007 100644
--- a/src/Resources/config/routes/admin-api/order.xml
+++ b/src/Resources/config/routes/admin-api/order.xml
@@ -3,5 +3,17 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.action.mollie.order.payment-url" path="/api/_action/mollie/order/payment-url" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase::paymentUrl</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
 
+    <route id="api.action.mollie.order.payment-url.legacy" path="/api/v{version}/_action/mollie/order/payment-url" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase::paymentUrlLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
 </routes>
diff --git a/src/Resources/config/routes/admin-api/payment_method.xml b/src/Resources/config/routes/admin-api/payment_method.xml
index 0b0630af4..9169bc0c4 100644
--- a/src/Resources/config/routes/admin-api/payment_method.xml
+++ b/src/Resources/config/routes/admin-api/payment_method.xml
@@ -4,4 +4,18 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+    <route id="api.mollie.payment-method.update-methods" path="/api/_action/mollie/payment-method/update-methods" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase::updatePaymentMethods</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.payment-method.update-methods.legacy" path="/api/v{version}/_action/mollie/payment-method/update-methods" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase::updatePaymentMethodsLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
 </routes>
diff --git a/src/Resources/config/routes/admin-api/refund.xml b/src/Resources/config/routes/admin-api/refund.xml
index 0b0630af4..e952ff1ea 100644
--- a/src/Resources/config/routes/admin-api/refund.xml
+++ b/src/Resources/config/routes/admin-api/refund.xml
@@ -3,5 +3,80 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.mollie.refund.order" path="/api/mollie/refund/order" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundOrderNumber</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
 
+    <route id="api.action.mollie.refund-manager.data" path="/api/_action/mollie/refund-manager/data" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundManagerData</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.list" path="/api/_action/mollie/refund/list" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::list</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.total" path="/api/_action/mollie/refund/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::total</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund" path="/api/_action/mollie/refund" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundOrderID</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.cancel" path="/api/_action/mollie/refund/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::cancel</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund-manager.data.legacy" path="/api/v{version}/_action/mollie/refund-manager/data" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundManagerDataLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.list.legacy" path="/api/v{version}/_action/mollie/refund/list" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::listLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.total.legacy" path="/api/v{version}/_action/mollie/refund/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::totalLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.legacy" path="/api/v{version}/_action/mollie/refund" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.cancel.legacy" path="/api/v{version}/_action/mollie/refund/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::cancelLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
 </routes>
diff --git a/src/Resources/config/routes/admin-api/return.xml b/src/Resources/config/routes/admin-api/return.xml
index 0b0630af4..f23b5ee55 100644
--- a/src/Resources/config/routes/admin-api/return.xml
+++ b/src/Resources/config/routes/admin-api/return.xml
@@ -3,5 +3,17 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.mollie.payment-return" path="/api/mollie/payment/return/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase::returnAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
 
+    <route id="api.mollie.payment-return-legacy" path="/api/v{version}/mollie/payment/return/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase::returnActionLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
 </routes>
diff --git a/src/Resources/config/routes/admin-api/shipping.xml b/src/Resources/config/routes/admin-api/shipping.xml
index 0b0630af4..41ae4ea5c 100644
--- a/src/Resources/config/routes/admin-api/shipping.xml
+++ b/src/Resources/config/routes/admin-api/shipping.xml
@@ -4,4 +4,96 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+
+    <route id="api.action.mollie.ship.status" path="/api/_action/mollie/ship/status" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::status</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.status.legacy" path="/api/v{version}/_action/mollie/ship/status" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::statusLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.total" path="/api/_action/mollie/ship/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::total</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.total.legacy" path="/api/v{version}/_action/mollie/ship/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::totalLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order" path="/api/mollie/ship/order" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order.deprecated" path="/api/mollie/ship/order" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderOperationalDeprecated</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order.batch" path="/api/mollie/ship/order/batch" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderBatchOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.item" path="/api/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.item.deprecated" path="/api/mollie/ship/item" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemOperationalDeprecated</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.order" path="/api/_action/mollie/ship" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderAdmin</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.order.legacy" path="/api/v{version}/_action/mollie/ship" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderAdminLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.item" path="/api/_action/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemAdmin</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.item.legacy" path="/api/v{version}/_action/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemAdminLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
 </routes>
diff --git a/src/Resources/config/routes/admin-api/subscription.xml b/src/Resources/config/routes/admin-api/subscription.xml
new file mode 100644
index 000000000..02d652105
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/subscription.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.action.mollie.subscription.cancel" path="/api/_action/mollie/subscriptions/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::cancel</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.cancel_legacy" path="/api/v{version}/_action/mollie/subscriptions/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::cancelLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.pause" path="/api/_action/mollie/subscriptions/pause" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::pause</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.pause_legacy" path="/api/v{version}/_action/mollie/subscriptions/pause" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::pauseLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.resume" path="/api/_action/mollie/subscriptions/resume" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::resume</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.resume_legacy" path="/api/v{version}/_action/mollie/subscriptions/resume" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::resumeLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.skip" path="/api/_action/mollie/subscriptions/skip" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::skip</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.skip_legacy" path="/api/v{version}/_action/mollie/subscriptions/skip" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::skipLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/admin-api/support.xml b/src/Resources/config/routes/admin-api/support.xml
index 0b0630af4..a033c838a 100644
--- a/src/Resources/config/routes/admin-api/support.xml
+++ b/src/Resources/config/routes/admin-api/support.xml
@@ -4,4 +4,18 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+    <route id="api.action.mollie.support.request" path="/api/_action/mollie/support/request" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase::requestSupport</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.support.request.legacy" path="/api/v{version}/_action/mollie/support/request" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase::requestSupportLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
 </routes>
diff --git a/src/Resources/config/routes/admin-api/webhook.xml b/src/Resources/config/routes/admin-api/webhook.xml
index 0b0630af4..9268f416a 100644
--- a/src/Resources/config/routes/admin-api/webhook.xml
+++ b/src/Resources/config/routes/admin-api/webhook.xml
@@ -4,4 +4,59 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+    <route id="api.mollie.webhook" path="/api/mollie/webhook/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook-legacy" path="/api/v{version}/mollie/webhook/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription" path="/api/mollie/webhook/subscription/{swSubscriptionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_renew" path="/api/mollie/webhook/subscription/{swSubscriptionId}/renew" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionRenewAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_renew-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/renew" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionRenewLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_paymentmethod" path="/api/mollie/webhook/subscription/{swSubscriptionId}/mandate/update" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionMandateUpdatedAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_paymentmethod-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/mandate/update" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionMandateUpdatedLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
 </routes>
diff --git a/src/Resources/config/routes/storefront/credit_card.xml b/src/Resources/config/routes/storefront/credit_card.xml
index d8cbc7c3a..209ae9215 100644
--- a/src/Resources/config/routes/storefront/credit_card.xml
+++ b/src/Resources/config/routes/storefront/credit_card.xml
@@ -6,16 +6,19 @@
 
     <route id="frontend.mollie.components.storeCardToken" path="/mollie/components/store-card-token/{customerId}/{cardToken}" methods="GET">
         <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::storeCardToken</default>
+        <default key="_routeScope">storefront</default>
         <option key="seo">false</option>
     </route>
 
     <route id="frontend.mollie.components.storeMandateId" path="/mollie/components/store-mandate-id/{customerId}/{mandateId}" methods="GET">
         <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::storeMandateId</default>
+        <default key="_routeScope">storefront</default>
         <option key="seo">false</option>
     </route>
 
     <route id="frontend.mollie.components.revokeMandate" path="/mollie/components/revoke-mandate/{customerId}/{mandateId}" methods="GET">
         <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::revokeMandate</default>
+        <default key="_routeScope">storefront</default>
         <option key="seo">false</option>
     </route>
 </routes>
diff --git a/src/Resources/config/routes/storefront/ideal.xml b/src/Resources/config/routes/storefront/ideal.xml
index 0b0630af4..1b2fe8528 100644
--- a/src/Resources/config/routes/storefront/ideal.xml
+++ b/src/Resources/config/routes/storefront/ideal.xml
@@ -4,4 +4,10 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+    <route id="frontend.mollie.ideal.storeIssuer" path="/mollie/ideal/store-issuer/{customerId}/{issuerId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\iDeal\iDealControllerBase::storeIssuer</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
 </routes>
diff --git a/src/Resources/config/routes/storefront/mollie_failure.xml b/src/Resources/config/routes/storefront/mollie_failure.xml
index 0fd2f2b5b..bfa1a6648 100644
--- a/src/Resources/config/routes/storefront/mollie_failure.xml
+++ b/src/Resources/config/routes/storefront/mollie_failure.xml
@@ -10,8 +10,8 @@
         <requirement key="transactionId">.*</requirement>
         <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase::paymentFailedAction</default>
         <default key="_routeScope">storefront</default>
-        <option key="seo">false</option>
         <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
     </route>
 
     <route id="frontend.mollie.payment.retry"
diff --git a/src/Resources/config/routes/storefront/pos.xml b/src/Resources/config/routes/storefront/pos.xml
index 0b0630af4..07b7e72d2 100644
--- a/src/Resources/config/routes/storefront/pos.xml
+++ b/src/Resources/config/routes/storefront/pos.xml
@@ -4,4 +4,22 @@
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
 
+    <route id="frontend.mollie.pos.storeTerminal" path="/mollie/pos/store-terminal/{customerId}/{terminalId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::storeTerminal</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.pos.checkout" path="/mollie/pos/checkout" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::checkoutAction</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.pos.checkout_status" path="/mollie/pos/{orderId}/{molliePaymentId}/status" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::statusAction</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
 </routes>
diff --git a/src/Resources/config/routes/storefront/shipping.xml b/src/Resources/config/routes/storefront/shipping.xml
deleted file mode 100644
index 0b0630af4..000000000
--- a/src/Resources/config/routes/storefront/shipping.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing
-        https://symfony.com/schema/routing/routing-1.0.xsd">
-
-</routes>
diff --git a/src/Resources/config/routes/storefront/subscription.xml b/src/Resources/config/routes/storefront/subscription.xml
deleted file mode 100644
index 0b0630af4..000000000
--- a/src/Resources/config/routes/storefront/subscription.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing
-        https://symfony.com/schema/routing/routing-1.0.xsd">
-
-</routes>
diff --git a/src/Resources/config/routes/storefront/support.xml b/src/Resources/config/routes/storefront/support.xml
deleted file mode 100644
index 0b0630af4..000000000
--- a/src/Resources/config/routes/storefront/support.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing
-        https://symfony.com/schema/routing/routing-1.0.xsd">
-
-</routes>
diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml
index 9777ca28c..078c98d5d 100644
--- a/src/Resources/config/services/controller.xml
+++ b/src/Resources/config/services/controller.xml
@@ -93,6 +93,14 @@
             <tag name="controller.service_arguments"/>
         </service>
 
+        <service id="Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase">
+            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
+            <call method="setContainer">
+                <argument type="service" id="service_container"/>
+            </call>
+            <tag name="controller.service_arguments"/>
+        </service>
+
         <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
         <!-- Storefront Controller -->
 
@@ -183,13 +191,6 @@
             <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase">
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-            <tag name="controller.service_arguments"/>
-        </service>
 
         <service id="Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase">
             <argument type="service"
diff --git a/src/Subscriber/KernelSubscriber.php b/src/Subscriber/KernelSubscriber.php
index ec619c01c..6efa238dc 100644
--- a/src/Subscriber/KernelSubscriber.php
+++ b/src/Subscriber/KernelSubscriber.php
@@ -3,7 +3,6 @@
 
 namespace Kiener\MolliePayments\Subscriber;
 
-
 use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\PlatformRequest;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -23,13 +22,12 @@ public function onModifyRouteScope(ControllerEvent $event): void
     {
         $attributes = $event->getRequest()->attributes;
 
-        /** @var RouteScope|null|string $routeScope */
+        /** @var null|RouteScope|string $routeScope */
         $routeScope = $attributes->get(PlatformRequest::ATTRIBUTE_ROUTE_SCOPE);
         if (is_string($routeScope)) {
-
             $routeScope = new RouteScope(['scopes'=>[$routeScope]]);
 
             $attributes->set(PlatformRequest::ATTRIBUTE_ROUTE_SCOPE, $routeScope);
         }
     }
-}
\ No newline at end of file
+}