diff --git a/orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml b/orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml
deleted file mode 100644
index 4d543df5..00000000
--- a/orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-orbitale_cms_category:
-    resource: "@OrbitaleCmsBundle/Controller/CategoryController.php"
-    type:     annotation
-    prefix:   /category/
-
-orbitale_cms_page:
-    resource: "@OrbitaleCmsBundle/Controller/PageController.php"
-    type:     annotation
-    prefix:   /page/
diff --git a/orbitale/cms-bundle/2.0/manifest.json b/orbitale/cms-bundle/2.0/manifest.json
deleted file mode 100644
index af61352d..00000000
--- a/orbitale/cms-bundle/2.0/manifest.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "bundles": {
-        "Orbitale\\Bundle\\CmsBundle\\OrbitaleCmsBundle": ["all"]
-    },
-    "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
-        "src/": "%SRC_DIR%/"
-    }
-}
diff --git a/orbitale/cms-bundle/2.0/src/Entity/Category.php b/orbitale/cms-bundle/2.0/src/Entity/Category.php
deleted file mode 100644
index 9b50c307..00000000
--- a/orbitale/cms-bundle/2.0/src/Entity/Category.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use Orbitale\Bundle\CmsBundle\Entity\Category as BaseCategory;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity(repositoryClass="Orbitale\Bundle\CmsBundle\Repository\CategoryRepository")
- * @ORM\Table(name="orbitale_cms_categories")
- */
-class Category extends BaseCategory
-{
-    /**
-     * @var int
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}
diff --git a/orbitale/cms-bundle/2.0/src/Entity/Page.php b/orbitale/cms-bundle/2.0/src/Entity/Page.php
deleted file mode 100644
index 46de28c7..00000000
--- a/orbitale/cms-bundle/2.0/src/Entity/Page.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use Orbitale\Bundle\CmsBundle\Entity\Page as BasePage;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity(repositoryClass="Orbitale\Bundle\CmsBundle\Repository\PageRepository")
- * @ORM\Table(name="orbitale_cms_pages")
- */
-class Page extends BasePage
-{
-    /**
-     * @var int
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}
diff --git a/orbitale/cms-bundle/2.0/etc/packages/orbitale_cms.yaml b/orbitale/cms-bundle/3.0/config/packages/orbitale_cms.yaml
similarity index 100%
rename from orbitale/cms-bundle/2.0/etc/packages/orbitale_cms.yaml
rename to orbitale/cms-bundle/3.0/config/packages/orbitale_cms.yaml
diff --git a/orbitale/cms-bundle/3.0/etc/routing/orbitale_cms.yaml b/orbitale/cms-bundle/3.0/config/routing/orbitale_cms.yaml
similarity index 100%
rename from orbitale/cms-bundle/3.0/etc/routing/orbitale_cms.yaml
rename to orbitale/cms-bundle/3.0/config/routing/orbitale_cms.yaml
diff --git a/orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml b/orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml
deleted file mode 100644
index 8f8dc8f0..00000000
--- a/orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-orbitale_cms:
-    page_class: App\Entity\Page
-    category_class: App\Entity\Category
-# Define your layout here if you need a custom layout for your CMS
-#    layouts:
-#         main: { resource: base.html.twig }
diff --git a/orbitale/cms-bundle/3.0/manifest.json b/orbitale/cms-bundle/3.0/manifest.json
index af61352d..ca01bf3a 100644
--- a/orbitale/cms-bundle/3.0/manifest.json
+++ b/orbitale/cms-bundle/3.0/manifest.json
@@ -3,7 +3,7 @@
         "Orbitale\\Bundle\\CmsBundle\\OrbitaleCmsBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
+        "config/": "%CONFIG_DIR%/",
         "src/": "%SRC_DIR%/"
     }
 }
diff --git a/willdurand/geocoder-bundle/4.1/etc/packages/dev/bazinga_geocoder.yaml b/willdurand/geocoder-bundle/4.1/config/packages/dev/bazinga_geocoder.yaml
similarity index 100%
rename from willdurand/geocoder-bundle/4.1/etc/packages/dev/bazinga_geocoder.yaml
rename to willdurand/geocoder-bundle/4.1/config/packages/dev/bazinga_geocoder.yaml
diff --git a/willdurand/geocoder-bundle/4.1/manifest.json b/willdurand/geocoder-bundle/4.1/manifest.json
index 19e4f207..1850ec40 100644
--- a/willdurand/geocoder-bundle/4.1/manifest.json
+++ b/willdurand/geocoder-bundle/4.1/manifest.json
@@ -1,8 +1,8 @@
 {
     "bundles": {
-        "Bazinga\\Bundle\\GeocoderBundle\\BazingaGeocoderBundle": ["all"]
+        "Bazinga\\GeocoderBundle\\BazingaGeocoderBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     }
 }