diff --git a/prooph/event-store-symfony-bundle/0.4/config/packages/prooph_event_store.yaml b/prooph/event-store-symfony-bundle/0.4/config/packages/prooph_event_store.yaml
new file mode 100644
index 00000000..72f083ae
--- /dev/null
+++ b/prooph/event-store-symfony-bundle/0.4/config/packages/prooph_event_store.yaml
@@ -0,0 +1,11 @@
+prooph_event_store:
+    stores:
+        app:
+            event_store: 'Prooph\EventStore\EventStore'
+            # repositories:
+            #     App\EventSourcing\TodoRepository:
+            #         aggregate_type: App\EventSourcing\Todo
+            #         aggregate_translator: Prooph\EventSourcing\EventStoreIntegration\AggregateTranslator
+
+services:
+    Prooph\Common\Messaging\MessageFactory: '@prooph_event_store.message_factory'
diff --git a/prooph/event-store-symfony-bundle/0.4/manifest.json b/prooph/event-store-symfony-bundle/0.4/manifest.json
new file mode 100644
index 00000000..047bbf30
--- /dev/null
+++ b/prooph/event-store-symfony-bundle/0.4/manifest.json
@@ -0,0 +1,8 @@
+{
+    "bundles": {
+        "Prooph\\Bundle\\EventStore\\ProophEventStoreBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    }
+}
diff --git a/prooph/event-store-symfony-bundle/0.5/config/packages/prooph_event_store.yaml b/prooph/event-store-symfony-bundle/0.5/config/packages/prooph_event_store.yaml
new file mode 100644
index 00000000..0e460a9e
--- /dev/null
+++ b/prooph/event-store-symfony-bundle/0.5/config/packages/prooph_event_store.yaml
@@ -0,0 +1,8 @@
+prooph_event_store:
+    stores:
+        app:
+            event_store: 'Prooph\EventStore\EventStore'
+            # repositories:
+            #     App\EventSourcing\TodoRepository:
+            #         aggregate_type: App\EventSourcing\Todo
+            #         aggregate_translator: Prooph\EventSourcing\EventStoreIntegration\AggregateTranslator
diff --git a/prooph/event-store-symfony-bundle/0.5/manifest.json b/prooph/event-store-symfony-bundle/0.5/manifest.json
new file mode 100644
index 00000000..047bbf30
--- /dev/null
+++ b/prooph/event-store-symfony-bundle/0.5/manifest.json
@@ -0,0 +1,8 @@
+{
+    "bundles": {
+        "Prooph\\Bundle\\EventStore\\ProophEventStoreBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    }
+}
diff --git a/prooph/pdo-event-sourcing-pack/1.0/config/packages/prooph_event_store.yaml b/prooph/pdo-event-store/1.7/config/package/pdo_event_store.yml
similarity index 64%
rename from prooph/pdo-event-sourcing-pack/1.0/config/packages/prooph_event_store.yaml
rename to prooph/pdo-event-store/1.7/config/package/pdo_event_store.yml
index 3810695c..79691201 100644
--- a/prooph/pdo-event-sourcing-pack/1.0/config/packages/prooph_event_store.yaml
+++ b/prooph/pdo-event-store/1.7/config/package/pdo_event_store.yml
@@ -1,12 +1,3 @@
-prooph_event_store:
-    stores:
-        app:
-            event_store: 'Prooph\EventStore\EventStore'
-            # repositories:
-            #     App\EventSourcing\TodoRepository:
-            #         aggregate_type: App\EventSourcing\Todo
-            #         aggregate_translator: Prooph\EventSourcing\EventStoreIntegration\AggregateTranslator
-
 services:
     _defaults:
         autowire: true
@@ -14,7 +5,6 @@ services:
 
     Prooph\EventStore\EventStore: '@Prooph\EventStore\Pdo\MySqlEventStore'
     Prooph\EventStore\Pdo\PersistenceStrategy: '@Prooph\EventStore\Pdo\PersistenceStrategy\MySqlSingleStreamStrategy'
-    Prooph\Common\Messaging\MessageFactory: '@prooph_event_store.message_factory'
 
     PDO:
         class: \PDO
diff --git a/prooph/pdo-event-sourcing-pack/1.0/manifest.json b/prooph/pdo-event-store/1.7/manifest.json
similarity index 58%
rename from prooph/pdo-event-sourcing-pack/1.0/manifest.json
rename to prooph/pdo-event-store/1.7/manifest.json
index a1a79865..68e3fa39 100644
--- a/prooph/pdo-event-sourcing-pack/1.0/manifest.json
+++ b/prooph/pdo-event-store/1.7/manifest.json
@@ -1,8 +1,4 @@
 {
-    "bundles": {
-        "Prooph\\Bundle\\ServiceBus\\ProophServiceBusBundle": ["all"],
-        "Prooph\\Bundle\\EventStore\\ProophEventStoreBundle": ["all"]
-    },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
     },
diff --git a/prooph/pdo-event-sourcing-pack/1.0/config/packages/prooph_service_bus.yaml b/prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml
similarity index 100%
rename from prooph/pdo-event-sourcing-pack/1.0/config/packages/prooph_service_bus.yaml
rename to prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml
diff --git a/prooph/service-bus-symfony-bundle/0.6/manifest.json b/prooph/service-bus-symfony-bundle/0.6/manifest.json
new file mode 100644
index 00000000..f32f1893
--- /dev/null
+++ b/prooph/service-bus-symfony-bundle/0.6/manifest.json
@@ -0,0 +1,8 @@
+{
+    "bundles": {
+        "Prooph\\Bundle\\ServiceBus\\ProophServiceBusBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    }
+}