diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 4d93ff3a..fda610e9 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -2,7 +2,7 @@
 
 <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">
     <imports>
-        <import resource="services/*.xml" />
+        <import resource="services/**.xml" />
     </imports>
 
     <parameters>
@@ -11,7 +11,7 @@
     </parameters>
 
     <services>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.date_time_provider" class="Sylius\InvoicingPlugin\SystemDateTimeProvider" />
 
diff --git a/src/Resources/config/services/actions.xml b/src/Resources/config/services/actions.xml
index f86ea25b..88e74775 100644
--- a/src/Resources/config/services/actions.xml
+++ b/src/Resources/config/services/actions.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.ui.action.download_invoice" class="Sylius\InvoicingPlugin\Ui\Action\DownloadInvoiceAction">
             <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
diff --git a/src/Resources/config/services/cli.xml b/src/Resources/config/services/cli.xml
index f79d6628..00975c36 100644
--- a/src/Resources/config/services/cli.xml
+++ b/src/Resources/config/services/cli.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.cli.generate_invoices" class="Sylius\InvoicingPlugin\Cli\GenerateInvoicesCommand">
             <argument type="service" id="sylius_invoicing_plugin.creator.mass_invoices" />
diff --git a/src/Resources/config/services/converters.xml b/src/Resources/config/services/converters.xml
index c2c75d21..da25fa26 100644
--- a/src/Resources/config/services/converters.xml
+++ b/src/Resources/config/services/converters.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.converter.order_item_units_to_line_items" class="Sylius\InvoicingPlugin\Converter\OrderItemUnitsToLineItemsConverter">
             <argument type="service" id="sylius_invoicing_plugin.provider.tax_rate_percentage" />
diff --git a/src/Resources/config/services/fixtures.xml b/src/Resources/config/services/fixtures.xml
index 3dbc5c3d..6199cdb6 100644
--- a/src/Resources/config/services/fixtures.xml
+++ b/src/Resources/config/services/fixtures.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.fixture.example_factory.invoicing_plugin_shop_billing_data" class="Sylius\InvoicingPlugin\Fixture\Factory\ShopBillingDataExampleFactory">
             <argument id="sylius.repository.channel" type="service"/>
diff --git a/src/Resources/config/services/generators.xml b/src/Resources/config/services/generators.xml
index 8b8abb92..a819f479 100644
--- a/src/Resources/config/services/generators.xml
+++ b/src/Resources/config/services/generators.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.generator.invoice_number_generator" class="Sylius\InvoicingPlugin\Generator\SequentialInvoiceNumberGenerator">
             <argument type="service" id="sylius_invoicing_plugin.repository.invoice_sequence" />
diff --git a/src/Resources/config/services/listeners.xml b/src/Resources/config/services/listeners.xml
index 7828a34f..576ea7d8 100644
--- a/src/Resources/config/services/listeners.xml
+++ b/src/Resources/config/services/listeners.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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">
-    <imports>
-        <import resource="events/*.xml" />
-    </imports>
-
     <services>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.event_producer.order_payment_paid" class="Sylius\InvoicingPlugin\EventProducer\OrderPaymentPaidProducer">
             <argument type="service" id="sylius.event_bus" />
diff --git a/src/Resources/config/services/events/workflow.xml b/src/Resources/config/services/listeners/workflow.xml
similarity index 91%
rename from src/Resources/config/services/events/workflow.xml
rename to src/Resources/config/services/listeners/workflow.xml
index 768b7ff7..4440453b 100644
--- a/src/Resources/config/services/events/workflow.xml
+++ b/src/Resources/config/services/listeners/workflow.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.event_listener.workflow.payment.produce_order_payment_paid"
                  class="Sylius\InvoicingPlugin\EventListener\Workflow\Payment\ProduceOrderPaymentPaidListener">
diff --git a/src/Resources/config/services/ui.xml b/src/Resources/config/services/ui.xml
index 7706cb10..0010bdb5 100644
--- a/src/Resources/config/services/ui.xml
+++ b/src/Resources/config/services/ui.xml
@@ -2,7 +2,7 @@
 
 <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>
-        <defaults autoconfigure="true" autowire="true" public="true" />
+        <defaults public="true" />
 
         <service id="sylius_invoicing_plugin.ui.menu.admin_menu_listener" class="Sylius\InvoicingPlugin\Ui\Menu\AdminMenuListener">
             <tag name="kernel.event_listener" event="sylius.menu.admin.main" method="__invoke" />