diff --git a/orbitale/cms-bundle/2.0/etc/packages/orbitale_cms.yaml b/orbitale/cms-bundle/2.0/etc/packages/orbitale_cms.yaml
new file mode 100644
index 00000000..8f8dc8f0
--- /dev/null
+++ b/orbitale/cms-bundle/2.0/etc/packages/orbitale_cms.yaml
@@ -0,0 +1,6 @@
+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/2.0/etc/routing/orbitale_cms.yaml b/orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml
new file mode 100644
index 00000000..4d543df5
--- /dev/null
+++ b/orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..af61352d
--- /dev/null
+++ b/orbitale/cms-bundle/2.0/manifest.json
@@ -0,0 +1,9 @@
+{
+    "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
new file mode 100644
index 00000000..9b50c307
--- /dev/null
+++ b/orbitale/cms-bundle/2.0/src/Entity/Category.php
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000..46de28c7
--- /dev/null
+++ b/orbitale/cms-bundle/2.0/src/Entity/Page.php
@@ -0,0 +1,29 @@
+<?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/3.0/etc/packages/orbitale_cms.yaml b/orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml
new file mode 100644
index 00000000..8f8dc8f0
--- /dev/null
+++ b/orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml
@@ -0,0 +1,6 @@
+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/etc/routing/orbitale_cms.yaml b/orbitale/cms-bundle/3.0/etc/routing/orbitale_cms.yaml
new file mode 100644
index 00000000..0e8af291
--- /dev/null
+++ b/orbitale/cms-bundle/3.0/etc/routing/orbitale_cms.yaml
@@ -0,0 +1,7 @@
+orbitale_cms_category:
+    resource: "@OrbitaleCmsBundle/Resources/config/routing/categories.yaml"
+    prefix:   /category/
+
+orbitale_cms_page:
+    resource: "@OrbitaleCmsBundle/Resources/config/routing/pages.yaml"
+    prefix:   /page/
diff --git a/orbitale/cms-bundle/3.0/manifest.json b/orbitale/cms-bundle/3.0/manifest.json
new file mode 100644
index 00000000..af61352d
--- /dev/null
+++ b/orbitale/cms-bundle/3.0/manifest.json
@@ -0,0 +1,9 @@
+{
+    "bundles": {
+        "Orbitale\\Bundle\\CmsBundle\\OrbitaleCmsBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "etc/": "%ETC_DIR%/",
+        "src/": "%SRC_DIR%/"
+    }
+}
diff --git a/orbitale/cms-bundle/3.0/src/Entity/Category.php b/orbitale/cms-bundle/3.0/src/Entity/Category.php
new file mode 100644
index 00000000..9b50c307
--- /dev/null
+++ b/orbitale/cms-bundle/3.0/src/Entity/Category.php
@@ -0,0 +1,29 @@
+<?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/3.0/src/Entity/Page.php b/orbitale/cms-bundle/3.0/src/Entity/Page.php
new file mode 100644
index 00000000..46de28c7
--- /dev/null
+++ b/orbitale/cms-bundle/3.0/src/Entity/Page.php
@@ -0,0 +1,29 @@
+<?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;
+    }
+}