From 94e76f431b8fcedd0dc5423bba0b9cbb3348b1e3 Mon Sep 17 00:00:00 2001
From: Jeroen Desloovere <info@jeroendesloovere.be>
Date: Tue, 13 Jun 2017 15:08:03 +0200
Subject: [PATCH] Using Domain structure for ContentBlocks module

---
 .../Actions/{Add.php => ContentBlockAdd.php}  |  68 ++++---
 .../Actions/ContentBlockDelete.php            |  69 +++++++
 .../Actions/ContentBlockEdit.php              | 131 +++++++++++++
 .../Actions/ContentBlockIndex.php             |  28 +++
 .../Modules/ContentBlocks/Actions/Delete.php  |  60 ------
 .../Modules/ContentBlocks/Actions/Edit.php    | 176 ------------------
 .../Modules/ContentBlocks/Actions/Index.php   |  56 ------
 .../CopyContentBlocksToOtherLocaleHandler.php |  60 ------
 .../Command/CreateContentBlock.php            |  60 ------
 .../Command/CreateContentBlockHandler.php     |  44 -----
 .../Command/UpdateContentBlock.php            |  56 ------
 .../Command/UpdateContentBlockHandler.php     |  30 ---
 src/Backend/Modules/ContentBlocks/Config.php  |   6 +
 .../DataGrid/ContentBlockDataGrid.php         |  23 ---
 .../DataGrid/ContentBlockRevisionDataGrid.php |  25 ---
 .../ContentBlocksExtension.php                |   3 +-
 .../CopyContentBlocksToOtherLocale.php        |   2 +-
 .../CopyContentBlocksToOtherLocaleHandler.php |  68 +++++++
 .../Command/CreateContentBlock.php            |  22 +++
 .../Command/CreateContentBlockHandler.php     |  39 ++++
 .../Command/DeleteContentBlock.php            |   8 +-
 .../Command/DeleteContentBlockHandler.php     |   6 +-
 .../Command/UpdateContentBlock.php            |  15 ++
 .../Command/UpdateContentBlockHandler.php     |  25 +++
 .../ContentBlock}/ContentBlock.php            |  71 +++----
 .../ContentBlock/ContentBlockDataGrid.php     |  44 +++++
 .../ContentBlockDataTransferObject.php        | 107 +++++++++++
 .../ContentBlock}/ContentBlockRepository.php  |  41 +++-
 .../ContentBlockRevisionDataGrid.php          |  72 +++++++
 .../ContentBlock}/ContentBlockType.php        |   6 +-
 .../Event/ContentBlockCreated.php             |   2 +-
 .../Event/ContentBlockDeleted.php             |   2 +-
 .../ContentBlock}/Event/ContentBlockEvent.php |   4 +-
 .../Event/ContentBlockUpdated.php             |   2 +-
 .../Exception/ContentBlockNotFound.php        |  28 +++
 .../ContentBlock/Status.php}                  |   4 +-
 .../ContentBlock/StatusDBALType.php}          |  12 +-
 .../ContentBlocks/Installer/Data/locale.xml   |  98 ++++++----
 .../ContentBlocks/Installer/Installer.php     |  14 +-
 ...dd.html.twig => ContentBlockAdd.html.twig} |   0
 ...t.html.twig => ContentBlockEdit.html.twig} |   8 +-
 ....html.twig => ContentBlockIndex.html.twig} |   4 +-
 .../config/{command.yml => commands.yml}      |  16 +-
 .../Resources/config/doctrine.yml             |  10 +-
 .../ContentBlocks/Resources/config/events.yml |   7 +
 .../Resources/config/repositories.yml         |   6 +
 .../Resources/config/repository.yml           |   6 -
 .../Resources/config/services.yml             |   3 +
 48 files changed, 890 insertions(+), 757 deletions(-)
 rename src/Backend/Modules/ContentBlocks/Actions/{Add.php => ContentBlockAdd.php} (58%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Actions/ContentBlockDelete.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Actions/ContentBlockEdit.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Actions/ContentBlockIndex.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Actions/Delete.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Actions/Edit.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Actions/Index.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocaleHandler.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Command/CreateContentBlock.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Command/CreateContentBlockHandler.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Command/UpdateContentBlock.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/Command/UpdateContentBlockHandler.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockDataGrid.php
 delete mode 100644 src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockRevisionDataGrid.php
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Command/CopyContentBlocksToOtherLocale.php (89%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocaleHandler.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlock.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlockHandler.php
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Command/DeleteContentBlock.php (53%)
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Command/DeleteContentBlockHandler.php (75%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlock.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlockHandler.php
 rename src/Backend/Modules/ContentBlocks/{Entity => Domain/ContentBlock}/ContentBlock.php (77%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataGrid.php
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataTransferObject.php
 rename src/Backend/Modules/ContentBlocks/{Repository => Domain/ContentBlock}/ContentBlockRepository.php (55%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRevisionDataGrid.php
 rename src/Backend/Modules/ContentBlocks/{Form => Domain/ContentBlock}/ContentBlockType.php (92%)
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Event/ContentBlockCreated.php (77%)
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Event/ContentBlockDeleted.php (77%)
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Event/ContentBlockEvent.php (73%)
 rename src/Backend/Modules/ContentBlocks/{ => Domain/ContentBlock}/Event/ContentBlockUpdated.php (77%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Exception/ContentBlockNotFound.php
 rename src/Backend/Modules/ContentBlocks/{ValueObject/ContentBlockStatus.php => Domain/ContentBlock/Status.php} (93%)
 rename src/Backend/Modules/ContentBlocks/{DBALType/ContentBlockStatusDBALType.php => Domain/ContentBlock/StatusDBALType.php} (62%)
 rename src/Backend/Modules/ContentBlocks/Layout/Templates/{Add.html.twig => ContentBlockAdd.html.twig} (100%)
 rename src/Backend/Modules/ContentBlocks/Layout/Templates/{Edit.html.twig => ContentBlockEdit.html.twig} (91%)
 rename src/Backend/Modules/ContentBlocks/Layout/Templates/{Index.html.twig => ContentBlockIndex.html.twig} (66%)
 rename src/Backend/Modules/ContentBlocks/Resources/config/{command.yml => commands.yml} (55%)
 create mode 100644 src/Backend/Modules/ContentBlocks/Resources/config/events.yml
 create mode 100644 src/Backend/Modules/ContentBlocks/Resources/config/repositories.yml
 delete mode 100644 src/Backend/Modules/ContentBlocks/Resources/config/repository.yml
 create mode 100644 src/Backend/Modules/ContentBlocks/Resources/config/services.yml

diff --git a/src/Backend/Modules/ContentBlocks/Actions/Add.php b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockAdd.php
similarity index 58%
rename from src/Backend/Modules/ContentBlocks/Actions/Add.php
rename to src/Backend/Modules/ContentBlocks/Actions/ContentBlockAdd.php
index 7d83a4f91c..375ea06d90 100644
--- a/src/Backend/Modules/ContentBlocks/Actions/Add.php
+++ b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockAdd.php
@@ -12,26 +12,22 @@
 use Backend\Core\Engine\Authentication;
 use Backend\Core\Engine\Base\ActionAdd as BackendBaseActionAdd;
 use Backend\Core\Engine\Model as BackendModel;
-use Backend\Modules\ContentBlocks\Command\CreateContentBlock;
-use Backend\Modules\ContentBlocks\Event\ContentBlockCreated;
-use Backend\Modules\ContentBlocks\Form\ContentBlockType;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CreateContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Event\ContentBlockCreated;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockType;
+use Symfony\Component\Form\Form;
 
 /**
  * This is the add-action, it will display a form to create a new item
  */
-class Add extends BackendBaseActionAdd
+class ContentBlockAdd extends BackendBaseActionAdd
 {
     public function execute(): void
     {
         parent::execute();
 
-        $form = $this->createForm(
-            ContentBlockType::class,
-            null,
-            ['theme' => $this->get('fork.settings')->get('Core', 'theme', 'Core')]
-        );
-
-        $form->handleRequest($this->get('request'));
+        /** @var Form $form */
+        $form = $this->getForm();
 
         if (!$form->isValid()) {
             $this->tpl->assign('form', $form->createView());
@@ -43,27 +39,55 @@ public function execute(): void
         }
 
         /** @var CreateContentBlock $createContentBlock */
-        $createContentBlock = $form->getData();
-        $createContentBlock->userId = Authentication::getUser()->getUserId();
-
-        // The command bus will handle the saving of the content block in the database.
-        $this->get('command_bus')->handle($createContentBlock);
+        $createContentBlock = $this->createContentBlock($form);
 
         $this->get('event_dispatcher')->dispatch(
             ContentBlockCreated::EVENT_NAME,
-            new ContentBlockCreated($createContentBlock->contentBlock)
+            new ContentBlockCreated($createContentBlock->getContentBlockEntity())
         );
 
         $this->redirect(
-            BackendModel::createURLForAction(
-                'Index',
-                null,
-                null,
+            $this->getBackLink(
                 [
-                    'report' => 'added',
+                    'report' => 'content-block-added',
                     'var' => $createContentBlock->title,
                 ]
             )
         );
     }
+
+    private function createContentBlock(Form $form): CreateContentBlock
+    {
+        /** @var CreateContentBlock $createContentBlock */
+        $createContentBlock = $form->getData();
+        $createContentBlock->userId = Authentication::getUser()->getUserId();
+
+        // The command bus will handle the saving of the content block in the database.
+        $this->get('command_bus')->handle($createContentBlock);
+
+        return $createContentBlock;
+    }
+
+    private function getBackLink(array $parameters = []): string
+    {
+        return BackendModel::createURLForAction(
+            'ContentBlockIndex',
+            null,
+            null,
+            $parameters
+        );
+    }
+
+    private function getForm(): Form
+    {
+        $form = $this->createForm(
+            ContentBlockType::class,
+            new CreateContentBlock(),
+            ['theme' => $this->get('fork.settings')->get('Core', 'theme', 'Core')]
+        );
+
+        $form->handleRequest($this->get('request'));
+
+        return $form;
+    }
 }
diff --git a/src/Backend/Modules/ContentBlocks/Actions/ContentBlockDelete.php b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockDelete.php
new file mode 100644
index 0000000000..9fe0560ca0
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockDelete.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Actions;
+
+/*
+ * This file is part of Fork CMS.
+ *
+ * For the full copyright and license information, please view the license
+ * file that was distributed with this source code.
+ */
+
+use Backend\Core\Engine\Base\ActionDelete as BackendBaseActionDelete;
+use Backend\Core\Engine\Model as BackendModel;
+use Backend\Core\Language\Locale;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\DeleteContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Event\ContentBlockDeleted;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Exception\ContentBlockNotFound;
+
+/**
+ * This is the delete-action, it will delete an item.
+ */
+class ContentBlockDelete extends BackendBaseActionDelete
+{
+    public function execute(): void
+    {
+        /** @var ContentBlock $contentBlock */
+        $contentBlock = $this->getContentBlock();
+
+        // The command bus will handle the saving of the content block in the database.
+        $this->get('command_bus')->handle(new DeleteContentBlock($contentBlock));
+
+        $this->get('event_dispatcher')->dispatch(
+            ContentBlockDeleted::EVENT_NAME,
+            new ContentBlockDeleted($contentBlock)
+        );
+
+        $this->redirect(
+            $this->getBackLink(
+                [
+                    'report' => 'content-block-deleted',
+                    'var' => $contentBlock->getTitle(),
+                ]
+            )
+        );
+    }
+
+    private function getBackLink(array $parameters = []): string
+    {
+        return BackendModel::createURLForAction(
+            'ContentBlockIndex',
+            null,
+            null,
+            $parameters
+        );
+    }
+
+    private function getContentBlock(): ContentBlock
+    {
+        try {
+            return $this->get('content_blocks.repository.content_block')->findOneByIdAndLocale(
+                $this->getParameter('id', 'int'),
+                Locale::workingLocale()
+            );
+        } catch (ContentBlockNotFound $e) {
+            $this->redirect($this->getBackLink(['error' => 'non-existing']));
+        }
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Actions/ContentBlockEdit.php b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockEdit.php
new file mode 100644
index 0000000000..a31eb33a5c
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockEdit.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Actions;
+
+/*
+ * This file is part of Fork CMS.
+ *
+ * For the full copyright and license information, please view the license
+ * file that was distributed with this source code.
+ */
+
+use Backend\Core\Engine\Authentication;
+use Backend\Core\Engine\Base\ActionEdit as BackendBaseActionEdit;
+use Backend\Core\Engine\Model as BackendModel;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\UpdateContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Event\ContentBlockUpdated;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockType;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRevisionDataGrid;
+use Backend\Core\Language\Locale;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Exception\ContentBlockNotFound;
+use Symfony\Component\Form\Form;
+
+/**
+ * This is the edit-action, it will display a form to edit an existing item
+ */
+class ContentBlockEdit extends BackendBaseActionEdit
+{
+    public function execute(): void
+    {
+        parent::execute();
+
+        /** @var ContentBlock $contentBlock */
+        $contentBlock = $this->getContentBlock();
+
+        /** @var Form $form */
+        $form = $this->getForm($contentBlock);
+
+        if (!$form->isValid()) {
+            $this->tpl->assign('form', $form->createView());
+            $this->tpl->assign('contentBlock', $contentBlock);
+            $this->tpl->assign('revisions', ContentBlockRevisionDataGrid::getHtml($contentBlock, Locale::workingLocale()));
+
+            $this->parse();
+            $this->display();
+
+            return;
+        }
+
+        /** @var UpdateContentBlock $updateContentBlock */
+        $updateContentBlock = $this->updateContentBlock($form);
+
+        $this->get('event_dispatcher')->dispatch(
+            ContentBlockUpdated::EVENT_NAME,
+            new ContentBlockUpdated($updateContentBlock->getContentBlockEntity())
+        );
+
+        $this->redirect(
+            $this->getBackLink(
+                [
+                    'report' => 'content-block-edited',
+                    'var' => $updateContentBlock->title,
+                    'highlight' => 'row-' . $contentBlock->getId(),
+                ]
+            )
+        );
+    }
+
+    private function getBackLink(array $parameters = []): string
+    {
+        return BackendModel::createURLForAction(
+            'ContentBlockIndex',
+            null,
+            null,
+            $parameters
+        );
+    }
+
+    private function getContentBlock(): ContentBlock
+    {
+        /** @var ContentBlockRepository $contentBlockRepository */
+        $contentBlockRepository = $this->get('content_blocks.repository.content_block');
+
+        // specific revision?
+        $revisionId = $this->getParameter('revision', 'int');
+
+        if ($revisionId !== null) {
+            $this->tpl->assign('usingRevision', true);
+
+            try {
+                return $contentBlockRepository->findOneByRevisionIdAndLocale($revisionId, Locale::workingLocale());
+            } catch (ContentBlockNotFound $e) {
+                $this->redirect($this->getBackLink(['error' => 'non-existing']));
+            }
+        }
+
+        try {
+            return $contentBlockRepository->findOneByIdAndLocale($this->getParameter('id', 'int'), Locale::workingLocale());
+        } catch (ContentBlockNotFound $e) {
+            $this->redirect($this->getBackLink(['error' => 'non-existing']));
+        }
+    }
+
+    private function getForm(ContentBlock $contentBlock): Form
+    {
+        $form = $this->createForm(
+            ContentBlockType::class,
+            new UpdateContentBlock($contentBlock),
+            [
+                'theme' => $this->get('fork.settings')->get('Core', 'theme', 'Core'),
+            ]
+        );
+
+        $form->handleRequest($this->get('request'));
+
+        return $form;
+    }
+
+    private function updateContentBlock(Form $form): UpdateContentBlock
+    {
+        /** @var UpdateContentBlock $updateContentBlock */
+        $updateContentBlock = $form->getData();
+        $updateContentBlock->userId = Authentication::getUser()->getUserId();
+
+        // The command bus will handle the saving of the content block in the database.
+        $this->get('command_bus')->handle($updateContentBlock);
+
+        return $updateContentBlock;
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Actions/ContentBlockIndex.php b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockIndex.php
new file mode 100644
index 0000000000..f2d3128e75
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Actions/ContentBlockIndex.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Actions;
+
+/*
+ * This file is part of Fork CMS.
+ *
+ * For the full copyright and license information, please view the license
+ * file that was distributed with this source code.
+ */
+
+use Backend\Core\Engine\Base\ActionIndex as BackendBaseActionIndex;
+use Backend\Core\Language\Locale;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockDataGrid;
+
+/**
+ * This is the index-action (default), it will display the overview
+ */
+class ContentBlockIndex extends BackendBaseActionIndex
+{
+    public function execute(): void
+    {
+        parent::execute();
+        $this->tpl->assign('dataGrid', ContentBlockDataGrid::getHtml(Locale::workingLocale()));
+        $this->parse();
+        $this->display();
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Actions/Delete.php b/src/Backend/Modules/ContentBlocks/Actions/Delete.php
deleted file mode 100644
index eb76ad28e2..0000000000
--- a/src/Backend/Modules/ContentBlocks/Actions/Delete.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Actions;
-
-/*
- * This file is part of Fork CMS.
- *
- * For the full copyright and license information, please view the license
- * file that was distributed with this source code.
- */
-
-use Backend\Core\Engine\Base\ActionDelete as BackendBaseActionDelete;
-use Backend\Core\Engine\Model as BackendModel;
-use Backend\Core\Language\Locale;
-use Backend\Modules\ContentBlocks\Command\DeleteContentBlock;
-use Backend\Modules\ContentBlocks\Event\ContentBlockDeleted;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
-
-/**
- * This is the delete-action, it will delete an item.
- */
-class Delete extends BackendBaseActionDelete
-{
-    public function execute(): void
-    {
-        /** @var ContentBlockRepository $contentBlockRepository */
-        $contentBlockRepository = $this->get('content_blocks.repository.content_block');
-
-        $contentBlock = $contentBlockRepository->findOneByIdAndLocale(
-            $this->getParameter('id', 'int'),
-            Locale::workingLocale()
-        );
-
-        if ($contentBlock === null) {
-            $this->redirect(BackendModel::createURLForAction('Index', null, null, ['error' => 'non-existing']));
-
-            return;
-        }
-
-        // The command bus will handle the saving of the content block in the database.
-        $this->get('command_bus')->handle(new DeleteContentBlock($contentBlock));
-
-        $this->get('event_dispatcher')->dispatch(
-            ContentBlockDeleted::EVENT_NAME,
-            new ContentBlockDeleted($contentBlock)
-        );
-
-        $this->redirect(
-            BackendModel::createURLForAction(
-                'Index',
-                null,
-                null,
-                [
-                    'report' => 'deleted',
-                    'var' => $contentBlock->getTitle(),
-                ]
-            )
-        );
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Actions/Edit.php b/src/Backend/Modules/ContentBlocks/Actions/Edit.php
deleted file mode 100644
index ef11bd180c..0000000000
--- a/src/Backend/Modules/ContentBlocks/Actions/Edit.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Actions;
-
-/*
- * This file is part of Fork CMS.
- *
- * For the full copyright and license information, please view the license
- * file that was distributed with this source code.
- */
-
-use Backend\Core\Engine\Authentication;
-use Backend\Core\Engine\Base\ActionEdit as BackendBaseActionEdit;
-use Backend\Core\Engine\DataGridFunctions;
-use Backend\Core\Engine\Model as BackendModel;
-use Backend\Core\Language\Language;
-use Backend\Modules\ContentBlocks\Command\UpdateContentBlock;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\Event\ContentBlockUpdated;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
-use Backend\Modules\ContentBlocks\Form\ContentBlockType;
-use Backend\Modules\ContentBlocks\DataGrid\ContentBlockRevisionDataGrid;
-use Backend\Core\Language\Locale;
-use SpoonFilter;
-
-/**
- * This is the edit-action, it will display a form to edit an existing item
- */
-class Edit extends BackendBaseActionEdit
-{
-    /** @var ContentBlock */
-    private $contentBlock;
-
-    public function execute(): void
-    {
-        parent::execute();
-
-        $this->contentBlock = $this->getContentBlock();
-
-        if ($this->contentBlock === null) {
-            $this->redirect(BackendModel::createURLForAction('Index', null, null, ['error' => 'non-existing']));
-
-            return;
-        }
-
-        $form = $this->createForm(
-            ContentBlockType::class,
-            new UpdateContentBlock($this->contentBlock),
-            [
-                'theme' => $this->get('fork.settings')->get('Core', 'theme', 'Core'),
-                'data_class' => UpdateContentBlock::class,
-            ]
-        );
-
-        $form->handleRequest($this->get('request'));
-
-        if (!$form->isValid()) {
-            $this->tpl->assign('form', $form->createView());
-
-            $this->parse();
-            $this->display();
-
-            return;
-        }
-
-        /** @var UpdateContentBlock $updateContentBlock */
-        $updateContentBlock = $form->getData();
-        $updateContentBlock->userId = Authentication::getUser()->getUserId();
-
-        // The command bus will handle the saving of the content block in the database.
-        $this->get('command_bus')->handle($updateContentBlock);
-
-        $this->get('event_dispatcher')->dispatch(
-            ContentBlockUpdated::EVENT_NAME,
-            new ContentBlockUpdated($updateContentBlock->contentBlock)
-        );
-
-        $this->redirect(
-            BackendModel::createURLForAction(
-                'Index',
-                null,
-                null,
-                [
-                    'report' => 'edited',
-                    'var' => $updateContentBlock->title,
-                    'highlight' => 'row-' . $this->contentBlock->getId(),
-                ]
-            )
-        );
-    }
-
-    /**
-     * @return ContentBlock|null
-     */
-    private function getContentBlock(): ?ContentBlock
-    {
-        /** @var ContentBlockRepository $contentBlockRepository */
-        $contentBlockRepository = $this->get('content_blocks.repository.content_block');
-
-        // specific revision?
-        $revisionId = $this->getParameter('revision', 'int');
-
-        if ($revisionId !== null) {
-            $this->tpl->assign('usingRevision', true);
-
-            return $contentBlockRepository->findOneByRevisionIdAndLocale($revisionId, Locale::workingLocale());
-        }
-
-        return $contentBlockRepository->findOneByIdAndLocale($this->getParameter('id', 'int'), Locale::workingLocale());
-    }
-
-    /**
-     * Parses a data grid with the revisions in the template
-     */
-    private function parseRevisionsDataGrid(): void
-    {
-        // create datagrid
-        $revisions = new ContentBlockRevisionDataGrid($this->contentBlock, Locale::workingLocale());
-
-        // hide columns
-        $revisions->setColumnsHidden(['id', 'revision_id']);
-
-        // disable paging
-        $revisions->setPaging(false);
-
-        // set headers
-        $revisions->setHeaderLabels(
-            [
-                'user_id' => SpoonFilter::ucfirst(Language::lbl('By')),
-                'edited_on' => SpoonFilter::ucfirst(Language::lbl('LastEditedOn')),
-            ]
-        );
-
-        // set column-functions
-        $revisions->setColumnFunction([DataGridFunctions::class, 'getUser'], ['[user_id]'], 'user_id');
-        $revisions->setColumnFunction([DataGridFunctions::class, 'getTimeAgo'], ['[edited_on]'], 'edited_on');
-
-        // check if this action is allowed
-        if (Authentication::isAllowedAction('Edit')) {
-            $editRevisionUrl = BackendModel::createURLForAction(
-                'Edit',
-                null,
-                null,
-                ['id' => '[id]', 'revision' => '[revision_id]'],
-                false
-            );
-            // set column URLs
-            $revisions->setColumnURL('title', $editRevisionUrl);
-
-            // add use column
-            $revisions->addColumn(
-                'use_revision',
-                null,
-                Language::lbl('UseThisVersion'),
-                $editRevisionUrl,
-                Language::lbl('UseThisVersion')
-            );
-        }
-
-        $this->tpl->assign('revisions', (string) $revisions->getContent());
-    }
-
-    /**
-     * Parse the content block and the revisions
-     */
-    protected function parse(): void
-    {
-        parent::parse();
-
-        $this->tpl->assign('id', $this->contentBlock->getId());
-        $this->tpl->assign('title', $this->contentBlock->getTitle());
-        $this->tpl->assign('revision_id', $this->contentBlock->getRevisionId());
-
-        $this->parseRevisionsDataGrid();
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Actions/Index.php b/src/Backend/Modules/ContentBlocks/Actions/Index.php
deleted file mode 100644
index e0b78d43cf..0000000000
--- a/src/Backend/Modules/ContentBlocks/Actions/Index.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Actions;
-
-/*
- * This file is part of Fork CMS.
- *
- * For the full copyright and license information, please view the license
- * file that was distributed with this source code.
- */
-
-use Backend\Core\Engine\Base\ActionIndex as BackendBaseActionIndex;
-use Backend\Core\Engine\TemplateModifiers;
-use Backend\Core\Language\Language as BL;
-use Backend\Core\Engine\Authentication as BackendAuthentication;
-use Backend\Core\Engine\Model as BackendModel;
-use Backend\Core\Language\Locale;
-use Backend\Modules\ContentBlocks\DataGrid\ContentBlockDataGrid;
-
-/**
- * This is the index-action (default), it will display the overview
- */
-class Index extends BackendBaseActionIndex
-{
-    public function execute(): void
-    {
-        parent::execute();
-        $this->loadDataGrid();
-        $this->parse();
-        $this->display();
-    }
-
-    private function loadDataGrid(): void
-    {
-        $this->dataGrid = new ContentBlockDataGrid(Locale::workingLocale());
-        $this->dataGrid->setSortingColumns(['title']);
-
-        // show the hidden status
-        $this->dataGrid->addColumn('isHidden', ucfirst(BL::lbl('VisibleOnSite')), '[hidden]');
-        $this->dataGrid->setColumnFunction([TemplateModifiers::class, 'showBool'], ['[hidden]', true], 'isHidden');
-
-        // check if this action is allowed
-        if (BackendAuthentication::isAllowedAction('Edit')) {
-            $editUrl = BackendModel::createURLForAction('Edit', null, null, ['id' => '[id]'], false);
-            $this->dataGrid->setColumnURL('title', $editUrl);
-            $this->dataGrid->addColumn('edit', null, BL::lbl('Edit'), $editUrl, BL::lbl('Edit'));
-        }
-    }
-
-    protected function parse(): void
-    {
-        parent::parse();
-
-        $this->tpl->assign('dataGrid', (string) $this->dataGrid->getContent());
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocaleHandler.php b/src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocaleHandler.php
deleted file mode 100644
index 711abe4875..0000000000
--- a/src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocaleHandler.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Command;
-
-use Backend\Core\Engine\Model;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
-use Common\ModuleExtraType;
-
-final class CopyContentBlocksToOtherLocaleHandler
-{
-    /** @var ContentBlockRepository */
-    private $contentBlockRepository;
-
-    public function __construct(ContentBlockRepository $contentBlockRepository)
-    {
-        $this->contentBlockRepository = $contentBlockRepository;
-    }
-
-    public function handle(CopyContentBlocksToOtherLocale $copyContentBlocksToOtherLocale): void
-    {
-        $fromLocaleContentBlocks = (array) $this->contentBlockRepository->findBy(
-            ['locale' => $copyContentBlocksToOtherLocale->fromLocale, 'status' => ContentBlockStatus::active()]
-        );
-
-        $id = $this->contentBlockRepository->getNextIdForLanguage($copyContentBlocksToOtherLocale->toLocale);
-        array_map(
-            function (ContentBlock $contentBlock) use ($copyContentBlocksToOtherLocale, &$id) {
-                $copyContentBlocksToOtherLocale->extraIdMap[$contentBlock->getExtraId()] = $this->getNewExtraId();
-
-                $otherLocaleContentBlock = ContentBlock::create(
-                    $id++,
-                    $contentBlock->getUserId(),
-                    $copyContentBlocksToOtherLocale->extraIdMap[$contentBlock->getExtraId()],
-                    $copyContentBlocksToOtherLocale->toLocale,
-                    $contentBlock->getTitle(),
-                    $contentBlock->getText(),
-                    $contentBlock->isHidden(),
-                    $contentBlock->getTemplate()
-                );
-
-                $this->contentBlockRepository->add($otherLocaleContentBlock);
-            },
-            $fromLocaleContentBlocks
-        );
-    }
-
-    /**
-     * @return int
-     */
-    private function getNewExtraId(): int
-    {
-        return Model::insertExtra(
-            ModuleExtraType::widget(),
-            'ContentBlocks',
-            'Detail'
-        );
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Command/CreateContentBlock.php b/src/Backend/Modules/ContentBlocks/Command/CreateContentBlock.php
deleted file mode 100644
index f777a4bdd5..0000000000
--- a/src/Backend/Modules/ContentBlocks/Command/CreateContentBlock.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Command;
-
-use Backend\Core\Language\Locale;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Symfony\Component\Validator\Constraints as Assert;
-
-final class CreateContentBlock
-{
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $title;
-
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $template = ContentBlock::DEFAULT_TEMPLATE;
-
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $text;
-
-    /**
-     * @var bool
-     */
-    public $isVisible = true;
-
-    /**
-     * @var Locale
-     */
-    public $language;
-
-    /**
-     * @var ContentBlock
-     */
-    public $contentBlock;
-
-    /**
-     * @var int
-     */
-    public $userId;
-
-    public function __construct(Locale $language = null)
-    {
-        if ($language === null) {
-            $language = Locale::workingLocale();
-        }
-
-        $this->language = $language;
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Command/CreateContentBlockHandler.php b/src/Backend/Modules/ContentBlocks/Command/CreateContentBlockHandler.php
deleted file mode 100644
index 5090101ec7..0000000000
--- a/src/Backend/Modules/ContentBlocks/Command/CreateContentBlockHandler.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Command;
-
-use Backend\Core\Engine\Model;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
-use Common\ModuleExtraType;
-
-final class CreateContentBlockHandler
-{
-    /** @var ContentBlockRepository */
-    private $contentBlockRepository;
-
-    public function __construct(ContentBlockRepository $contentBlockRepository)
-    {
-        $this->contentBlockRepository = $contentBlockRepository;
-    }
-
-    public function handle(CreateContentBlock $createContentBlock): void
-    {
-        $createContentBlock->contentBlock = ContentBlock::create(
-            $this->contentBlockRepository->getNextIdForLanguage($createContentBlock->language),
-            $createContentBlock->userId,
-            $this->getNewExtraId(),
-            $createContentBlock->language,
-            $createContentBlock->title,
-            $createContentBlock->text,
-            !$createContentBlock->isVisible,
-            $createContentBlock->template
-        );
-
-        $this->contentBlockRepository->add($createContentBlock->contentBlock);
-    }
-
-    private function getNewExtraId(): int
-    {
-        return Model::insertExtra(
-            ModuleExtraType::widget(),
-            'ContentBlocks',
-            'Detail'
-        );
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlock.php b/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlock.php
deleted file mode 100644
index 5c28c380c2..0000000000
--- a/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlock.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Command;
-
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Symfony\Component\Validator\Constraints as Assert;
-
-final class UpdateContentBlock
-{
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $title;
-
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $template = ContentBlock::DEFAULT_TEMPLATE;
-
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank(message="err.FieldIsRequired")
-     */
-    public $text;
-
-    /**
-     * @var bool
-     */
-    public $isVisible = true;
-
-    /**
-     * @var ContentBlock
-     */
-    public $contentBlock;
-
-    /**
-     * @var int
-     */
-    public $userId;
-
-    public function __construct(ContentBlock $contentBlock)
-    {
-        $this->contentBlock = $contentBlock;
-
-        $this->isVisible = !$contentBlock->isHidden();
-        $this->title = $contentBlock->getTitle();
-        $this->text = $contentBlock->getText();
-        $this->template = $contentBlock->getTemplate();
-        $this->userId = $contentBlock->getUserId();
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlockHandler.php b/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlockHandler.php
deleted file mode 100644
index 9ad77d26bc..0000000000
--- a/src/Backend/Modules/ContentBlocks/Command/UpdateContentBlockHandler.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\Command;
-
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
-
-final class UpdateContentBlockHandler
-{
-    /** @var ContentBlockRepository */
-    private $contentBlockRepository;
-
-    public function __construct(ContentBlockRepository $contentBlockRepository)
-    {
-        $this->contentBlockRepository = $contentBlockRepository;
-    }
-
-    public function handle(UpdateContentBlock $updateContentBlock): void
-    {
-        $updateContentBlock->contentBlock = $updateContentBlock->contentBlock->update(
-            $updateContentBlock->title,
-            $updateContentBlock->text,
-            !$updateContentBlock->isVisible,
-            $updateContentBlock->template,
-            $updateContentBlock->userId
-        );
-
-        $this->contentBlockRepository->add($updateContentBlock->contentBlock);
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/Config.php b/src/Backend/Modules/ContentBlocks/Config.php
index b3075af957..0c1fe4f47a 100644
--- a/src/Backend/Modules/ContentBlocks/Config.php
+++ b/src/Backend/Modules/ContentBlocks/Config.php
@@ -16,4 +16,10 @@
  */
 class Config extends BackendBaseConfig
 {
+    /**
+     * The default action
+     *
+     * @var string
+     */
+    protected $defaultAction = 'ContentBlockIndex';
 }
diff --git a/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockDataGrid.php b/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockDataGrid.php
deleted file mode 100644
index c8c74a52f8..0000000000
--- a/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockDataGrid.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\DataGrid;
-
-use Backend\Core\Engine\DataGridDB;
-use Backend\Core\Language\Locale;
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
-
-/**
- * @TODO replace with a doctrine implementation of the data grid
- */
-class ContentBlockDataGrid extends DataGridDB
-{
-    public function __construct(Locale $locale)
-    {
-        parent::__construct(
-            'SELECT i.id, i.title, i.hidden
-             FROM content_blocks AS i
-             WHERE i.status = :active AND i.language = :language',
-            ['active' => ContentBlockStatus::active(), 'language' => $locale]
-        );
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockRevisionDataGrid.php b/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockRevisionDataGrid.php
deleted file mode 100644
index 466a947ab6..0000000000
--- a/src/Backend/Modules/ContentBlocks/DataGrid/ContentBlockRevisionDataGrid.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Backend\Modules\ContentBlocks\DataGrid;
-
-use Backend\Core\Engine\DataGridDB;
-use Backend\Core\Language\Locale;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
-
-/**
- * @TODO replace with a doctrine implementation of the data grid
- */
-class ContentBlockRevisionDataGrid extends DataGridDB
-{
-    public function __construct(ContentBlock $contentBlock, Locale $locale)
-    {
-        parent::__construct(
-            'SELECT i.id, i.revision_id, i.title, UNIX_TIMESTAMP(i.edited_on) AS edited_on, i.user_id
-             FROM content_blocks AS i
-             WHERE i.status = :archived AND i.id = :id AND i.language = :language
-             ORDER BY i.edited_on DESC',
-            ['archived' => ContentBlockStatus::archived(), 'language' => $locale, 'id' => $contentBlock->getId()]
-        );
-    }
-}
diff --git a/src/Backend/Modules/ContentBlocks/DependencyInjection/ContentBlocksExtension.php b/src/Backend/Modules/ContentBlocks/DependencyInjection/ContentBlocksExtension.php
index a694395665..df56052f92 100644
--- a/src/Backend/Modules/ContentBlocks/DependencyInjection/ContentBlocksExtension.php
+++ b/src/Backend/Modules/ContentBlocks/DependencyInjection/ContentBlocksExtension.php
@@ -18,8 +18,7 @@ class ContentBlocksExtension extends Extension implements PrependExtensionInterf
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('command.yml');
-        $loader->load('repository.yml');
+        $loader->load('services.yml');
     }
 
     public function prepend(ContainerBuilder $container): void
diff --git a/src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocale.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocale.php
similarity index 89%
rename from src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocale.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocale.php
index 80a2e52611..676f56a837 100644
--- a/src/Backend/Modules/ContentBlocks/Command/CopyContentBlocksToOtherLocale.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Command;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
 
 use Backend\Core\Language\Locale;
 
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocaleHandler.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocaleHandler.php
new file mode 100644
index 0000000000..a1722fb0b1
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CopyContentBlocksToOtherLocaleHandler.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
+
+use Backend\Core\Engine\Model;
+use Backend\Core\Language\Locale;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Status;
+use Common\ModuleExtraType;
+
+final class CopyContentBlocksToOtherLocaleHandler
+{
+    /** @var ContentBlockRepository */
+    private $contentBlockRepository;
+
+    public function __construct(ContentBlockRepository $contentBlockRepository)
+    {
+        $this->contentBlockRepository = $contentBlockRepository;
+    }
+
+    public function handle(CopyContentBlocksToOtherLocale $copyContentBlocksToOtherLocale): void
+    {
+        /** @var array $contentBlocksToCopy */
+        $contentBlocksToCopy = $this->getContentBlocksToCopy($copyContentBlocksToOtherLocale->fromLocale);
+
+        /** @var int $id */
+        $id = $this->contentBlockRepository->getNextIdForLanguage($copyContentBlocksToOtherLocale->toLocale);
+
+        array_map(
+            function (ContentBlock $contentBlock) use ($copyContentBlocksToOtherLocale, &$id) {
+                $copyContentBlocksToOtherLocale->extraIdMap[$contentBlock->getExtraId()] = $this->getNewExtraId();
+                $dataTransferObject = $contentBlock->getDataTransferObject();
+
+                // Overwrite some variables
+                $dataTransferObject->id = $id++;
+                $dataTransferObject->extraId = $copyContentBlocksToOtherLocale->extraIdMap[$contentBlock->getExtraId()];
+                $dataTransferObject->revisionId = null;
+                $dataTransferObject->locale = $copyContentBlocksToOtherLocale->toLocale;
+
+                $this->contentBlockRepository->add(ContentBlock::fromDataTransferObject($dataTransferObject));
+            },
+            $contentBlocksToCopy
+        );
+    }
+
+    private function getContentBlocksToCopy(Locale $locale): array
+    {
+        return (array) $this->contentBlockRepository->findBy(
+            [
+                'locale' => $locale,
+                'status' => Status::active()
+            ]
+        );
+    }
+
+    /**
+     * @return int
+     */
+    private function getNewExtraId(): int
+    {
+        return Model::insertExtra(
+            ModuleExtraType::widget(),
+            'ContentBlocks',
+            'Detail'
+        );
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlock.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlock.php
new file mode 100644
index 0000000000..5b89261266
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlock.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
+
+use Backend\Core\Language\Locale;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockDataTransferObject;
+use Symfony\Component\Validator\Constraints as Assert;
+
+final class CreateContentBlock extends ContentBlockDataTransferObject
+{
+    public function __construct(Locale $locale = null)
+    {
+        parent::__construct();
+
+        if ($locale === null) {
+            $locale = Locale::workingLocale();
+        }
+
+        $this->locale = $locale;
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlockHandler.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlockHandler.php
new file mode 100644
index 0000000000..3a47658f38
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/CreateContentBlockHandler.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
+
+use Backend\Core\Engine\Model;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository;
+use Common\ModuleExtraType;
+
+final class CreateContentBlockHandler
+{
+    /** @var ContentBlockRepository */
+    private $contentBlockRepository;
+
+    public function __construct(ContentBlockRepository $contentBlockRepository)
+    {
+        $this->contentBlockRepository = $contentBlockRepository;
+    }
+
+    public function handle(CreateContentBlock $createContentBlock): void
+    {
+        $createContentBlock->extraId = $this->getNewExtraId();
+        $createContentBlock->id = $this->contentBlockRepository->getNextIdForLanguage($createContentBlock->locale);
+
+        $contentBlock = ContentBlock::fromDataTransferObject($createContentBlock);
+        $this->contentBlockRepository->add($contentBlock);
+
+        $createContentBlock->setContentBlockEntity($contentBlock);
+    }
+
+    private function getNewExtraId(): int
+    {
+        return Model::insertExtra(
+            ModuleExtraType::widget(),
+            'ContentBlocks',
+            'Detail'
+        );
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Command/DeleteContentBlock.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlock.php
similarity index 53%
rename from src/Backend/Modules/ContentBlocks/Command/DeleteContentBlock.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlock.php
index 62941b3ce2..c6b5be8550 100644
--- a/src/Backend/Modules/ContentBlocks/Command/DeleteContentBlock.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlock.php
@@ -1,14 +1,12 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Command;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
 
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
 
 final class DeleteContentBlock
 {
-    /**
-     * @var ContentBlock
-     */
+    /** @var ContentBlock */
     public $contentBlock;
 
     public function __construct(ContentBlock $contentBlock)
diff --git a/src/Backend/Modules/ContentBlocks/Command/DeleteContentBlockHandler.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlockHandler.php
similarity index 75%
rename from src/Backend/Modules/ContentBlocks/Command/DeleteContentBlockHandler.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlockHandler.php
index e057f330cf..9252c26d62 100644
--- a/src/Backend/Modules/ContentBlocks/Command/DeleteContentBlockHandler.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/DeleteContentBlockHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Command;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
 
 use Backend\Core\Engine\Model;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\Repository\ContentBlockRepository;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository;
 
 final class DeleteContentBlockHandler
 {
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlock.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlock.php
new file mode 100644
index 0000000000..0c1af6804e
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlock.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
+
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockDataTransferObject;
+use Symfony\Component\Validator\Constraints as Assert;
+
+final class UpdateContentBlock extends ContentBlockDataTransferObject
+{
+    public function __construct(ContentBlock $contentBlock)
+    {
+        parent::__construct($contentBlock);
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlockHandler.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlockHandler.php
new file mode 100644
index 0000000000..18c2d2d3af
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Command/UpdateContentBlockHandler.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Command;
+
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository;
+
+final class UpdateContentBlockHandler
+{
+    /** @var ContentBlockRepository */
+    private $contentBlockRepository;
+
+    public function __construct(ContentBlockRepository $contentBlockRepository)
+    {
+        $this->contentBlockRepository = $contentBlockRepository;
+    }
+
+    public function handle(UpdateContentBlock $updateContentBlock): void
+    {
+        $contentBlock = ContentBlock::fromDataTransferObject($updateContentBlock);
+        $this->contentBlockRepository->add($contentBlock);
+
+        $updateContentBlock->setContentBlockEntity($contentBlock);
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Entity/ContentBlock.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlock.php
similarity index 77%
rename from src/Backend/Modules/ContentBlocks/Entity/ContentBlock.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlock.php
index 12571bd4c0..7d07e5053f 100644
--- a/src/Backend/Modules/ContentBlocks/Entity/ContentBlock.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlock.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Entity;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
 
 use Backend\Core\Engine\Model;
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
 use Common\Locale;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="content_blocks")
- * @ORM\Entity(repositoryClass="Backend\Modules\ContentBlocks\Repository\ContentBlockRepository")
+ * @ORM\Entity(repositoryClass="Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository")
  * @ORM\HasLifecycleCallbacks
  */
 class ContentBlock
@@ -83,7 +82,7 @@ class ContentBlock
     private $isHidden;
 
     /**
-     * @var ContentBlockStatus
+     * @var Status
      *
      * @ORM\Column(type="content_blocks_status", options={"default" = "active"})
      */
@@ -112,7 +111,7 @@ private function __construct(
         string $title,
         string $text,
         bool $isHidden,
-        ContentBlockStatus $status
+        Status $status
     ) {
         $this->id = $id;
         $this->userId = $userId;
@@ -125,26 +124,29 @@ private function __construct(
         $this->status = $status;
     }
 
-    public static function create(
-        int $id,
-        int $userId,
-        int $extraId,
-        Locale $locale,
-        string $title,
-        string $text,
-        bool $isHidden,
-        string $template = self::DEFAULT_TEMPLATE
-    ) : self {
+    public static function fromDataTransferObject(ContentBlockDataTransferObject $dataTransferObject)
+    {
+        if ($dataTransferObject->hasExistingContentBlock()) {
+            $dataTransferObject->getContentBlockEntity()->status = Status::archived();
+
+            return self::create($dataTransferObject);
+        }
+
+        return self::create($dataTransferObject);
+    }
+
+    private static function create(ContentBlockDataTransferObject $dataTransferObject): self
+    {
         return new self(
-            $id,
-            $userId,
-            $extraId,
-            $template,
-            $locale,
-            $title,
-            $text,
-            $isHidden,
-            ContentBlockStatus::active()
+            $dataTransferObject->id,
+            $dataTransferObject->userId,
+            $dataTransferObject->extraId,
+            $dataTransferObject->template,
+            $dataTransferObject->locale,
+            $dataTransferObject->title,
+            $dataTransferObject->text,
+            !$dataTransferObject->isVisible,
+            $dataTransferObject->status
         );
     }
 
@@ -193,7 +195,7 @@ public function isHidden(): bool
         return $this->isHidden;
     }
 
-    public function getStatus(): ContentBlockStatus
+    public function getStatus(): Status
     {
         return $this->status;
     }
@@ -249,24 +251,13 @@ private function updateWidget()
         Model::updateExtra($this->extraId, 'data', $data);
     }
 
-    public function update(string $title, string $text, bool $isHidden, string $template, int $userId): ContentBlock
+    public function archive()
     {
-        $this->status = ContentBlockStatus::archived();
-
-        return self::create(
-            $this->id,
-            $userId,
-            $this->extraId,
-            $this->locale,
-            $title,
-            $text,
-            $isHidden,
-            $template
-        );
+        $this->status = Status::archived();
     }
 
-    public function archive()
+    public function getDataTransferObject(): ContentBlockDataTransferObject
     {
-        $this->status = ContentBlockStatus::archived();
+        return new ContentBlockDataTransferObject($this);
     }
 }
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataGrid.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataGrid.php
new file mode 100644
index 0000000000..36e14b4f41
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataGrid.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
+
+use Backend\Core\Engine\DataGridDB;
+use Backend\Core\Engine\TemplateModifiers;
+use Backend\Core\Engine\Authentication as BackendAuthentication;
+use Backend\Core\Engine\Model;
+use Backend\Core\Language\Language;
+use Backend\Core\Language\Locale;
+
+/**
+ * @TODO replace with a doctrine implementation of the data grid
+ */
+class ContentBlockDataGrid extends DataGridDB
+{
+    public function __construct(Locale $locale)
+    {
+        parent::__construct(
+            'SELECT i.id, i.title, i.hidden
+             FROM content_blocks AS i
+             WHERE i.status = :active AND i.language = :language',
+            ['active' => Status::active(), 'language' => $locale]
+        );
+
+        $this->setSortingColumns(['title']);
+
+        // show the hidden status
+        $this->addColumn('isHidden', ucfirst(Language::lbl('VisibleOnSite')), '[hidden]');
+        $this->setColumnFunction([TemplateModifiers::class, 'showBool'], ['[hidden]', true], 'isHidden');
+
+        // check if this action is allowed
+        if (BackendAuthentication::isAllowedAction('ContentBlockEdit')) {
+            $editUrl = Model::createURLForAction('ContentBlockEdit', null, null, ['id' => '[id]'], false);
+            $this->setColumnURL('title', $editUrl);
+            $this->addColumn('edit', null, Language::lbl('Edit'), $editUrl, Language::lbl('Edit'));
+        }
+    }
+
+    public static function getHtml(Locale $locale): string
+    {
+        return (string) (new self($locale))->getContent();
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataTransferObject.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataTransferObject.php
new file mode 100644
index 0000000000..fe7507b563
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockDataTransferObject.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
+
+use Backend\Core\Language\Locale;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class ContentBlockDataTransferObject
+{
+    /**
+     * @var ContentBlock
+     */
+    private $contentBlockEntity;
+
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var int
+     */
+    public $extraId;
+
+    /**
+     * @var ?int
+     */
+    public $revisionId;
+
+    /**
+     * @var string
+     *
+     * @Assert\NotBlank(message="err.FieldIsRequired")
+     */
+    public $title;
+
+    /**
+     * @var string
+     *
+     * @Assert\NotBlank(message="err.FieldIsRequired")
+     */
+    public $template = ContentBlock::DEFAULT_TEMPLATE;
+
+    /**
+     * @var string
+     *
+     * @Assert\NotBlank(message="err.FieldIsRequired")
+     */
+    public $text;
+
+    /**
+     * @var bool
+     */
+    public $isVisible = true;
+
+    /**
+     * @var Locale
+     */
+    public $locale;
+
+    /**
+     * @var int
+     */
+    public $userId;
+
+    /**
+     * @var Status
+     */
+    public $status;
+
+    public function __construct(ContentBlock $contentBlock = null)
+    {
+        $this->contentBlockEntity = $contentBlock;
+
+        if (!$this->hasExistingContentBlock()) {
+            $this->status = Status::active();
+
+            return;
+        }
+
+        $this->id = $contentBlock->getId();
+        $this->extraId = $contentBlock->getExtraId();
+        $this->isVisible = !$contentBlock->isHidden();
+        $this->title = $contentBlock->getTitle();
+        $this->text = $contentBlock->getText();
+        $this->template = $contentBlock->getTemplate();
+        $this->userId = $contentBlock->getUserId();
+        $this->locale = $contentBlock->getLocale();
+        $this->status = $contentBlock->getStatus();
+        $this->revisionId = $contentBlock->getRevisionId();
+    }
+
+    public function getContentBlockEntity(): ContentBlock
+    {
+        return $this->contentBlockEntity;
+    }
+
+    public function hasExistingContentBlock(): bool
+    {
+        return $this->contentBlockEntity instanceof ContentBlock;
+    }
+
+    public function setContentBlockEntity(ContentBlock $contentBlockEntity): void
+    {
+        $this->contentBlockEntity = $contentBlockEntity;
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Repository/ContentBlockRepository.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRepository.php
similarity index 55%
rename from src/Backend/Modules/ContentBlocks/Repository/ContentBlockRepository.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRepository.php
index 7cf8877612..bb3a7e9955 100644
--- a/src/Backend/Modules/ContentBlocks/Repository/ContentBlockRepository.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRepository.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Repository;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
 
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Exception\ContentBlockNotFound;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Status;
 use Common\Locale;
 use Doctrine\ORM\EntityRepository;
 
@@ -21,9 +22,8 @@ function (ContentBlock $contentBlock) {
             );
         }
 
-        $this->getEntityManager()->persist($contentBlock);
-
         // We don't flush here, see http://disq.us/p/okjc6b
+        $this->getEntityManager()->persist($contentBlock);
     }
 
     public function getNextIdForLanguage(Locale $locale): int
@@ -38,20 +38,43 @@ public function getNextIdForLanguage(Locale $locale): int
             ->getSingleScalarResult() + 1;
     }
 
-    public function findOneByIdAndLocale($id, Locale $locale): ?ContentBlock
+    public function findOneByIdAndLocale(int $id = null, Locale $locale): ?ContentBlock
     {
-        return $this->findOneBy(['id' => $id, 'status' => ContentBlockStatus::active(), 'locale' => $locale]);
+        if ($id === null) {
+            throw ContentBlockNotFound::forEmptyId();
+        }
+
+        /** @var ContentBlock $contentBlock */
+        $contentBlock = $this->findOneBy(['id' => $id, 'status' => Status::active(), 'locale' => $locale]);
+
+        if ($contentBlock === null) {
+            throw ContentBlockNotFound::forId($id);
+        }
+
+        return $contentBlock;
     }
 
-    public function findOneByRevisionIdAndLocale($revisionId, Locale $locale): ?ContentBlock
+    public function findOneByRevisionIdAndLocale(int $revisionId = null, Locale $locale): ContentBlock
     {
-        return $this->findOneBy(
+        if ($revisionId === null) {
+            throw ContentBlockNotFound::forEmptyRevisionId();
+        }
+
+        /** @var ContentBlock|null ContentBlock */
+        $contentBlock = $this->findOneBy(
             ['revisionId' => $revisionId, 'locale' => $locale]
         );
+
+        if ($contentBlock === null) {
+            throw ContentBlockNotFound::forRevisionId($revisionId);
+        }
+
+        return $contentBlock;
     }
 
     public function removeByIdAndLocale($id, Locale $locale): void
     {
+        // We don't flush here, see http://disq.us/p/okjc6b
         array_map(
             function (ContentBlock $contentBlock) {
                 $this->getEntityManager()->remove($contentBlock);
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRevisionDataGrid.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRevisionDataGrid.php
new file mode 100644
index 0000000000..fcee55fe1d
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockRevisionDataGrid.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
+
+use Backend\Core\Engine\Authentication;
+use Backend\Core\Engine\DataGridDB;
+use Backend\Core\Engine\DataGridFunctions;
+use Backend\Core\Engine\Model;
+use Backend\Core\Language\Language;
+use Backend\Core\Language\Locale;
+
+/**
+ * @TODO replace with a doctrine implementation of the data grid
+ */
+class ContentBlockRevisionDataGrid extends DataGridDB
+{
+    public function __construct(ContentBlock $contentBlock, Locale $locale)
+    {
+        parent::__construct(
+            'SELECT i.id, i.revision_id, i.title, UNIX_TIMESTAMP(i.edited_on) AS edited_on, i.user_id
+             FROM content_blocks AS i
+             WHERE i.status = :archived AND i.id = :id AND i.language = :language
+             ORDER BY i.edited_on DESC',
+            ['archived' => Status::archived(), 'language' => $locale, 'id' => $contentBlock->getId()]
+        );
+
+        // hide columns
+        $this->setColumnsHidden(['id', 'revision_id']);
+
+        // disable paging
+        $this->setPaging(false);
+
+        // set headers
+        $this->setHeaderLabels(
+            [
+                'user_id' => ucfirst(Language::lbl('By')),
+                'edited_on' => ucfirst(Language::lbl('LastEditedOn')),
+            ]
+        );
+
+        // set column-functions
+        $this->setColumnFunction([DataGridFunctions::class, 'getUser'], ['[user_id]'], 'user_id');
+        $this->setColumnFunction([DataGridFunctions::class, 'getTimeAgo'], ['[edited_on]'], 'edited_on');
+
+        // check if this action is allowed
+        if (Authentication::isAllowedAction('Edit')) {
+            $editRevisionUrl = Model::createURLForAction(
+                'ContentBlockEdit',
+                null,
+                null,
+                ['id' => '[id]', 'revision' => '[revision_id]'],
+                false
+            );
+            // set column URLs
+            $this->setColumnURL('title', $editRevisionUrl);
+
+            // add use column
+            $this->addColumn(
+                'use_revision',
+                null,
+                Language::lbl('UseThisVersion'),
+                $editRevisionUrl,
+                Language::lbl('UseThisVersion')
+            );
+        }
+    }
+
+    public static function getHtml(ContentBlock $contentBlock, Locale $locale): string
+    {
+        return (string) (new self($contentBlock, $locale))->getContent();
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/Form/ContentBlockType.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockType.php
similarity index 92%
rename from src/Backend/Modules/ContentBlocks/Form/ContentBlockType.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockType.php
index a2a9669fb1..2e96d6c7ac 100644
--- a/src/Backend/Modules/ContentBlocks/Form/ContentBlockType.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/ContentBlockType.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Form;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
 
 use Backend\Form\Type\EditorType;
-use Backend\Modules\ContentBlocks\Command\CreateContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CreateContentBlock;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -66,7 +66,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired('theme');
-        $resolver->setDefaults(['data_class' => CreateContentBlock::class]);
+        $resolver->setDefaults(['data_class' => ContentBlockDataTransferObject::class]);
     }
 
     public function getBlockPrefix(): string
diff --git a/src/Backend/Modules/ContentBlocks/Event/ContentBlockCreated.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockCreated.php
similarity index 77%
rename from src/Backend/Modules/ContentBlocks/Event/ContentBlockCreated.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockCreated.php
index d21c44a74f..d516676085 100644
--- a/src/Backend/Modules/ContentBlocks/Event/ContentBlockCreated.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockCreated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Event;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Event;
 
 final class ContentBlockCreated extends ContentBlockEvent
 {
diff --git a/src/Backend/Modules/ContentBlocks/Event/ContentBlockDeleted.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockDeleted.php
similarity index 77%
rename from src/Backend/Modules/ContentBlocks/Event/ContentBlockDeleted.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockDeleted.php
index b8862e273b..3fa3884929 100644
--- a/src/Backend/Modules/ContentBlocks/Event/ContentBlockDeleted.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockDeleted.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Event;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Event;
 
 final class ContentBlockDeleted extends ContentBlockEvent
 {
diff --git a/src/Backend/Modules/ContentBlocks/Event/ContentBlockEvent.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockEvent.php
similarity index 73%
rename from src/Backend/Modules/ContentBlocks/Event/ContentBlockEvent.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockEvent.php
index 6afb6ccf8b..62f4824c9f 100644
--- a/src/Backend/Modules/ContentBlocks/Event/ContentBlockEvent.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Event;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Event;
 
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
 use Symfony\Component\EventDispatcher\Event;
 
 abstract class ContentBlockEvent extends Event
diff --git a/src/Backend/Modules/ContentBlocks/Event/ContentBlockUpdated.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockUpdated.php
similarity index 77%
rename from src/Backend/Modules/ContentBlocks/Event/ContentBlockUpdated.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockUpdated.php
index 074c9a2a67..0a2fe5145f 100644
--- a/src/Backend/Modules/ContentBlocks/Event/ContentBlockUpdated.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Event/ContentBlockUpdated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\Event;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Event;
 
 final class ContentBlockUpdated extends ContentBlockEvent
 {
diff --git a/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Exception/ContentBlockNotFound.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Exception/ContentBlockNotFound.php
new file mode 100644
index 0000000000..f7f0869e2b
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Exception/ContentBlockNotFound.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock\Exception;
+
+use Exception;
+
+class ContentBlockNotFound extends Exception
+{
+    public static function forEmptyId(): self
+    {
+        return new self('The id you have given is null');
+    }
+
+    public static function forEmptyRevisionId(): self
+    {
+        return new self('The revision-id you have given is null');
+    }
+
+    public static function forId(string $id): self
+    {
+        return new self('Can\'t find a ContentBlock with id = "' . $id . '".');
+    }
+
+    public static function forRevisionId(string $id): self
+    {
+        return new self('Can\'t find a ContentBlock with revision-id = "' . $id . '".');
+    }
+}
diff --git a/src/Backend/Modules/ContentBlocks/ValueObject/ContentBlockStatus.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Status.php
similarity index 93%
rename from src/Backend/Modules/ContentBlocks/ValueObject/ContentBlockStatus.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Status.php
index ea41e42b0d..89e8489d34 100644
--- a/src/Backend/Modules/ContentBlocks/ValueObject/ContentBlockStatus.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/Status.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\ValueObject;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
 
 use InvalidArgumentException;
 
-final class ContentBlockStatus
+final class Status
 {
     private const STATUS_ARCHIVED = 'archived';
     private const STATUS_ACTIVE = 'active';
diff --git a/src/Backend/Modules/ContentBlocks/DBALType/ContentBlockStatusDBALType.php b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/StatusDBALType.php
similarity index 62%
rename from src/Backend/Modules/ContentBlocks/DBALType/ContentBlockStatusDBALType.php
rename to src/Backend/Modules/ContentBlocks/Domain/ContentBlock/StatusDBALType.php
index 12e23feea3..fe40627c6e 100644
--- a/src/Backend/Modules/ContentBlocks/DBALType/ContentBlockStatusDBALType.php
+++ b/src/Backend/Modules/ContentBlocks/Domain/ContentBlock/StatusDBALType.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Backend\Modules\ContentBlocks\DBALType;
+namespace Backend\Modules\ContentBlocks\Domain\ContentBlock;
 
-use Backend\Modules\ContentBlocks\ValueObject\ContentBlockStatus;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\Status;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
-class ContentBlockStatusDBALType extends Type
+class StatusDBALType extends Type
 {
     const CONTENT_BLOCKS_STATUS = 'content_blocks_status';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
     {
-        return 'ENUM("' . implode('","', ContentBlockStatus::getPossibleStatuses()) . '")';
+        return 'ENUM("' . implode('","', Status::getPossibleStatuses()) . '")';
     }
 
-    public function convertToPHPValue($status, AbstractPlatform $platform): ContentBlockStatus
+    public function convertToPHPValue($status, AbstractPlatform $platform): Status
     {
-        return ContentBlockStatus::fromString($status);
+        return Status::fromString($status);
     }
 
     public function convertToDatabaseValue($status, AbstractPlatform $platform): string
diff --git a/src/Backend/Modules/ContentBlocks/Installer/Data/locale.xml b/src/Backend/Modules/ContentBlocks/Installer/Data/locale.xml
index 36e1fbf380..209f79bb1b 100644
--- a/src/Backend/Modules/ContentBlocks/Installer/Data/locale.xml
+++ b/src/Backend/Modules/ContentBlocks/Installer/Data/locale.xml
@@ -2,21 +2,6 @@
 <locale>
   <Backend>
     <ContentBlocks>
-      <item type="label" name="Add">
-        <translation language="nl"><![CDATA[inhoudsblok toevoegen]]></translation>
-        <translation language="en"><![CDATA[add content block]]></translation>
-        <translation language="hu"><![CDATA[új tartalmi blokk]]></translation>
-        <translation language="it"><![CDATA[aggiungi un blocco di contenuto]]></translation>
-        <translation language="ru"><![CDATA[Добавить блок]]></translation>
-        <translation language="zh"><![CDATA[添加内容块]]></translation>
-        <translation language="de"><![CDATA[Inhaltsblock hinzufügen]]></translation>
-        <translation language="fr"><![CDATA[ajouter un bloc de contenu]]></translation>
-        <translation language="es"><![CDATA[agregar bloque de contenido]]></translation>
-        <translation language="uk"><![CDATA[Додати блок]]></translation>
-        <translation language="lt"><![CDATA[naujas turinio blokas]]></translation>
-        <translation language="sv"><![CDATA[lägg till innehålls block]]></translation>
-        <translation language="el"><![CDATA[Προσθήκη Μπλοκ Περιεχομένου]]></translation>
-      </item>
       <item type="message" name="Added">
         <translation language="nl"><![CDATA[Het inhoudsblok "%1$s" werd toegevoegd.]]></translation>
         <translation language="en"><![CDATA[The content block "%1$s" was added.]]></translation>
@@ -31,20 +16,22 @@
         <translation language="sv"><![CDATA[Innehålls block "%1$s" har lagts till.]]></translation>
         <translation language="el"><![CDATA[Το μπλοκ περιεχομένου "%1$s" προστέθηκε.]]></translation>
       </item>
-      <item type="message" name="ConfirmDelete">
-        <translation language="nl"><![CDATA[Ben je zeker dat je de inhoudsblok "%1$s" wil verwijderen?]]></translation>
-        <translation language="en"><![CDATA[Are your sure you want to delete the content block "%1$s"?]]></translation>
-        <translation language="it"><![CDATA[Sei sicuro di voler eliminare il blocco di contenuto "%1$s"?]]></translation>
-        <translation language="ru"><![CDATA[Вы действительно хотите удалить блок "%1$s"?]]></translation>
-        <translation language="zh"><![CDATA[你确定要删除内容块“%1$s”吗？]]></translation>
-        <translation language="de"><![CDATA[Soll der Inhaltsblock "%1$s" wirklich gelöscht werden?]]></translation>
-        <translation language="fr"><![CDATA[Etes-vous sûr de vouloir effacer le bloc de contenu "%1$s"?]]></translation>
-        <translation language="hu"><![CDATA[Biztos törölni akarod a(z) "%1$s" tartalmi blokkot?]]></translation>
-        <translation language="es"><![CDATA[¿Estás seguro de que quieres eliminar el bloque de contenido "%1$s"?]]></translation>
-        <translation language="sv"><![CDATA[Är du säker på att du vill till ta bort innehållsblocket "%1$s"?]]></translation>
-        <translation language="el"><![CDATA[Σίγουρα θέλετε να διαγράψετε το μπλοκ περιεχομένου "%1$s";]]></translation>
+      <item type="label" name="ContentBlockAdd">
+        <translation language="nl"><![CDATA[inhoudsblok toevoegen]]></translation>
+        <translation language="en"><![CDATA[add content block]]></translation>
+        <translation language="hu"><![CDATA[új tartalmi blokk]]></translation>
+        <translation language="it"><![CDATA[aggiungi un blocco di contenuto]]></translation>
+        <translation language="ru"><![CDATA[Добавить блок]]></translation>
+        <translation language="zh"><![CDATA[添加内容块]]></translation>
+        <translation language="de"><![CDATA[Inhaltsblock hinzufügen]]></translation>
+        <translation language="fr"><![CDATA[ajouter un bloc de contenu]]></translation>
+        <translation language="es"><![CDATA[agregar bloque de contenido]]></translation>
+        <translation language="uk"><![CDATA[Додати блок]]></translation>
+        <translation language="lt"><![CDATA[naujas turinio blokas]]></translation>
+        <translation language="sv"><![CDATA[lägg till innehålls block]]></translation>
+        <translation language="el"><![CDATA[Προσθήκη Μπλοκ Περιεχομένου]]></translation>
       </item>
-      <item type="message" name="Deleted">
+      <item type="message" name="ContentBlockDeleted">
         <translation language="nl"><![CDATA[Het inhoudsblok "%1$s" werd verwijderd.]]></translation>
         <translation language="en"><![CDATA[The content block "%1$s" was deleted.]]></translation>
         <translation language="it"><![CDATA[Il blocco di contenuto "%1$s" è stato eliminato.]]></translation>
@@ -57,20 +44,20 @@
         <translation language="sv"><![CDATA[Innehållsblocket "%1$s" är borttaget.]]></translation>
         <translation language="el"><![CDATA[Το μπλοκ περιεχομένου "%1$s" διεγράφη.]]></translation>
       </item>
-      <item type="message" name="EditContentBlock">
-        <translation language="nl"><![CDATA[bewerk inhoudsblok "%1$s"]]></translation>
-        <translation language="en"><![CDATA[edit content block "%1$s"]]></translation>
-        <translation language="it"><![CDATA[modifica il blocco di contenuto "%1$s"]]></translation>
-        <translation language="ru"><![CDATA[Редактировать "%1$s"]]></translation>
-        <translation language="zh"><![CDATA[编辑内容块“%1$s”]]></translation>
-        <translation language="de"><![CDATA[bearbeite Inhaltsblock "%1$s"]]></translation>
-        <translation language="hu"><![CDATA["%1$s" tartalmi blokk szerkesztése]]></translation>
-        <translation language="fr"><![CDATA[éditer le bloc de contenu "%1$s"]]></translation>
-        <translation language="es"><![CDATA[editar bloque de contenido "%1$s"]]></translation>
-        <translation language="sv"><![CDATA[ändra innehållsblock "%1$s"]]></translation>
-        <translation language="el"><![CDATA[Μεταβολή του μπλοκ περιεχομένου "%1$s"]]></translation>
+      <item type="label" name="ContentBlockEdit">
+        <translation language="nl"><![CDATA[bewerk inhoudsblok]]></translation>
+        <translation language="en"><![CDATA[edit content block]]></translation>
+        <translation language="it"><![CDATA[modifica il blocco di contenuto]]></translation>
+        <translation language="ru"><![CDATA[Редактировать]]></translation>
+        <translation language="zh"><![CDATA[编辑内容块]]></translation>
+        <translation language="de"><![CDATA[bearbeite Inhaltsblock]]></translation>
+        <translation language="hu"><![CDATA[tartalmi blokk szerkesztése]]></translation>
+        <translation language="fr"><![CDATA[éditer le bloc de contenu]]></translation>
+        <translation language="es"><![CDATA[editar bloque de contenido]]></translation>
+        <translation language="sv"><![CDATA[ändra innehållsblock]]></translation>
+        <translation language="el"><![CDATA[Μεταβολή του μπλοκ περιεχομένου]]></translation>
       </item>
-      <item type="message" name="Edited">
+      <item type="message" name="ContentBlockEdited">
         <translation language="nl"><![CDATA[Het inhoudsblok "%1$s" werd opgeslagen.]]></translation>
         <translation language="en"><![CDATA[The content block "%1$s" was saved.]]></translation>
         <translation language="it"><![CDATA[Il blocco di contenuto "%1$s" è stato salvato.]]></translation>
@@ -83,6 +70,35 @@
         <translation language="sv"><![CDATA[Innehållsblocket "%1$s" sparades.]]></translation>
         <translation language="el"><![CDATA[Το μπλοκ περιεχομένου "%1$s" αποθηκεύτηκε.]]></translation>
       </item>
+      <item type="label" name="ContentBlockIndex">
+        <translation language="nl"><![CDATA[overzicht]]></translation>
+        <translation language="en"><![CDATA[overview]]></translation>
+        <translation language="hu"><![CDATA[áttekintés]]></translation>
+        <translation language="ru"><![CDATA[Обзор]]></translation>
+        <translation language="it"><![CDATA[panoramica]]></translation>
+        <translation language="zh"><![CDATA[概览]]></translation>
+        <translation language="de"><![CDATA[Übersicht]]></translation>
+        <translation language="fr"><![CDATA[vue d'ensemble]]></translation>
+        <translation language="es"><![CDATA[resumen]]></translation>
+        <translation language="lt"><![CDATA[apžvalga]]></translation>
+        <translation language="uk"><![CDATA[Перегляд]]></translation>
+        <translation language="sv"><![CDATA[översikt]]></translation>
+        <translation language="el"><![CDATA[επισκόπιση]]></translation>
+        <translation language="tr"><![CDATA[Genel]]></translation>
+      </item>
+      <item type="message" name="ConfirmDelete">
+        <translation language="nl"><![CDATA[Ben je zeker dat je de inhoudsblok "%1$s" wil verwijderen?]]></translation>
+        <translation language="en"><![CDATA[Are your sure you want to delete the content block "%1$s"?]]></translation>
+        <translation language="it"><![CDATA[Sei sicuro di voler eliminare il blocco di contenuto "%1$s"?]]></translation>
+        <translation language="ru"><![CDATA[Вы действительно хотите удалить блок "%1$s"?]]></translation>
+        <translation language="zh"><![CDATA[你确定要删除内容块“%1$s”吗？]]></translation>
+        <translation language="de"><![CDATA[Soll der Inhaltsblock "%1$s" wirklich gelöscht werden?]]></translation>
+        <translation language="fr"><![CDATA[Etes-vous sûr de vouloir effacer le bloc de contenu "%1$s"?]]></translation>
+        <translation language="hu"><![CDATA[Biztos törölni akarod a(z) "%1$s" tartalmi blokkot?]]></translation>
+        <translation language="es"><![CDATA[¿Estás seguro de que quieres eliminar el bloque de contenido "%1$s"?]]></translation>
+        <translation language="sv"><![CDATA[Är du säker på att du vill till ta bort innehållsblocket "%1$s"?]]></translation>
+        <translation language="el"><![CDATA[Σίγουρα θέλετε να διαγράψετε το μπλοκ περιεχομένου "%1$s";]]></translation>
+      </item>
       <item type="message" name="NoTemplate">
         <translation language="nl"><![CDATA[Geen template]]></translation>
         <translation language="en"><![CDATA[No template]]></translation>
diff --git a/src/Backend/Modules/ContentBlocks/Installer/Installer.php b/src/Backend/Modules/ContentBlocks/Installer/Installer.php
index a6bc9d0240..6b654d1424 100644
--- a/src/Backend/Modules/ContentBlocks/Installer/Installer.php
+++ b/src/Backend/Modules/ContentBlocks/Installer/Installer.php
@@ -11,7 +11,7 @@
 
 use Backend\Core\Engine\Model;
 use Backend\Core\Installer\ModuleInstaller;
-use Backend\Modules\ContentBlocks\Entity\ContentBlock;
+use Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock;
 
 /**
  * Installer for the content blocks module
@@ -35,8 +35,8 @@ private function configureBackendNavigation(): void
         $this->setNavigation(
             $navigationModulesId,
             $this->getModule(),
-            'content_blocks/index',
-            ['content_blocks/add', 'content_blocks/edit']
+            'content_blocks/content_block_index',
+            ['content_blocks/content_block_add', 'content_blocks/content_block_edit']
         );
     }
 
@@ -44,10 +44,10 @@ private function configureBackendRights(): void
     {
         $this->setModuleRights(1, $this->getModule());
 
-        $this->setActionRights(1, $this->getModule(), 'Add');
-        $this->setActionRights(1, $this->getModule(), 'Delete');
-        $this->setActionRights(1, $this->getModule(), 'Edit');
-        $this->setActionRights(1, $this->getModule(), 'Index');
+        $this->setActionRights(1, $this->getModule(), 'ContentBlockAdd');
+        $this->setActionRights(1, $this->getModule(), 'ContentBlockDelete');
+        $this->setActionRights(1, $this->getModule(), 'ContentBlockEdit');
+        $this->setActionRights(1, $this->getModule(), 'ContentBlockIndex');
     }
 
     private function configureEntities(): void
diff --git a/src/Backend/Modules/ContentBlocks/Layout/Templates/Add.html.twig b/src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockAdd.html.twig
similarity index 100%
rename from src/Backend/Modules/ContentBlocks/Layout/Templates/Add.html.twig
rename to src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockAdd.html.twig
diff --git a/src/Backend/Modules/ContentBlocks/Layout/Templates/Edit.html.twig b/src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockEdit.html.twig
similarity index 91%
rename from src/Backend/Modules/ContentBlocks/Layout/Templates/Edit.html.twig
rename to src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockEdit.html.twig
index 909a5e6df2..b0b16ff135 100644
--- a/src/Backend/Modules/ContentBlocks/Layout/Templates/Edit.html.twig
+++ b/src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockEdit.html.twig
@@ -51,7 +51,7 @@
     <div class="col-md-12">
       <div class="btn-toolbar">
         <div class="btn-group pull-left" role="group">
-          {% if showContentBlocksDelete %}
+          {% if showContentBlocksContentBlockDelete %}
             <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#confirmDelete">
               <span class="fa fa-trash-o"></span>
               {{ 'lbl.Delete'|trans|ucfirst }}
@@ -64,7 +64,7 @@
           </button>
         </div>
       </div>
-      {% if showContentBlocksDelete %}
+      {% if showContentBlocksContentBlockDelete %}
         <div class="modal fade" id="confirmDelete" tabindex="-1" role="dialog" aria-hidden="true">
           <div class="modal-dialog">
             <div class="modal-content">
@@ -72,13 +72,13 @@
                 <span class="modal-title h4">{{ 'lbl.Delete'|trans|ucfirst }}</span>
               </div>
               <div class="modal-body">
-                <p>{{ 'msg.ConfirmDelete'|trans|format(title)|raw }}</p>
+                <p>{{ 'msg.ConfirmDelete'|trans|format(contentBlock.title)|raw }}</p>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">
                   <span class="fa fa-times"></span>{{ 'lbl.Cancel'|trans|ucfirst }}
                 </button>
-                <a href="{{ geturl('delete') }}&amp;id={{ id }}" class="btn btn-danger">
+                <a href="{{ geturl('ContentBlockDelete') }}&amp;id={{ contentBlock.id }}" class="btn btn-danger">
                   <span class="fa fa-trash"></span>{{ 'lbl.Delete'|trans|ucfirst }}
                 </a>
               </div>
diff --git a/src/Backend/Modules/ContentBlocks/Layout/Templates/Index.html.twig b/src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockIndex.html.twig
similarity index 66%
rename from src/Backend/Modules/ContentBlocks/Layout/Templates/Index.html.twig
rename to src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockIndex.html.twig
index 3f96418120..b39e11ecea 100644
--- a/src/Backend/Modules/ContentBlocks/Layout/Templates/Index.html.twig
+++ b/src/Backend/Modules/ContentBlocks/Layout/Templates/ContentBlockIndex.html.twig
@@ -1,10 +1,10 @@
 {% extends '/Layout/Templates/base.html.twig' %}
 
 {% block actionbar %}
-  {% if showContentBlocksAdd %}
+  {% if showContentBlocksContentBlockAdd %}
     <div class="btn-toolbar pull-right">
       <div class="btn-group" role="group">
-        {{ macro.buttonIcon( geturl('add'), 'plus-square', 'lbl.Add'|trans|ucfirst) }}
+        {{ macro.buttonIcon( geturl('ContentBlockAdd'), 'plus-square', 'lbl.Add'|trans|ucfirst) }}
       </div>
     </div>
   {% endif %}
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/command.yml b/src/Backend/Modules/ContentBlocks/Resources/config/commands.yml
similarity index 55%
rename from src/Backend/Modules/ContentBlocks/Resources/config/command.yml
rename to src/Backend/Modules/ContentBlocks/Resources/config/commands.yml
index 5ba327b0f5..18e519717b 100644
--- a/src/Backend/Modules/ContentBlocks/Resources/config/command.yml
+++ b/src/Backend/Modules/ContentBlocks/Resources/config/commands.yml
@@ -1,28 +1,28 @@
 services:
     content_blocks.handler.create_content_block:
-        class: Backend\Modules\ContentBlocks\Command\CreateContentBlockHandler
+        class: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CreateContentBlockHandler
         arguments:
             - "@content_blocks.repository.content_block"
         tags:
-            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Command\CreateContentBlock }
+            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CreateContentBlock }
 
     content_blocks.handler.update_content_block:
-        class: Backend\Modules\ContentBlocks\Command\UpdateContentBlockHandler
+        class: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\UpdateContentBlockHandler
         arguments:
             - "@content_blocks.repository.content_block"
         tags:
-            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Command\UpdateContentBlock }
+            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\UpdateContentBlock }
 
     content_blocks.handler.delete_content_block:
-        class: Backend\Modules\ContentBlocks\Command\DeleteContentBlockHandler
+        class: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\DeleteContentBlockHandler
         arguments:
             - "@content_blocks.repository.content_block"
         tags:
-            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Command\DeleteContentBlock }
+            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\DeleteContentBlock }
 
     content_blocks.handler.copy_content_blocks_to_other_locale:
-        class: Backend\Modules\ContentBlocks\Command\CopyContentBlocksToOtherLocaleHandler
+        class: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CopyContentBlocksToOtherLocaleHandler
         arguments:
             - "@content_blocks.repository.content_block"
         tags:
-            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Command\CopyContentBlocksToOtherLocale }
+            - { name: command_handler, handles: Backend\Modules\ContentBlocks\Domain\ContentBlock\Command\CopyContentBlocksToOtherLocale }
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/doctrine.yml b/src/Backend/Modules/ContentBlocks/Resources/config/doctrine.yml
index 5f41fe0556..96b6f2767f 100644
--- a/src/Backend/Modules/ContentBlocks/Resources/config/doctrine.yml
+++ b/src/Backend/Modules/ContentBlocks/Resources/config/doctrine.yml
@@ -1,4 +1,12 @@
 doctrine:
   dbal:
     types:
-      content_blocks_status: Backend\Modules\ContentBlocks\DBALType\ContentBlockStatusDBALType
+      content_blocks_status: Backend\Modules\ContentBlocks\Domain\ContentBlock\StatusDBALType
+  orm:
+    mappings:
+      content_block:
+        type: annotation
+        is_bundle: false
+        dir: %kernel.root_dir%/../src/Backend/Modules/ContentBlocks/Domain/ContentBlock
+        alias: ContentBlocksContentBlock
+        prefix: Backend\Modules\ContentBlocks\Domain\ContentBlock
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/events.yml b/src/Backend/Modules/ContentBlocks/Resources/config/events.yml
new file mode 100644
index 0000000000..6098f03c93
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Resources/config/events.yml
@@ -0,0 +1,7 @@
+services:
+    content_blocks.listener.send_custom_events:
+        class: Backend\Modules\ContentBlocks\EventListener\MediaFolderInvalidateBackendCacheSubscriber
+        arguments:
+            - "@media_library.cache.media_folder"
+        tags:
+            - { name: doctrine.event_subscriber }
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/repositories.yml b/src/Backend/Modules/ContentBlocks/Resources/config/repositories.yml
new file mode 100644
index 0000000000..2fe66fe2ad
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Resources/config/repositories.yml
@@ -0,0 +1,6 @@
+services:
+    content_blocks.repository.content_block:
+        class: Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlockRepository
+        factory: ["@doctrine.orm.entity_manager", getRepository]
+        arguments:
+            - Backend\Modules\ContentBlocks\Domain\ContentBlock\ContentBlock
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/repository.yml b/src/Backend/Modules/ContentBlocks/Resources/config/repository.yml
deleted file mode 100644
index 5d115f7b35..0000000000
--- a/src/Backend/Modules/ContentBlocks/Resources/config/repository.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-    content_blocks.repository.content_block:
-        class: Backend\Modules\ContentBlocks\Repository\ContentBlockRepository
-        factory: ["@doctrine.orm.entity_manager", getRepository]
-        arguments:
-            - Backend\Modules\ContentBlocks\Entity\ContentBlock
diff --git a/src/Backend/Modules/ContentBlocks/Resources/config/services.yml b/src/Backend/Modules/ContentBlocks/Resources/config/services.yml
new file mode 100644
index 0000000000..8cc42bdd18
--- /dev/null
+++ b/src/Backend/Modules/ContentBlocks/Resources/config/services.yml
@@ -0,0 +1,3 @@
+imports:
+  - { resource: commands.yml }
+  - { resource: repositories.yml }