diff --git a/endroid/cm-sms/1.4/config/packages/dev/endroid_cm_sms.yaml b/endroid/cm-sms-bundle/2.0/config/packages/dev/endroid_cm_sms.yaml
similarity index 100%
rename from endroid/cm-sms/1.4/config/packages/dev/endroid_cm_sms.yaml
rename to endroid/cm-sms-bundle/2.0/config/packages/dev/endroid_cm_sms.yaml
diff --git a/endroid/cm-sms/1.4/config/packages/endroid_cm_sms.yaml b/endroid/cm-sms-bundle/2.0/config/packages/endroid_cm_sms.yaml
similarity index 100%
rename from endroid/cm-sms/1.4/config/packages/endroid_cm_sms.yaml
rename to endroid/cm-sms-bundle/2.0/config/packages/endroid_cm_sms.yaml
diff --git a/endroid/cm-sms-bundle/2.0/config/routes/endroid_cm_sms.yaml b/endroid/cm-sms-bundle/2.0/config/routes/endroid_cm_sms.yaml
new file mode 100644
index 00000000..7feec698
--- /dev/null
+++ b/endroid/cm-sms-bundle/2.0/config/routes/endroid_cm_sms.yaml
@@ -0,0 +1,3 @@
+EndroidCmSmsBundle:
+    resource: "@EndroidCmSmsBundle/Resources/config/routing.yml"
+    prefix: /cm-sms
diff --git a/endroid/cm-sms/1.4/manifest.json b/endroid/cm-sms-bundle/2.0/manifest.json
similarity index 66%
rename from endroid/cm-sms/1.4/manifest.json
rename to endroid/cm-sms-bundle/2.0/manifest.json
index 0ea83cca..cda5c01e 100644
--- a/endroid/cm-sms/1.4/manifest.json
+++ b/endroid/cm-sms-bundle/2.0/manifest.json
@@ -1,6 +1,6 @@
 {
     "bundles": {
-        "Endroid\\CmSms\\Bundle\\CmSmsBundle\\EndroidCmSmsBundle": ["all"]
+        "Endroid\\CmSmsBundle\\EndroidCmSmsBundle": ["all"]
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
diff --git a/endroid/cm-sms/1.4/config/routes/endroid_cm_sms.yaml b/endroid/cm-sms/1.4/config/routes/endroid_cm_sms.yaml
deleted file mode 100644
index 647c0df6..00000000
--- a/endroid/cm-sms/1.4/config/routes/endroid_cm_sms.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-EndroidCmSmsBundle:
-    resource: "@EndroidCmSmsBundle/Controller/"
-    type: annotation
-    prefix: /cm-sms