diff --git a/Configuration/Commands.php b/Configuration/Commands.php
deleted file mode 100644
index 11e5c0f..0000000
--- a/Configuration/Commands.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Wrm\Events\Command\DestinationDataImportCommand;
-use Wrm\Events\Command\RemoveAllCommand;
-use Wrm\Events\Command\RemovePastCommand;
-return [
-    'events:destinationdataimport‚' => [
-        'class' => DestinationDataImportCommand::class
-    ],
-    'events:removeAll' => [
-        'class' => RemoveAllCommand::class
-    ],
-    'events:removePast' => [
-        'class' => RemovePastCommand::class
-    ],
-];
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..9f37eb6
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,23 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Wrm\Events\:
+    resource: '../Classes/*'
+
+  Wrm\Events\Command\DestinationDataImportCommand:
+    tags:
+      - name: 'console.command'
+        command: 'events:destinationdataimport'
+
+  Wrm\Events\Command\RemoveAllCommand:
+    tags:
+      - name: 'console.command'
+        command: 'events:removeAll'
+
+  Wrm\Events\Command\RemovePastCommand:
+    tags:
+      - name: 'console.command'
+        command: 'events:removePast'