diff --git a/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
deleted file mode 100644
index 44c8133d..00000000
--- a/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-endroid_twitter:
-    consumer_key: '%env(TWITTER_CONSUMER_KEY)%'
-    consumer_secret: '%env(TWITTER_CONSUMER_SECRET)%'
-    access_token: '%env(TWITTER_ACCESS_TOKEN)%'
-    access_token_secret: '%env(TWITTER_ACCESS_TOKEN_SECRET)%'
diff --git a/endroid/twitter/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
new file mode 100644
index 00000000..8afad104
--- /dev/null
+++ b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
@@ -0,0 +1,8 @@
+services:
+    Endroid\Twitter\Client:
+        public: true
+        arguments:
+            - '%env(TWITTER_CONSUMER_KEY)%'
+            - '%env(TWITTER_CONSUMER_SECRET)%'
+            - '%env(TWITTER_ACCESS_TOKEN)%'
+            - '%env(TWITTER_ACCESS_TOKEN_SECRET)%'
diff --git a/endroid/twitter-bundle/2.0/manifest.json b/endroid/twitter/2.0/manifest.json
similarity index 73%
rename from endroid/twitter-bundle/2.0/manifest.json
rename to endroid/twitter/2.0/manifest.json
index 1ac3f622..2ec0f1e0 100644
--- a/endroid/twitter-bundle/2.0/manifest.json
+++ b/endroid/twitter/2.0/manifest.json
@@ -1,7 +1,4 @@
 {
-    "bundles": {
-        "Endroid\\TwitterBundle\\EndroidTwitterBundle": ["all"]
-    },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
     },