diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
index 1c6396d5..b51c5617 100644
--- a/.github/workflows/codeception.yml
+++ b/.github/workflows/codeception.yml
@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://test:test@127.0.0.1:3306/dachcom_bundle_test"
@@ -38,12 +38,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -98,9 +98,11 @@ jobs:
 
             -   name: Setup Chromium
                 run: |
-                    nohup $CHROMEWEBDRIVER/chromedriver --url-base=/wd/hub /dev/null 2>&1 &
+                    export DISPLAY=:99
+                    chromedriver --url-base=/wd/hub &
+                    sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
 
-            -   name: Start Webserver and Chrome
+            -   name: Start Symfony Server
                 run: |
                     curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir=$HOME/.symfony/bin
                     ~/.symfony/bin/symfony server:start --port=8080 --dir=public --allow-http --no-tls --daemon
diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
index 1534be84..70adce99 100644
--- a/.github/workflows/ecs.yml
+++ b/.github/workflows/ecs.yml
@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
index 8b932f51..569eb977 100644
--- a/.github/workflows/php-stan.yml
+++ b/.github/workflows/php-stan.yml
@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
diff --git a/.gitignore b/.gitignore
index c4c84f2e..c63d3704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,4 @@ php-cgi.core
 /tests/_output/*
 /tests/_data/*
 !/tests/_data/.gitkeep
-/tests/_support/_generated/*
+/tests/Support/_generated/*
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 5c9e622a..3f51a10a 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
-| Q                | A
-| ---------------- | -----
-| Bug report?      | yes/no
-| Feature request? | yes/no
-| BC Break report? | yes/no
-| RFC?             | yes/no
+| Q                | A      |
+|------------------|--------|
+| Bug report?      | yes/no |
+| Feature request? | yes/no |
+| BC Break report? | yes/no |
+| RFC?             | yes/no |
 
 <!--
 - Please fill in this template according to your issue.
diff --git a/LICENSE.md b/LICENSE.md
index e05752d0..560ff3b2 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,5 @@
 # License
-Copyright (C) 2022 DACHCOM.DIGITAL
+Copyright (C) 2023 DACHCOM.DIGITAL
 
 This software is available under the GNU General Public License version 3 (GPLv3).
 
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index aecee69a..1c228e75 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,11 @@
-| Q             | A
-| ------------- | ---
-| Branch?       | dev-master for features / 3.x for bug fixes
-| Bug fix?      | yes/no
-| New feature?  | yes/no
-| BC breaks?    | no
-| Deprecations? | yes/no
-| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
+| Q             | A                                                  |
+|---------------|----------------------------------------------------|
+| Branch?       | dev-master for features / 4.x for bug fixes        |
+| Bug fix?      | yes/no                                             |
+| New feature?  | yes/no                                             |
+| BC breaks?    | no                                                 |
+| Deprecations? | yes/no                                             |
+| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any --> |
 
 <!--
 Write a short README entry for your feature/bugfix here (replace this comment block.)
diff --git a/README.md b/README.md
index 29f751ca..c453920b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@
 
 | Release | Supported Pimcore Versions        | Supported Symfony Versions | Release Date | Maintained     | Branch                                                                           |
 |---------|-----------------------------------|----------------------------|--------------|----------------|----------------------------------------------------------------------------------|
-| **4.x** | `10.5`, `10.6`                    | `^5.4`                     | 13.10.2021   | Feature Branch | master                                                                           |
+| **5.x** | `11.0`                            | `6.2`                      | --           | Feature Branch | master                                                                           |
+| **4.x** | `10.5`, `10.6`                    | `^5.4`                     | 13.10.2021   | Feature Branch | [4.x](https://github.com/dachcom-digital/pimcore-formbuilder/tree/4.x)           |
 | **3.x** | `6.0` - `6.9`                     | `3.4`, `^4.4`              | 17.07.2019   | Bugfix only    | [3.x](https://github.com/dachcom-digital/pimcore-formbuilder/tree/3.x)           |
 | **2.7** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 27.06.2019   | Unsupported    | [2.7](https://github.com/dachcom-digital/pimcore-formbuilder/tree/2.7)           |
 | **1.5** | `4.0`                             | --                         | 18.03.2017   | Unsupported    | [pimcore4](https://github.com/dachcom-digital/pimcore-formbuilder/tree/pimcore4) |
@@ -21,11 +22,17 @@
 
 ```json
 "require" : {
-    "dachcom-digital/formbuilder" : "~4.5.0"
+    "dachcom-digital/formbuilder" : "~5.0.0"
 }
 ```
 
-- Execute: `$ bin/console pimcore:bundle:enable FormBuilderBundle`
+Add Bundle to `bundles.php`:
+```php
+return [
+    FormBuilderBundle\FormBuilderBundle::class => ['all' => true],
+];
+```
+
 - Execute: `$ bin/console pimcore:bundle:install FormBuilderBundle`
 
 ## Upgrading
diff --git a/UPGRADE.md b/UPGRADE.md
index ae20ca22..81c3fb3a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,132 +1,19 @@
 # Upgrade Notes
-
-## Version 4.5.0
-- **[BUGFIX]**: allow `GET` operation on `/form-control/get-url-structure` route [#383](https://github.com/dachcom-digital/pimcore-formbuilder/issues/383)
-- **[BUGFIX]**: suppress php warning of undefined array key [@jheimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/387)
-- **[ENHANCEMENT]**: Adds sort buttons for choices in ChoiceType [@jheimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/388)
-- **[ENHANCEMENT]**: Allow Relation(s) in Object Channel [#390](https://github.com/dachcom-digital/pimcore-formbuilder/issues/390)
-- **[NEW FEATURE]**: Data Injectors [#395](https://github.com/dachcom-digital/pimcore-formbuilder/issues/395)
-
-## Version 4.4.1
-- **[BUGFIX]**: [Constraint Options] ignore internal properties [#381](https://github.com/dachcom-digital/pimcore-formbuilder/pull/381)
-
-## Version 4.4.0
-- **[ENHANCEMENT]**: Added `format` option to `Birthday`, `DateTime` and `DateField`
-- **[ENHANCEMENT]**: Translate all non-default constraints messages (Key contains `message`)
-- **[ENHANCEMENT]**: New Constraints added:
-  - `Symfony\Component\Validator\Constraints\Type`
-  - `Symfony\Component\Validator\Constraints\Count`
-  - `Symfony\Component\Validator\Constraints\Choice`
-
-## Version 4.3.2
-- **[BUGFIX]**: Assert valid timezone in date time fallback output transformer
-
-## Version 4.3.1
-- **[BUGFIX]**: Fix field collection assignment [#375](https://github.com/dachcom-digital/pimcore-formbuilder/issues/375)
-
-## Version 4.3.0
-- **[ENHANCEMENT]**: Use Flysystem for Storage [#334](https://github.com/dachcom-digital/pimcore-formbuilder/issues/334)
-  - Remove `PIMCORE_SYSTEM_TEMP_DIRECTORY/formbuilder-cache` as it is no longer needed
-
-## Version 4.2.3
-- **[BUGFIX]**: Fix field collection mapping [#370](https://github.com/dachcom-digital/pimcore-formbuilder/issues/370)
-
-## Version 4.2.2
-- **[BUGFIX]**: Export/Import Form fix [#371](https://github.com/dachcom-digital/pimcore-formbuilder/issues/371)
-
-## Version 4.2.1
-- **[ENHANCEMENT]**: Input Transformer [#7bde83b](https://github.com/dachcom-digital/pimcore-formbuilder/pull/369/commits/7bde83b015d242f2ce2f93fcd0b4feb78431587c)
-- **[BUGFIX]**: Translate Funnel Action Label in Backend [#b4966a2](https://github.com/dachcom-digital/pimcore-formbuilder/pull/369/commits/b4966a2f23c0aa55e1df214632984ff0164aa945)
-
-## Version 4.2.0
-- **[NEW FEATURE]**: Funnel Feature [#362](https://github.com/dachcom-digital/pimcore-formbuilder/issues/362)
-- **[FEATURE]**: PIMCORE 10.5 Support only!
-- **[ENHANCEMENT]**: Removed deprecated session `NamespacedAttributeBag` which was unused
-- **[ENHANCEMENT]**: Remove session from service DI
-- **[ENHANCEMENT]**: Use EventListener instead of legacy plugin architecture, to boot ExtJS extensions
-- **[DEPRECATION]**: Deprecated Method `assembleViewVars()` in `FormAssembler`, use `assemble()` instead
-
-## Version 4.1.4
-- **[BUGFIX]**: Fix link to translation list [#359](https://github.com/dachcom-digital/pimcore-formbuilder/pull/359)
-- **[BUGFIX]**: skip dependency if document is null [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/354)
-- **[BUGFIX]**: Check for valid success management configuration [#299](https://github.com/dachcom-digital/pimcore-formbuilder/issues/299)
-- **[NEW FEATURE]**: Add Mail-Log Filter to Email Channel [#297](https://github.com/dachcom-digital/pimcore-formbuilder/issues/297)
-- **[NEW FEATURE]**: Allow mapping of elements in fieldset container in Object Chanel [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/355)
-
-## Version 4.1.3
-- **[BUGFIX]**: Fix `ignoreFields` Assignment: Use `CollectionType` instead of `ChoiceType` [#352](https://github.com/dachcom-digital/pimcore-formbuilder/pull/352)
-
-## Version 4.1.2
-- **[BUGFIX]**: Rename overwitten `$translator` property in `MailEditorController` (Pimcore 10.5 compatibility). [@vollborn](https://github.com/dachcom-digital/pimcore-formbuilder/pull/345)
-- **[BUGFIX]**: Type mismatch in `FormOptionsResolver` fixed. [#346](https://github.com/dachcom-digital/pimcore-formbuilder/pull/347)
-- **[BUGFIX]**: Remove dummy csv generation loader [@pascalmoser](https://github.com/dachcom-digital/pimcore-formbuilder/pull/328)
-- **[BUGFIX]**: ConditionalLogic: Load form data from container fields [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/330)
-- **[BUGFIX]**: ConditionalLogic: Allow empty Validation field when removeAllValidations action is checked [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/331)
-- **[BUGFIX]**: Fix detectFormRuntimeDataInRequest null return [@dpfaffenbauer](https://github.com/dachcom-digital/pimcore-formbuilder/pull/335)
-- **[BUGFIX]**: Consider Pimcore Frontend FullPath for File Output [@dpfaffenbauer](https://github.com/dachcom-digital/pimcore-formbuilder/pull/336)
-- **[BUGFIX]**: E-Mail CSV Export contains data of several forms when their Output Workflows share the same title [@anyMOTION-GRAPHICS](https://github.com/dachcom-digital/pimcore-formbuilder/issues/325)
-- **[ENHANCEMENT]**: Add `role="presentation"` to honeypot field [#333](https://github.com/dachcom-digital/pimcore-formbuilder/issues/333)
-
-## Version 4.1.1
-- **[BUGFIX]**: Fix legacy fine uploader identifier
-
-## Version 4.1.0
-- **[NEW FEATURE]**: API Output channel [#290](https://github.com/dachcom-digital/pimcore-formbuilder/issues/301)
-- **[NEW FEATURE]**: API Output channel field transformer
-- **[BUGFIX]**: ensure migration of form configs will be symfony5 compatible [@grizzlydotweb](https://github.com/dachcom-digital/pimcore-formbuilder/pull/310)
-- **[BUGFIX]**: introduce output workflow signals: attachments not working with multiple channels [#311](https://github.com/dachcom-digital/pimcore-formbuilder/issues/311) 
-- **[BUGFIX]**: fix typo in translation [#312](https://github.com/dachcom-digital/pimcore-formbuilder/issues/312)
-- **[BUGFIX]**: disable `selectOnFocus` [#315](https://github.com/dachcom-digital/pimcore-formbuilder/issues/315)
-- **[BUGFIX]**: ⚠️ add help text block to dynamic multi file. touched view: `form/theme/type/dynamic_multi_file.html.twig` [#308](https://github.com/dachcom-digital/pimcore-formbuilder/issues/308)
-- **[BUGFIX]**: ⚠️ multi file upload: hidden type `_data` not in form row. touched view: `form/theme/type/dynamic_multi_file.html.twig` [#316](https://github.com/dachcom-digital/pimcore-formbuilder/issues/316) 
-
-## Version 4.0.2
-- [ENHANCEMENT] enable placeholder in cc and bcc field in email output workflow [@frithjof](https://github.com/dachcom-digital/pimcore-formbuilder/pull/305)
-
-## Version 4.0.1
-- [FEATURE] PIMCORE 10.2 Support
  
-## Migrating from Version 3.x to Version 4.0.0
-⚠️ If you're still on version `2.x`, you need to update to `3.x` first, then [migrate](https://github.com/dachcom-digital/pimcore-formbuilder/blob/3.x/UPGRADE.md) to `3.3`. After that, you're able to update to `^4.0`.
-
-> 💀 Be careful while migrating to production!
-> A lot of things (including form configuration) have changed and will break your installation if you're ignoring the migration guide below!
-
-### Migration
-- Execute `bin/console doctrine:migrations:migrate --prefix 'FormBuilderBundle\Migrations'` after you've installed FormBuilder
-- Remove `var/bundles/FormBuilderBundle/forms` if migration was successful
+## Migrating from Version 4.x to Version 5.0
+- Execute: `bin/console doctrine:migrations:migrate --prefix 'FormBuilderBundle\Migrations'`
 
 ### Global Changes
-- Deprecations have been removed:
-  - `FormBuilderBundle\Storage\Form` needs to be `FormBuilderBundle\Model\FormDefinition` now
-  - `FormBuilderBundle\Storage\FormInterface` needs to be `FormBuilderBundle\Model\FormDefinitionInterface` now
-  - `FormBuilderBundle\Storage\FormFieldSimpleInterface` needs to be `FormBuilderBundle\Model\FieldDefinitionInterface` now
-  - `FormBuilderBundle\Manager\FormManager` needs to be `FormBuilderBundle\Manager\FormDefinitionManager` now
-  - `FormBuilderBundle\Event\MailEvent` has been removed, use `FormBuilderBundle\Event\OutputWorkflow\ChannelSubjectGuardEvent` instead
-  - Method `FormBuilderBundle\Assembler\FormAssembler::setFormOptionsResolver` has been removed. `FormBuilderBundle\Assembler\FormAssembler::assembleViewVars($optionsResolver)` directly requires FormOptionsResolver now
-  - CSV export types `Only Admin-Mail` and `Only User-Mail (Copy)` have been removed. Instead, you're now able to filter CSV export by available output workflows
-  - Mail layout fallback feature has been removed (which was enabled if no workflows have been defined and have been stored in `formbuilder_forms.mailLayout`). Please migrate layouts to email channels. This column will be removed with FormBuilder 5.0
-- PHP8 return type declarations added: you may have to adjust your extensions accordingly
-- Email properties (`mail_successfully_sent`, `mail_ignore_fields`, `mail_force_plain_text`, `mail_disable_default_mail_body`) have been removed and won't be recognized anymore
-- Area-Brick Configuration does not allow `sendMailTmplate` and `sendCopyMailTemplate` fallbacks anymore. They must be configured by output workflows now
-- All Folders in `views` are lowercase/dashed now (`common/redirect-flash-message.html.twig`, `email/form-data.html.twig`, `form/elements/dynamic-multi-file`, `form/presets`, `form/theme`, ...)
-- If you have a custom email template, make sure that you're passing the `body`, `editmode`, `document` attributes to your email view template (@see `\FormBuilderBundle\Controller::emailAction()`). Also use `{{ body|raw }}` instead of `%Text(body);` inside your view template!
-- `DropZoneAdapter` has been declared to the new default Multi File Handler. You can switch back to FineUploader by changing the `form_builder.dynamic_multi_file_adapter` configuration node
-- All frontend javascript libraries have been removed from core. If you still want to use the jQuery extensions, please check out our [jquery-pimcore-formbuilder repo](https://github.com/dachcom-digital/jquery-pimcore-formbuilder)
-
-### Conditional Logic Changes
-- ⚠️ Action `Change Mail Behaviour` has been removed. Use `Switch Output Workflow` Action instead. 
-
-### Fixes
-- Bootstrap Theme: Class `form-control` has been removed from dynamic multi file (see [#253](https://github.com/dachcom-digital/pimcore-formbuilder/pull/253)). You now need to set some [style definitions](docs/90_FrontendTips.md#multi-file-validation) by yourself
-- Fixes root meta validation [#290](https://github.com/dachcom-digital/pimcore-formbuilder/issues/290)
+- [DEPRECATION REMOVED] removed `FormDefinition::setMailLayout`. Please migrate to output workflows before updating
+- [IMPROVEMENTS] Recommended folder structure by symfony adopted
+- [FUNNEL] Route include changed from `@FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml` to `@FormBuilderBundle/config/pimcore/routing_funnels.yaml`
+- [BC BREAK] Mail Layout Editor: While there is a migration, we're not able to migrate container (fieldset, repeater) fields. Please adjust your output workflow channels manually.
+- [BC BREAK] All views are lowercase/underscore now (`email/form_data.html.twig`, `form/elements/dynamic_multi_file/*`)
 
 ### New Features
-- Conditional Logic Action `Switch Output Workflow` added
-- [Configurable Html2Text Options](./docs/OutputWorkflow/10_EmailChannel.md#configure-html2text-options)
-- Yaml file storage migrated to Database storage
-- Import/Export Improvement: You're able to export/import the complete form dataset (form, workflows and channels)
+- Mail Layout Editor, see [#390](https://github.com/dachcom-digital/pimcore-formbuilder/issues/398)
+  - If [Emailizr](https://github.com/dachcom-digital/pimcore-emailizr) is installed, formbuilder will use it automatically to transform html tables
 
 ***
 
-FormBuilder 3.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-formbuilder/blob/3.x/UPGRADE.md
+FormBuilder 4.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-formbuilder/blob/4.x/UPGRADE.md
diff --git a/codeception.dist.yml b/codeception.dist.yml
index 882426c9..296aad20 100644
--- a/codeception.dist.yml
+++ b/codeception.dist.yml
@@ -1,14 +1,15 @@
 namespace: DachcomBundle\Test
+support_namespace: Support
 actor: Tester
 paths:
     tests: tests
-    output: tests/_output
-    data: tests/_data
-    support: tests/_support
     envs: tests/_envs
+    output: tests/_output
     log: tests/_output/var/logs
+    data: tests/_data
+    support: tests/Support
+bootstrap: _bootstrap.php
 settings:
-    bootstrap: _bootstrap.php
     memory_limit: -1
     colors: true
 params:
diff --git a/composer.json b/composer.json
index 05ee7de2..f62aecd4 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "FormBuilderBundle\\": "src/FormBuilderBundle"
+            "FormBuilderBundle\\": "src/"
         }
     },
     "autoload-dev": {
@@ -31,13 +31,16 @@
         }
     },
     "require": {
-        "pimcore/pimcore": "^10.5",
+        "php": "^8.2",
+        "pimcore/pimcore": "^11.0",
+        "symfony/form": "^6.2",
+        "symfony/intl": "^6.2",
         "doctrine/orm": "^2.7"
     },
     "require-dev": {
-        "codeception/codeception": "^4.1",
-        "codeception/module-webdriver": "^1.4",
-        "codeception/module-symfony": "^1.6",
+        "codeception/codeception": "^5.0",
+        "codeception/module-symfony": "^3.1",
+        "codeception/module-webdriver": "^4.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "symplify/easy-coding-standard": "^9.0"
diff --git a/src/FormBuilderBundle/Resources/config/backend/base_config.yml b/config/backend/base_config.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/backend/base_config.yml
rename to config/backend/base_config.yaml
diff --git a/src/FormBuilderBundle/Resources/config/doctrine/model/FormDefinition.orm.yml b/config/doctrine/model/FormDefinition.orm.yml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/doctrine/model/FormDefinition.orm.yml
rename to config/doctrine/model/FormDefinition.orm.yml
diff --git a/src/FormBuilderBundle/Resources/config/doctrine/model/OutputWorkflow.orm.yml b/config/doctrine/model/OutputWorkflow.orm.yml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/doctrine/model/OutputWorkflow.orm.yml
rename to config/doctrine/model/OutputWorkflow.orm.yml
diff --git a/src/FormBuilderBundle/Resources/config/doctrine/model/OutputWorkflowChannel.orm.yml b/config/doctrine/model/OutputWorkflowChannel.orm.yml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/doctrine/model/OutputWorkflowChannel.orm.yml
rename to config/doctrine/model/OutputWorkflowChannel.orm.yml
diff --git a/src/FormBuilderBundle/Resources/install/sql/install.sql b/config/install/sql/install.sql
similarity index 100%
rename from src/FormBuilderBundle/Resources/install/sql/install.sql
rename to config/install/sql/install.sql
diff --git a/src/FormBuilderBundle/Resources/install/translations/admin.csv b/config/install/translations/admin.csv
similarity index 95%
rename from src/FormBuilderBundle/Resources/install/translations/admin.csv
rename to config/install/translations/admin.csv
index 141f735a..e37a80f2 100644
--- a/src/FormBuilderBundle/Resources/install/translations/admin.csv
+++ b/config/install/translations/admin.csv
@@ -11,7 +11,6 @@
 "form_builder.area.output_workflow","Output Workflow","Output Workflow"
 "form_builder.area.no_output_workflow","No Output Workflow available","Kein Output Workflow verfügbar"
 "form_builder.area.output_workflow.legacy.trigger","Attention","Hinweis"
-"form_builder.area.output_workflow.legacy.note","Defining mail templates in this element is a deprecated feature. Please add some output workflows in your form configuration instead of using this output definition fields above.","Das Definieren von Mail-Vorlagen in diesem Element ist eine veraltete Funktion. Bitte fügen Sie Output-Workflows in der Formular-Konfiguration hinzu, anstatt diese Ausgabe-Definitionsfelder zu verwenden."
 "form_builder.email.form_renders_automatically","Form data will be rendered automatically.","Formular-Inhalt wird automatisch in dieses E-Mail eingefügt."
 "form_builder.email.custom_style_activated_use_placeholder","Custom style mode has been activated. Please use placeholder like %s to display form value fields.","Benutzerdefiniertes Formular-Layout wurde aktiviert. Bitte benutzen Sie Platzhalter (zb. %s), um Formular-Elemente im E-Mail anzuzeigen."
 "form_builder.email.form_will_placed_here","Your form content will be placed here.","Formular-Inhalt wird hier angezeigt."
@@ -124,7 +123,7 @@
 "form_builder_type_container.repeater.option.label.remove_block","'Remove Block' Button Label (Js)","'Block entfernen' Label (Js)"
 "form_builder.mail_editor.widget_provider.form_fields","Form Fields","Formular-Felder"
 "form_builder.mail_editor.widget_provider.others","Others","Allgemein"
-"form_builder.mail_editor.widget_provider.form_fields.show_labels","Show Labels","Labels anzeigen"
+"form_builder.mail_editor.widget_provider.form_fields.repeater_block_label","Block Label","Block Label"
 "form_builder.mail_editor.widget_provider.date.date","Date","Datum"
 "form_builder.mail_editor.widget_provider.date.date_format","Date Format","Datum-Format"
 "form_builder_type_field.date_html5","use HTML5 type", "HTML5-Typ benutzen"
diff --git a/src/FormBuilderBundle/Resources/install/translations/frontend.csv b/config/install/translations/frontend.csv
similarity index 100%
rename from src/FormBuilderBundle/Resources/install/translations/frontend.csv
rename to config/install/translations/frontend.csv
diff --git a/src/FormBuilderBundle/Resources/config/pimcore/config.yml b/config/pimcore/config.yaml
similarity index 97%
rename from src/FormBuilderBundle/Resources/config/pimcore/config.yml
rename to config/pimcore/config.yaml
index dbd260ae..2e45379e 100644
--- a/src/FormBuilderBundle/Resources/config/pimcore/config.yml
+++ b/config/pimcore/config.yaml
@@ -1,6 +1,6 @@
 doctrine_migrations:
     migrations_paths:
-        'FormBuilderBundle\Migrations': '@FormBuilderBundle/Migrations'
+        'FormBuilderBundle\Migrations': '@FormBuilderBundle/src/Migrations'
 
 doctrine:
     orm:
@@ -239,7 +239,6 @@ form_builder:
                         type: workflow_select
                         label: 'form_builder_output_workflow_select'
 imports:
-    - { resource: '../backend/base_config.yml' }
-    - { resource: '../types/field_types.yml' }
-    - { resource: '../types/container_types.yml' }
-    - { resource: '../extension/extension.yml' }
\ No newline at end of file
+    - { resource: '../backend/base_config.yaml' }
+    - { resource: '../types/field_types.yaml' }
+    - { resource: '../types/container_types.yaml' }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/config/pimcore/routing.yml b/config/pimcore/routing.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/pimcore/routing.yml
rename to config/pimcore/routing.yaml
diff --git a/src/FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml b/config/pimcore/routing_funnels.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml
rename to config/pimcore/routing_funnels.yaml
diff --git a/src/FormBuilderBundle/Resources/config/pimcore/routing_funnels_not_localized.yml b/config/pimcore/routing_funnels_not_localized.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/pimcore/routing_funnels_not_localized.yml
rename to config/pimcore/routing_funnels_not_localized.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/File.yml b/config/serialization/File.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/File.yml
rename to config/serialization/File.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/FileStack.yml b/config/serialization/FileStack.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/FileStack.yml
rename to config/serialization/FileStack.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/FormStorageData.yml b/config/serialization/FormStorageData.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/FormStorageData.yml
rename to config/serialization/FormStorageData.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/FunnelActionDefinition.yml b/config/serialization/FunnelActionDefinition.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/FunnelActionDefinition.yml
rename to config/serialization/FunnelActionDefinition.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/FunnelActionElement.yml b/config/serialization/FunnelActionElement.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/FunnelActionElement.yml
rename to config/serialization/FunnelActionElement.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/OutputWorkflowChannel.yml b/config/serialization/OutputWorkflowChannel.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/OutputWorkflowChannel.yml
rename to config/serialization/OutputWorkflowChannel.yaml
diff --git a/src/FormBuilderBundle/Resources/config/serialization/OutputWorkflowSignalEvent.yml b/config/serialization/OutputWorkflowSignalEvent.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/serialization/OutputWorkflowSignalEvent.yml
rename to config/serialization/OutputWorkflowSignalEvent.yaml
diff --git a/config/services.yaml b/config/services.yaml
new file mode 100644
index 00000000..c8f0eed1
--- /dev/null
+++ b/config/services.yaml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: services/conditional_logic/*.yaml }
+    - { resource: services/mail_editor/*.yaml }
+    - { resource: services/output_workflow/*.yaml }
+    - { resource: services/forms/*.yaml }
+    - { resource: services/transformer/*.yaml }
+    - { resource: services/*.yaml }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/config/services/assembler.yml b/config/services/assembler.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/assembler.yml
rename to config/services/assembler.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/brick.yml b/config/services/brick.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/brick.yml
rename to config/services/brick.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/builder.yml b/config/services/builder.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/builder.yml
rename to config/services/builder.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/conditional_logic/action.yml b/config/services/conditional_logic/action.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/conditional_logic/action.yml
rename to config/services/conditional_logic/action.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/conditional_logic/condition.yml b/config/services/conditional_logic/condition.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/conditional_logic/condition.yml
rename to config/services/conditional_logic/condition.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/conditional_logic/config.yml b/config/services/conditional_logic/config.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/conditional_logic/config.yml
rename to config/services/conditional_logic/config.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/conditional_logic/dispatcher.yml b/config/services/conditional_logic/dispatcher.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/conditional_logic/dispatcher.yml
rename to config/services/conditional_logic/dispatcher.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/controller.yml b/config/services/controller.yaml
similarity index 80%
rename from src/FormBuilderBundle/Resources/config/services/controller.yml
rename to config/services/controller.yaml
index dec7bd49..de755166 100644
--- a/src/FormBuilderBundle/Resources/config/services/controller.yml
+++ b/config/services/controller.yaml
@@ -1,7 +1,7 @@
 services:
 
     FormBuilderBundle\Controller\:
-        resource: '../../Controller'
+        resource: '../../src/Controller'
         public: true
         autowire: true
         autoconfigure: true
diff --git a/src/FormBuilderBundle/Resources/config/services/data_injection.yml b/config/services/data_injection.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/data_injection.yml
rename to config/services/data_injection.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/dynamic_choice.yml b/config/services/dynamic_choice.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/dynamic_choice.yml
rename to config/services/dynamic_choice.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/dynamic_multi_file.yml b/config/services/dynamic_multi_file.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/dynamic_multi_file.yml
rename to config/services/dynamic_multi_file.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/event.yml b/config/services/event.yaml
similarity index 87%
rename from src/FormBuilderBundle/Resources/config/services/event.yml
rename to config/services/event.yaml
index dc7b8f54..12de9b0d 100644
--- a/src/FormBuilderBundle/Resources/config/services/event.yml
+++ b/config/services/event.yaml
@@ -25,6 +25,10 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
+    FormBuilderBundle\EventListener\Admin\AssetListener:
+        tags:
+            - { name: kernel.event_subscriber }
+
     FormBuilderBundle\EventListener\Core\CleanUpListener:
         tags:
             - {name: pimcore.maintenance.task, type: formbuilder_clean_up }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/config/services/event_subscriber.yml b/config/services/event_subscriber.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/event_subscriber.yml
rename to config/services/event_subscriber.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/factory.yml b/config/services/factory.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/factory.yml
rename to config/services/factory.yaml
diff --git a/src/FormBuilderBundle/Resources/config/extension/extension.yml b/config/services/form_extension.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/extension/extension.yml
rename to config/services/form_extension.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/forms/forms.yml b/config/services/forms/forms.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/forms/forms.yml
rename to config/services/forms/forms.yaml
diff --git a/config/services/mail_editor/config.yaml b/config/services/mail_editor/config.yaml
new file mode 100644
index 00000000..7036fd73
--- /dev/null
+++ b/config/services/mail_editor/config.yaml
@@ -0,0 +1,41 @@
+parameters:
+    form_builder_mail_editor_html_valid_tags: [ 'table', 'tbody', 'td', 'tr', 'a', 'strong', 'em', 'ul', 'ol', 'li', 'br' ]
+    form_builder_mail_editor_text_valid_tags: [ 'br' ]
+    form_builder_mail_editor_template_parser_inky_replaces: {
+        '<table': '<container',
+        '</table>': '</container>',
+        '<tr': '<row',
+        '</tr>': '</row>',
+        '<td': '<columns small="12" large="6"',
+        '</td>': '</columns>',
+        '<tbody>': '',
+        '</tbody>': ''
+    }
+
+services:
+
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+        bind:
+            $useEmailizr: '%formbuilder.use_emailizr%'
+
+    FormBuilderBundle\Registry\MailEditorWidgetRegistry: ~
+
+    FormBuilderBundle\MailEditor\Parser\PlaceholderParserInterface: '@FormBuilderBundle\MailEditor\Parser\PlaceholderParser'
+    FormBuilderBundle\MailEditor\Parser\PlaceholderParser:
+        arguments:
+            $validHtmlTags: '%form_builder_mail_editor_html_valid_tags%'
+            $validTextTags: '%form_builder_mail_editor_text_valid_tags%'
+            $templateParser: !tagged_iterator form_builder.mail_editor.template_parser
+
+    FormBuilderBundle\MailEditor\Parser\TemplateParser\InkyParser:
+        arguments:
+            $replaces: '%form_builder_mail_editor_template_parser_inky_replaces%'
+        tags:
+            - { name: form_builder.mail_editor.template_parser }
+
+    FormBuilderBundle\MailEditor\Parser\TemplateParser\PlainTextParser:
+        tags:
+            - { name: form_builder.mail_editor.template_parser }
diff --git a/src/FormBuilderBundle/Resources/config/services/mail_editor/widgets.yml b/config/services/mail_editor/widgets.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/mail_editor/widgets.yml
rename to config/services/mail_editor/widgets.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/manager.yml b/config/services/manager.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/manager.yml
rename to config/services/manager.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/api.yml b/config/services/output_workflow/api.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/api.yml
rename to config/services/output_workflow/api.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/channels.yml b/config/services/output_workflow/channels.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/channels.yml
rename to config/services/output_workflow/channels.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/dynamic_object_resolver.yml b/config/services/output_workflow/dynamic_object_resolver.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/dynamic_object_resolver.yml
rename to config/services/output_workflow/dynamic_object_resolver.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/form.yml b/config/services/output_workflow/form.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/form.yml
rename to config/services/output_workflow/form.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/funnel_layers.yml b/config/services/output_workflow/funnel_layers.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/funnel_layers.yml
rename to config/services/output_workflow/funnel_layers.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/output_workflow/services.yml b/config/services/output_workflow/services.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/output_workflow/services.yml
rename to config/services/output_workflow/services.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/repository.yml b/config/services/repository.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/repository.yml
rename to config/services/repository.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/runtime_data.yml b/config/services/runtime_data.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/runtime_data.yml
rename to config/services/runtime_data.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/storage_provider.yml b/config/services/storage_provider.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/storage_provider.yml
rename to config/services/storage_provider.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/stream.yml b/config/services/stream.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/stream.yml
rename to config/services/stream.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/system.yml b/config/services/system.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/system.yml
rename to config/services/system.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/transformer/options_transformer.yml b/config/services/transformer/options_transformer.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/transformer/options_transformer.yml
rename to config/services/transformer/options_transformer.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/transformer/output_input_transformer.yml b/config/services/transformer/output_input_transformer.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/transformer/output_input_transformer.yml
rename to config/services/transformer/output_input_transformer.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/twig.yml b/config/services/twig.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/twig.yml
rename to config/services/twig.yaml
diff --git a/src/FormBuilderBundle/Resources/config/services/validator.yml b/config/services/validator.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/services/validator.yml
rename to config/services/validator.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/container_types.yml b/config/types/container_types.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/container_types.yml
rename to config/types/container_types.yaml
diff --git a/config/types/field_types.yaml b/config/types/field_types.yaml
new file mode 100644
index 00000000..2ce521f6
--- /dev/null
+++ b/config/types/field_types.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: type/*.yaml }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/config/types/type/birthday.yml b/config/types/type/birthday.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/birthday.yml
rename to config/types/type/birthday.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/checkbox.yml b/config/types/type/checkbox.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/checkbox.yml
rename to config/types/type/checkbox.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/choice.yml b/config/types/type/choice.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/choice.yml
rename to config/types/type/choice.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/choice_dynamic.yml b/config/types/type/choice_dynamic.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/choice_dynamic.yml
rename to config/types/type/choice_dynamic.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/country.yml b/config/types/type/country.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/country.yml
rename to config/types/type/country.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/date.yml b/config/types/type/date.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/date.yml
rename to config/types/type/date.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/date_time.yml b/config/types/type/date_time.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/date_time.yml
rename to config/types/type/date_time.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/dynamic_multi_file.yml b/config/types/type/dynamic_multi_file.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/dynamic_multi_file.yml
rename to config/types/type/dynamic_multi_file.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/hidden.yml b/config/types/type/hidden.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/hidden.yml
rename to config/types/type/hidden.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/html_tag.yml b/config/types/type/html_tag.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/html_tag.yml
rename to config/types/type/html_tag.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/integer.yml b/config/types/type/integer.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/integer.yml
rename to config/types/type/integer.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/recaptcha_v3.yml b/config/types/type/recaptcha_v3.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/recaptcha_v3.yml
rename to config/types/type/recaptcha_v3.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/snippet.yml b/config/types/type/snippet.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/snippet.yml
rename to config/types/type/snippet.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/submit.yml b/config/types/type/submit.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/submit.yml
rename to config/types/type/submit.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/text.yml b/config/types/type/text.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/text.yml
rename to config/types/type/text.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/textarea.yml b/config/types/type/textarea.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/textarea.yml
rename to config/types/type/textarea.yaml
diff --git a/src/FormBuilderBundle/Resources/config/types/type/time.yml b/config/types/type/time.yaml
similarity index 100%
rename from src/FormBuilderBundle/Resources/config/types/type/time.yml
rename to config/types/type/time.yaml
diff --git a/docs/90_FrontendTips.md b/docs/90_FrontendTips.md
index 1efdff28..3b390e2b 100644
--- a/docs/90_FrontendTips.md
+++ b/docs/90_FrontendTips.md
@@ -75,7 +75,7 @@ Just use the translation html editor to define some html label:
 If you're using some choice meta attributes, you need to adjust your theme:
 
 ```twig
-{# app/Resources/FormBuilderBundle/views/Form/Theme/bootstrap_4_layout.html.twig #}
+{# templates/bundles/FormBuilderBundle/form/theme/bootstrap_4_layout.html.twig #}
 {% extends "@!FormBuilder/Form/Theme/bootstrap_4_layout.html.twig" %}
 
 {% block widget_attributes -%}
diff --git a/docs/OutputWorkflow/10_EmailChannel.md b/docs/OutputWorkflow/10_EmailChannel.md
index 1fe60938..b6797e2d 100644
--- a/docs/OutputWorkflow/10_EmailChannel.md
+++ b/docs/OutputWorkflow/10_EmailChannel.md
@@ -10,13 +10,13 @@ There is also a `Default` fallback field. If a requested locale can't be found d
 
 ## Available Options
 
-| Name | Type        | Description |
-|------|-------------|-------------|
-| Mail Template | Pimcore Mail Type | Use it to define the mail template via drag'n'drop. |
-| Ignored Field in Email | Tags | In some cases, you don't want to send specific fields via mail. For example, if you send a copy to the user. Add one or multiple fields as string. *Notice:* The field name needs be identical to the field name in your form configuration. |
-| Allow Attachment | Checkbox | If this is checked, attachments or attachments-links will be appended to the mail. |
-| Force Plain Text Submission | Checkbox | If you want to force the plain text submission, you need to check this option. Read more about the submission types [below](./10_EmailChannel.md#mail-submission-types). |
-| Required By | Checkbox | If this is checked, you need to add your own data to the mail template. You can use all the field names as placeholder. This function is only necessary in rare cases. |
+| Name                        | Type              | Description                                                                                                                                                                                                                                  |
+|-----------------------------|-------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Mail Template               | Pimcore Mail Type | Use it to define the mail template via drag'n'drop.                                                                                                                                                                                          |
+| Ignored Field in Email      | Tags              | In some cases, you don't want to send specific fields via mail. For example, if you send a copy to the user. Add one or multiple fields as string. *Notice:* The field name needs be identical to the field name in your form configuration. |
+| Allow Attachment            | Checkbox          | If this is checked, attachments or attachments-links will be appended to the mail.                                                                                                                                                           |
+| Force Plain Text Submission | Checkbox          | If you want to force the plain text submission, you need to check this option. Read more about the submission types [below](./10_EmailChannel.md#mail-submission-types).                                                                     |
+| Required By                 | Checkbox          | If this is checked, you need to add your own data to the mail template. You can use all the field names as placeholder. This function is only necessary in rare cases.                                                                       |
 
 ***
 
@@ -62,15 +62,14 @@ You'll find all available options directly on GitHub via [thephpleague/html-to-m
 ***
 
 ## Mail Layout Editor
+https://user-images.githubusercontent.com/700119/266572709-6367f49b-9f86-4d5a-8029-45067d629733.png
 
-![](http://g.recordit.co/OJ7uM6FxY0.gif)
-
-> **Attention**: This mail layout editor does not respect any special mail template language (like inky)!
- 
 ## Things to know
 - Always save your form before opening the mail editor
 
-## Custom Service
+***
+
+## Custom Widget
 Use the mail editor to specify some special mail templates.
 It's very easy to add some custom template widgets (Eg. date field).
 
@@ -114,7 +113,7 @@ class DateWidget implements MailEditorWidgetInterface
         ];
     }
 
-    public function getValueForOutput(array $config)
+    public function getValueForOutput(array $config, string $layoutType)
     {
         $form = $config['form'];
         $link = isset($config['link']) ? $config['link'] : '';
@@ -123,3 +122,36 @@ class DateWidget implements MailEditorWidgetInterface
     }
 }
 ```
+
+## Template Parser
+
+### Build-In Parser
+- Inky Parser (Only available if emailizr has been installed)
+- PlainText Parser
+
+### Custom Template Parser
+
+```yaml
+App\MailEditor\Parser\TemplateParser\MySpecialParser:
+    tags:
+        - { name: form_builder.mail_editor.template_parser }
+```
+
+```php
+<?php
+
+namespace App\MailEditor\Parser\TemplateParser;
+
+class MySpecialParser implements TemplateParserInterface
+{
+    public function supports(string $layoutType, string $layout): bool
+    {
+        return $layoutType === 'text';
+    }
+
+    public function parse(string $template): string
+    {
+        return str_replace(['<br />', '<br>'], "\n", $template);
+    }
+}
+```
\ No newline at end of file
diff --git a/docs/OutputWorkflow/15_OutputTransformer.md b/docs/OutputWorkflow/15_OutputTransformer.md
index d3814525..1db1d049 100644
--- a/docs/OutputWorkflow/15_OutputTransformer.md
+++ b/docs/OutputWorkflow/15_OutputTransformer.md
@@ -53,20 +53,12 @@ After that, you have to set up a PHP-Service:
 
 namespace App\OutputTransformer;
 
-use Pimcore\Translation\Translator;
 use Symfony\Component\Form\FormInterface;
 use FormBuilderBundle\Model\FieldDefinitionInterface;
 use FormBuilderBundle\Transformer\Output\OutputTransformerInterface;
 
 class TextInputTransformer implements OutputTransformerInterface
 {
-    protected Translator $translator;
-
-    public function __construct(Translator $translator)
-    {
-        $this->translator = $translator;
-    }
-
     public function getValue(FieldDefinitionInterface $field, FormInterface $formField, $rawValue, $locale)
     {
         // manipulate or change the value
diff --git a/docs/OutputWorkflow/40_Funnels.md b/docs/OutputWorkflow/40_Funnels.md
index 13b200ee..2a6c1659 100644
--- a/docs/OutputWorkflow/40_Funnels.md
+++ b/docs/OutputWorkflow/40_Funnels.md
@@ -52,11 +52,11 @@ Don't freak out, we're talking about one tiny route only:
 ```yaml
 # config/routes.yaml
 form_builder_routing_funnels:
-    resource: '@FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml'
+    resource: '@FormBuilderBundle/config/pimcore/routing_funnels.yaml'
 
 # or import routes without the {locale} flag in routes
 # form_builder_routing_funnels:
-#     resource: '@FormBuilderBundle/Resources/config/pimcore/routing_funnels_not_localized.yml'
+#     resource: '@FormBuilderBundle/config/pimcore/routing_funnels_not_localized.yaml'
 ```
 
 ## Further Information
diff --git a/docs/OutputWorkflow/Funnel/50_RootForm.md b/docs/OutputWorkflow/Funnel/50_RootForm.md
index 22aa138f..763569ac 100644
--- a/docs/OutputWorkflow/Funnel/50_RootForm.md
+++ b/docs/OutputWorkflow/Funnel/50_RootForm.md
@@ -9,7 +9,7 @@ If you've extended root forms with some complex form types,
 make sure your serializer data is configured within the right group:
 
 ```yaml
-# Resources/config/serialization/MyEntity.yaml
+# config/serialization/MyEntity.yaml
 App\Entity\MyEntity:
     attributes:
         id:
diff --git a/src/FormBuilderBundle/Resources/public/css/admin-editmode.css b/public/css/admin-editmode.css
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/admin-editmode.css
rename to public/css/admin-editmode.css
diff --git a/src/FormBuilderBundle/Resources/public/css/admin.css b/public/css/admin.css
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/admin.css
rename to public/css/admin.css
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/continue.gif b/public/css/fineuploader/continue.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/continue.gif
rename to public/css/fineuploader/continue.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/edit.gif b/public/css/fineuploader/edit.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/edit.gif
rename to public/css/fineuploader/edit.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/fine-uploader-new.min.css b/public/css/fineuploader/fine-uploader-new.min.css
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/fine-uploader-new.min.css
rename to public/css/fineuploader/fine-uploader-new.min.css
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/fine-uploader-new.min.css.map b/public/css/fineuploader/fine-uploader-new.min.css.map
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/fine-uploader-new.min.css.map
rename to public/css/fineuploader/fine-uploader-new.min.css.map
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/loading.gif b/public/css/fineuploader/loading.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/loading.gif
rename to public/css/fineuploader/loading.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/pause.gif b/public/css/fineuploader/pause.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/pause.gif
rename to public/css/fineuploader/pause.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/processing.gif b/public/css/fineuploader/processing.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/processing.gif
rename to public/css/fineuploader/processing.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/retry.gif b/public/css/fineuploader/retry.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/retry.gif
rename to public/css/fineuploader/retry.gif
diff --git a/src/FormBuilderBundle/Resources/public/css/fineuploader/trash.gif b/public/css/fineuploader/trash.gif
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/css/fineuploader/trash.gif
rename to public/css/fineuploader/trash.gif
diff --git a/src/FormBuilderBundle/Resources/public/img/application_form.svg b/public/img/application_form.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/application_form.svg
rename to public/img/application_form.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/application_form_add.svg b/public/img/application_form_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/application_form_add.svg
rename to public/img/application_form_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/birthday.svg b/public/img/birthday.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/birthday.svg
rename to public/img/birthday.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/bool.svg b/public/img/bool.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/bool.svg
rename to public/img/bool.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/bool_add.svg b/public/img/bool_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/bool_add.svg
rename to public/img/bool_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/button.svg b/public/img/button.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/button.svg
rename to public/img/button.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/captcha.svg b/public/img/captcha.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/captcha.svg
rename to public/img/captcha.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/checkbox.svg b/public/img/checkbox.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/checkbox.svg
rename to public/img/checkbox.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_change_value.svg b/public/img/cl_change_value.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_change_value.svg
rename to public/img/cl_change_value.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_constraints_add.svg b/public/img/cl_constraints_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_constraints_add.svg
rename to public/img/cl_constraints_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_constraints_remove.svg b/public/img/cl_constraints_remove.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_constraints_remove.svg
rename to public/img/cl_constraints_remove.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_element_value.svg b/public/img/cl_element_value.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_element_value.svg
rename to public/img/cl_element_value.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_output_workflow.svg b/public/img/cl_output_workflow.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_output_workflow.svg
rename to public/img/cl_output_workflow.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_success_message.svg b/public/img/cl_success_message.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_success_message.svg
rename to public/img/cl_success_message.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_switch_output_workflow.svg b/public/img/cl_switch_output_workflow.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_switch_output_workflow.svg
rename to public/img/cl_switch_output_workflow.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_toggle_availability.svg b/public/img/cl_toggle_availability.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_toggle_availability.svg
rename to public/img/cl_toggle_availability.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_toggle_class.svg b/public/img/cl_toggle_class.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_toggle_class.svg
rename to public/img/cl_toggle_class.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_toggle_element.svg b/public/img/cl_toggle_element.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_toggle_element.svg
rename to public/img/cl_toggle_element.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/cl_trigger_event.svg b/public/img/cl_trigger_event.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/cl_trigger_event.svg
rename to public/img/cl_trigger_event.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/container.svg b/public/img/container.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/container.svg
rename to public/img/container.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/container_add.svg b/public/img/container_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/container_add.svg
rename to public/img/container_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/danger.svg b/public/img/danger.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/danger.svg
rename to public/img/danger.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/data_injection.svg b/public/img/data_injection.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/data_injection.svg
rename to public/img/data_injection.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/date.svg b/public/img/date.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/date.svg
rename to public/img/date.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/date_time.svg b/public/img/date_time.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/date_time.svg
rename to public/img/date_time.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/download.svg b/public/img/download.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/download.svg
rename to public/img/download.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/dynamic_multicheck.svg b/public/img/dynamic_multicheck.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/dynamic_multicheck.svg
rename to public/img/dynamic_multicheck.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/elem_add.svg b/public/img/elem_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/elem_add.svg
rename to public/img/elem_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/fieldset.svg b/public/img/fieldset.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/fieldset.svg
rename to public/img/fieldset.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/fieldset_add.svg b/public/img/fieldset_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/fieldset_add.svg
rename to public/img/fieldset_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/file.svg b/public/img/file.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/file.svg
rename to public/img/file.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/filter.svg b/public/img/filter.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/filter.svg
rename to public/img/filter.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/filter_add.svg b/public/img/filter_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/filter_add.svg
rename to public/img/filter_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/formBuilder.svg b/public/img/formBuilder.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/formBuilder.svg
rename to public/img/formBuilder.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/form_configuration.svg b/public/img/form_configuration.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/form_configuration.svg
rename to public/img/form_configuration.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/globe.svg b/public/img/globe.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/globe.svg
rename to public/img/globe.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/grid_attention.svg b/public/img/grid_attention.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/grid_attention.svg
rename to public/img/grid_attention.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/grid_ok.svg b/public/img/grid_ok.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/grid_ok.svg
rename to public/img/grid_ok.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/grid_ok_edit.svg b/public/img/grid_ok_edit.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/grid_ok_edit.svg
rename to public/img/grid_ok_edit.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/grid_unavailable.svg b/public/img/grid_unavailable.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/grid_unavailable.svg
rename to public/img/grid_unavailable.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/help.svg b/public/img/help.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/help.svg
rename to public/img/help.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/hidden.svg b/public/img/hidden.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/hidden.svg
rename to public/img/hidden.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/html.svg b/public/img/html.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/html.svg
rename to public/img/html.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/lock.svg b/public/img/lock.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/lock.svg
rename to public/img/lock.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/mail_editor.svg b/public/img/mail_editor.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/mail_editor.svg
rename to public/img/mail_editor.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/multicheckbox.svg b/public/img/multicheckbox.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/multicheckbox.svg
rename to public/img/multicheckbox.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/notice.svg b/public/img/notice.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/notice.svg
rename to public/img/notice.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/output_workflow.svg b/public/img/output_workflow.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/output_workflow.svg
rename to public/img/output_workflow.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/output_workflow_add.svg b/public/img/output_workflow_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/output_workflow_add.svg
rename to public/img/output_workflow_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/output_workflow_channel.svg b/public/img/output_workflow_channel.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/output_workflow_channel.svg
rename to public/img/output_workflow_channel.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/output_workflow_channel_add.svg b/public/img/output_workflow_channel_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/output_workflow_channel_add.svg
rename to public/img/output_workflow_channel_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/output_workflow_funnel_aware.svg b/public/img/output_workflow_funnel_aware.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/output_workflow_funnel_aware.svg
rename to public/img/output_workflow_funnel_aware.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_apply_data.svg b/public/img/ow_apply_data.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_apply_data.svg
rename to public/img/ow_apply_data.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_channel_api.svg b/public/img/ow_channel_api.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_channel_api.svg
rename to public/img/ow_channel_api.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_channel_api_mapper.svg b/public/img/ow_channel_api_mapper.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_channel_api_mapper.svg
rename to public/img/ow_channel_api_mapper.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_channel_email.svg b/public/img/ow_channel_email.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_channel_email.svg
rename to public/img/ow_channel_email.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_channel_funnel.svg b/public/img/ow_channel_funnel.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_channel_funnel.svg
rename to public/img/ow_channel_funnel.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/ow_channel_object.svg b/public/img/ow_channel_object.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/ow_channel_object.svg
rename to public/img/ow_channel_object.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/password.svg b/public/img/password.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/password.svg
rename to public/img/password.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/picture.svg b/public/img/picture.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/picture.svg
rename to public/img/picture.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/radio.svg b/public/img/radio.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/radio.svg
rename to public/img/radio.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/recaptcha_v3.svg b/public/img/recaptcha_v3.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/recaptcha_v3.svg
rename to public/img/recaptcha_v3.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/reset.svg b/public/img/reset.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/reset.svg
rename to public/img/reset.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/select.svg b/public/img/select.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/select.svg
rename to public/img/select.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/snippet.svg b/public/img/snippet.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/snippet.svg
rename to public/img/snippet.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/stack.svg b/public/img/stack.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/stack.svg
rename to public/img/stack.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/stack_add.svg b/public/img/stack_add.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/stack_add.svg
rename to public/img/stack_add.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/submit.svg b/public/img/submit.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/submit.svg
rename to public/img/submit.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/textarea.svg b/public/img/textarea.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/textarea.svg
rename to public/img/textarea.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/textfield.svg b/public/img/textfield.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/textfield.svg
rename to public/img/textfield.svg
diff --git a/src/FormBuilderBundle/Resources/public/img/time.svg b/public/img/time.svg
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/img/time.svg
rename to public/img/time.svg
diff --git a/src/FormBuilderBundle/Resources/public/js/admin/area.js b/public/js/admin/area.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/admin/area.js
rename to public/js/admin/area.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/abstract.js b/public/js/extjs/_form/config-fields/abstract.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/abstract.js
rename to public/js/extjs/_form/config-fields/abstract.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/checkbox.js b/public/js/extjs/_form/config-fields/checkbox.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/checkbox.js
rename to public/js/extjs/_form/config-fields/checkbox.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/href.js b/public/js/extjs/_form/config-fields/href.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/href.js
rename to public/js/extjs/_form/config-fields/href.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/key_value_repeater.js b/public/js/extjs/_form/config-fields/key_value_repeater.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/key_value_repeater.js
rename to public/js/extjs/_form/config-fields/key_value_repeater.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/label.js b/public/js/extjs/_form/config-fields/label.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/label.js
rename to public/js/extjs/_form/config-fields/label.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/numberfield.js b/public/js/extjs/_form/config-fields/numberfield.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/numberfield.js
rename to public/js/extjs/_form/config-fields/numberfield.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/options_repeater.js b/public/js/extjs/_form/config-fields/options_repeater.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/options_repeater.js
rename to public/js/extjs/_form/config-fields/options_repeater.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/select.js b/public/js/extjs/_form/config-fields/select.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/select.js
rename to public/js/extjs/_form/config-fields/select.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/tagfield.js b/public/js/extjs/_form/config-fields/tagfield.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/tagfield.js
rename to public/js/extjs/_form/config-fields/tagfield.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/textfield.js b/public/js/extjs/_form/config-fields/textfield.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/config-fields/textfield.js
rename to public/js/extjs/_form/config-fields/textfield.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/data-injection/expression.js b/public/js/extjs/_form/data-injection/expression.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/data-injection/expression.js
rename to public/js/extjs/_form/data-injection/expression.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/form.js b/public/js/extjs/_form/form.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/form.js
rename to public/js/extjs/_form/form.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/configPanel.js b/public/js/extjs/_form/tab/configPanel.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/configPanel.js
rename to public/js/extjs/_form/tab/configPanel.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/abstractChannel.js b/public/js/extjs/_form/tab/output-workflow/channel/abstractChannel.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/abstractChannel.js
rename to public/js/extjs/_form/tab/output-workflow/channel/abstractChannel.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/api.js b/public/js/extjs/_form/tab/output-workflow/channel/api.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/api.js
rename to public/js/extjs/_form/tab/output-workflow/channel/api.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/email.js b/public/js/extjs/_form/tab/output-workflow/channel/email.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/email.js
rename to public/js/extjs/_form/tab/output-workflow/channel/email.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/abstractAction.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/abstractAction.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/abstractAction.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/action/abstractAction.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/channelAction.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/channelAction.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/channelAction.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/action/channelAction.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/disabledAction.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/disabledAction.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/disabledAction.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/action/disabledAction.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/returnToFormAction.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/returnToFormAction.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/action/returnToFormAction.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/action/returnToFormAction.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/funnelActionDispatcher.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/funnelActionDispatcher.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/funnelActionDispatcher.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/funnelActionDispatcher.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/abstractLayer.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/abstractLayer.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/abstractLayer.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/abstractLayer.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/dynamicLayoutLayer.js b/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/dynamicLayoutLayer.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/dynamicLayoutLayer.js
rename to public/js/extjs/_form/tab/output-workflow/channel/funnel/layer/dynamicLayoutLayer.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/object.js b/public/js/extjs/_form/tab/output-workflow/channel/object.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/channel/object.js
rename to public/js/extjs/_form/tab/output-workflow/channel/object.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/outputWorkflowConfigPanel.js b/public/js/extjs/_form/tab/output-workflow/outputWorkflowConfigPanel.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/output-workflow/outputWorkflowConfigPanel.js
rename to public/js/extjs/_form/tab/output-workflow/outputWorkflowConfigPanel.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/outputWorkflowPanel.js b/public/js/extjs/_form/tab/outputWorkflowPanel.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/_form/tab/outputWorkflowPanel.js
rename to public/js/extjs/_form/tab/outputWorkflowPanel.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/elements/Formbuilder.HrefTextField.js b/public/js/extjs/components/elements/Formbuilder.HrefTextField.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/elements/Formbuilder.HrefTextField.js
rename to public/js/extjs/components/elements/Formbuilder.HrefTextField.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/formFieldConstraintComponent.js b/public/js/extjs/components/formFieldConstraintComponent.js
similarity index 99%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/formFieldConstraintComponent.js
rename to public/js/extjs/components/formFieldConstraintComponent.js
index 641d37cf..dc3c28e3 100644
--- a/src/FormBuilderBundle/Resources/public/js/extjs/components/formFieldConstraintComponent.js
+++ b/public/js/extjs/components/formFieldConstraintComponent.js
@@ -247,8 +247,6 @@ Formbuilder.extjs.components.formFieldConstraint = Class.create({
                                     newVal = null;
                                 }
 
-                                console.warn(newVal, configElement.defaultValue);
-
                                 field.setStyle('opacity', newVal !== configElement.defaultValue ? 1 : 0.6);
                             }
                         }
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/formFieldContainerComponent.js b/public/js/extjs/components/formFieldContainerComponent.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/formFieldContainerComponent.js
rename to public/js/extjs/components/formFieldContainerComponent.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/formImporterComponent.js b/public/js/extjs/components/formImporterComponent.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/formImporterComponent.js
rename to public/js/extjs/components/formImporterComponent.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/formTypeBuilderComponent.js b/public/js/extjs/components/formTypeBuilderComponent.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/formTypeBuilderComponent.js
rename to public/js/extjs/components/formTypeBuilderComponent.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/components/successMessageToggleComponent.js b/public/js/extjs/components/successMessageToggleComponent.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/components/successMessageToggleComponent.js
rename to public/js/extjs/components/successMessageToggleComponent.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/abstract.js b/public/js/extjs/conditional-logic/action/abstract.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/abstract.js
rename to public/js/extjs/conditional-logic/action/abstract.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/changeValue.js b/public/js/extjs/conditional-logic/action/changeValue.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/changeValue.js
rename to public/js/extjs/conditional-logic/action/changeValue.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/constraintsAdd.js b/public/js/extjs/conditional-logic/action/constraintsAdd.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/constraintsAdd.js
rename to public/js/extjs/conditional-logic/action/constraintsAdd.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/constraintsRemove.js b/public/js/extjs/conditional-logic/action/constraintsRemove.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/constraintsRemove.js
rename to public/js/extjs/conditional-logic/action/constraintsRemove.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/successMessage.js b/public/js/extjs/conditional-logic/action/successMessage.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/successMessage.js
rename to public/js/extjs/conditional-logic/action/successMessage.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/switchOutputWorkflow.js b/public/js/extjs/conditional-logic/action/switchOutputWorkflow.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/switchOutputWorkflow.js
rename to public/js/extjs/conditional-logic/action/switchOutputWorkflow.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleAvailability.js b/public/js/extjs/conditional-logic/action/toggleAvailability.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleAvailability.js
rename to public/js/extjs/conditional-logic/action/toggleAvailability.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleClass.js b/public/js/extjs/conditional-logic/action/toggleClass.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleClass.js
rename to public/js/extjs/conditional-logic/action/toggleClass.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleElement.js b/public/js/extjs/conditional-logic/action/toggleElement.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/toggleElement.js
rename to public/js/extjs/conditional-logic/action/toggleElement.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/triggerEvent.js b/public/js/extjs/conditional-logic/action/triggerEvent.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/action/triggerEvent.js
rename to public/js/extjs/conditional-logic/action/triggerEvent.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/builder.js b/public/js/extjs/conditional-logic/builder.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/builder.js
rename to public/js/extjs/conditional-logic/builder.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/abstract.js b/public/js/extjs/conditional-logic/condition/abstract.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/abstract.js
rename to public/js/extjs/conditional-logic/condition/abstract.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/elementValue.js b/public/js/extjs/conditional-logic/condition/elementValue.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/elementValue.js
rename to public/js/extjs/conditional-logic/condition/elementValue.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/outputWorkflow.js b/public/js/extjs/conditional-logic/condition/outputWorkflow.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/condition/outputWorkflow.js
rename to public/js/extjs/conditional-logic/condition/outputWorkflow.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/form.js b/public/js/extjs/conditional-logic/form.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/conditional-logic/form.js
rename to public/js/extjs/conditional-logic/form.js
diff --git a/public/js/extjs/editor/AbstractFieldComponent.js b/public/js/extjs/editor/AbstractFieldComponent.js
new file mode 100644
index 00000000..bcf40586
--- /dev/null
+++ b/public/js/extjs/editor/AbstractFieldComponent.js
@@ -0,0 +1,79 @@
+class AbstractFieldComponent {
+
+    constructor(editor, type, widgetConfiguration, widgets) {
+
+        this.editor = editor;
+        this.type = type;
+        this.widgetConfiguration = widgetConfiguration;
+        this.widgets = widgets;
+    }
+
+    getWidgetComponent(type, subType) {
+
+        let component = null;
+
+        Ext.Array.each(this.widgets, function (widget) {
+            if (widget.type === type && widget.subType === subType) {
+                component = widget;
+                return false;
+            }
+        });
+
+        return component;
+    }
+
+    getWidgetConfig(widgetConfigIdentifier, storedData) {
+
+        let configItems = [];
+        let initialData = {};
+
+        Ext.Object.each(this.widgetConfiguration, function (configIdentifier, config) {
+
+            if (widgetConfigIdentifier !== configIdentifier) {
+                return true;
+            }
+
+            Ext.Object.each(config, function (configName, configElement) {
+
+                switch (configElement.type) {
+                    case 'checkbox' :
+                        configItems.push({
+                            type: 'checkbox',
+                            name: configName,
+                            label: configElement.label
+                        });
+
+                        initialData[configName] = storedData[configName] ? storedData[configName] === 'true' : configElement.defaultValue === true;
+
+                        break;
+                    case 'input' :
+                        configItems.push({
+                            type: 'input',
+                            name: configName,
+                            label: configElement.label
+                        });
+
+                        initialData[configName] = storedData[configName] ? storedData[configName] : (configElement.defaultValue !== null ? configElement.defaultValue : '')
+
+                        break;
+                    case 'read-only' :
+                        configItems.push({
+                            type: 'input',
+                            name: configName,
+                            label: configElement.label
+                        });
+
+                        initialData[configName] = storedData[configName] ? storedData[configName] : (configElement.defaultValue !== null ? configElement.defaultValue : '')
+
+                        break;
+                }
+            });
+
+        });
+
+        return {
+            items: configItems,
+            initialData: initialData
+        };
+    }
+}
\ No newline at end of file
diff --git a/public/js/extjs/editor/ContainerFieldComponent.js b/public/js/extjs/editor/ContainerFieldComponent.js
new file mode 100644
index 00000000..2d3abc13
--- /dev/null
+++ b/public/js/extjs/editor/ContainerFieldComponent.js
@@ -0,0 +1,290 @@
+class ContainerFieldComponent extends AbstractFieldComponent {
+
+    constructor(editor, type, widgetConfiguration, widgets) {
+
+        super(editor, type, widgetConfiguration, widgets);
+
+        editor.ui.registry.addIcon('fb-container-field', '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M19 4a2 2 0 1 1-1.854 2.751L15 6.75c-1.239 0-1.85.61-2.586 2.31l-.3.724c-.42 1.014-.795 1.738-1.246 2.217.406.43.751 1.06 1.12 1.92l.426 1.018c.704 1.626 1.294 2.256 2.428 2.307l.158.004h2.145a2 2 0 1 1 0 1.501L15 18.75l-.219-.004c-1.863-.072-2.821-1.086-3.742-3.208l-.49-1.17c-.513-1.163-.87-1.57-1.44-1.614L9 12.75l-2.146.001a2 2 0 1 1 0-1.501H9c.636 0 1.004-.383 1.548-1.619l.385-.92c.955-2.291 1.913-3.382 3.848-3.457L15 5.25h2.145A2 2 0 0 1 19 4z" fill-rule="evenodd"/></svg>');
+
+        editor.on('init', () => {
+            this.setup();
+        });
+
+        editor.on('preinit', () => {
+
+            this.win = editor.getWin();
+            this.doc = editor.getDoc();
+
+            editor.serializer.addNodeFilter('fb-container-field', (nodes) => {
+                nodes.forEach((node) => {
+                    if (!!node.attr('contenteditable')) {
+                        node.attr('contenteditable', null);
+                        node.firstChild.unwrap();
+                    }
+                });
+            });
+
+        });
+
+        editor.on('drop', (evt) => {
+
+            var element, elementData;
+
+            if (!evt.dataTransfer) {
+                return;
+            }
+
+            if (evt.target.nodeName.toLowerCase() === 'td') {
+                return;
+            }
+
+            evt.preventDefault();
+
+            element = evt.dataTransfer.getData('element');
+
+            if (!element) {
+                return;
+            }
+
+            elementData = JSON.parse(element);
+
+            if (elementData.configIdentifier !== 'fb_field_container_fieldset' && elementData.configIdentifier !== 'fb_field_container_repeater') {
+                return;
+            }
+
+            editor.insertContent(this.createContainerMarkup(elementData.type, elementData.subType));
+        });
+    }
+
+    setup() {
+
+        const _ = this,
+            template = this.doc.createElement('template');
+
+        template.innerHTML = `
+        <style>
+            :host {
+                display: block;
+                background-color: rgba(240, 210, 140, .20);
+                border-radius: 6px;
+            }
+
+            header {
+                display: flex;
+                padding: 4px 6px;
+                margin: 0;
+                background-color: rgba(240, 210, 140, .20);
+                border-radius: 0;
+            }
+
+            header p {
+                margin: 0;
+                line-height: 24px;
+                font-size: 14px;
+                color: #B7974C;
+            }
+
+            header > svg {
+                fill: #B7974C;
+                margin-right: 6px;
+            }
+
+            span#subtype {
+                font-weight: bold;
+            }
+
+            button {
+                background: rgba(240, 210, 140, .5);
+                border: 0;
+                outline: 0;
+                -webkit-tap-highlight-color: rgba(0,0,0,0);
+                -webkit-user-select: none;
+                user-select: none;
+                font-weight: normal;
+                padding: 6px;
+                margin: 0 0 0 10px;
+                border-radius: 6px;
+            }
+
+            button svg {
+                fill: #B7974C;
+                display: block;
+            }
+
+            button:hover {
+                background-color: rgba(240, 210, 140, .75);
+            }
+
+            .content {
+                margin: 0 6px;
+                box-sizing: border-box;
+                padding-bottom: 2px;
+            }
+        </style>
+        <header>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+                <path d="M19 4a2 2 0 1 1-1.854 2.751L15 6.75c-1.239 0-1.85.61-2.586 2.31l-.3.724c-.42 1.014-.795 1.738-1.246 2.217.406.43.751 1.06 1.12 1.92l.426 1.018c.704 1.626 1.294 2.256 2.428 2.307l.158.004h2.145a2 2 0 1 1 0 1.501L15 18.75l-.219-.004c-1.863-.072-2.821-1.086-3.742-3.208l-.49-1.17c-.513-1.163-.87-1.57-1.44-1.614L9 12.75l-2.146.001a2 2 0 1 1 0-1.501H9c.636 0 1.004-.383 1.548-1.619l.385-.92c.955-2.291 1.913-3.382 3.848-3.457L15 5.25h2.145A2 2 0 0 1 19 4z" fill-rule="evenodd"/>
+            </svg>
+            <p><span id="subtype"></span></p>
+            <button type="button" id="btn">
+                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path d="M0 9.502v2.5h2.5l7.373-7.374-2.5-2.5L0 9.502zm11.807-6.807c.26-.26.26-.68 0-.94l-1.56-1.56a.664.664 0 0 0-.94 0l-1.22 1.22 2.5 2.5 1.22-1.22z"/></svg>
+            </button>
+        </header>
+        <div class="content">
+            <slot></slot>
+        </div>
+    `;
+
+        class FbContainerField extends this.win.HTMLElement {
+            constructor() {
+
+                super();
+
+                this.setAttribute('contenteditable', false);
+
+                const shadow = this.attachShadow({mode: 'open'});
+
+                this.shadowRoot.appendChild(template.content.cloneNode(true));
+            }
+
+            connectedCallback() {
+                const cleanupContentEditable = () => {
+                    if (this.firstChild.contentEditable !== 'true') {
+                        const editableWrapper = document.createElement('div');
+                        editableWrapper.setAttribute('contenteditable', true);
+
+                        while (this.firstChild) {
+                            editableWrapper.appendChild(this.firstChild)
+                        }
+
+                        this.appendChild(editableWrapper);
+                    }
+                }
+
+                cleanupContentEditable();
+
+                const editConditionalBlock = () => {
+                    _.dialog(this);
+                    return false;
+                }
+
+                this.shadowRoot.getElementById('btn').addEventListener('click', editConditionalBlock);
+            }
+
+            attributeChangedCallback(name, oldValue, newValue) {
+                if (name === 'data-sub_type') {
+                    this.shadowRoot.getElementById('subtype').textContent = newValue;
+                }
+            }
+
+            static get observedAttributes() {
+                return ['data-sub_type'];
+            }
+
+        }
+
+        this.win.customElements.define('fb-container-field', FbContainerField);
+    }
+
+    dialog(field) {
+
+        let widgetConfig = {},
+            widgetConfigBody = {
+                type: 'panel',
+                items: []
+            },
+            initialData = {};
+
+        const type = field ? field.dataset.type : null;
+        const subType = field && field.dataset.sub_type !== 'null' ? field.dataset.sub_type : null;
+        const widgetComponent = this.getWidgetComponent(type, subType);
+
+        if (widgetComponent !== null) {
+            widgetConfig = this.getWidgetConfig(widgetComponent.configIdentifier, field ? field.dataset : {});
+            widgetConfigBody.items = widgetConfig.items;
+            initialData = widgetConfig.initialData
+        }
+
+        this.editor.windowManager.open({
+            title: 'Container Configuration',
+            body: widgetConfigBody,
+            initialData: initialData,
+            buttons: [
+                {
+                    type: 'cancel',
+                    name: 'closeButton',
+                    text: 'Cancel'
+                },
+                {
+                    type: 'submit',
+                    name: 'submitButton',
+                    text: 'Save',
+                    primary: true
+                }
+            ],
+            onSubmit: (dialog) => {
+
+                const data = dialog.getData();
+
+                if (!field) {
+                    this.editor.insertContent(this.createContainerMarkup(type, subType, data));
+                } else {
+                    this.editor.undoManager.transact(() => {
+                        Ext.Object.each(data, function (index, value) {
+                            field.dataset[index] = value;
+                        });
+                    });
+
+                    this.editor.nodeChanged();
+                }
+
+                dialog.close();
+            }
+        });
+    }
+
+    createContainerMarkup(type, subType, dialogData) {
+
+        let widgetComponent = this.getWidgetComponent(type, subType),
+            containerContent = '';
+
+        if (widgetComponent !== null && widgetComponent.hasOwnProperty('children')) {
+
+            if(this.type === 'html') {
+
+                containerContent += '<table><tbody>';
+                    Ext.Array.each(widgetComponent.children, function (subField) {
+
+                        containerContent += `
+                        <tr>
+                            <td><fb-field data-render_type="L" data-type="${subField.type}" data-sub_type="${subField.subType}">${subField.label}</fb-field></td>
+                            <td><fb-field data-render_type="V" data-type="${subField.type}" data-sub_type="${subField.subType}">${subField.label}</fb-field></td>
+                        </tr>
+                        `
+                    });
+
+                containerContent += '</tbody></table>';
+
+            } else {
+
+                Ext.Array.each(widgetComponent.children, function (subField) {
+                    containerContent += `
+                        <fb-field data-render_type="L" data-type="${subField.type}" data-sub_type="${subField.subType}">${subField.label}</fb-field>:
+                        <fb-field data-render_type="V" data-type="${subField.type}" data-sub_type="${subField.subType}">${subField.label}</fb-field>
+                    <br>
+                    `
+                });
+
+            }
+        }
+
+        return `
+                <fb-container-field 
+                        data-type="${type}" 
+                        data-sub_type="${subType}" 
+                >
+                    ${containerContent}
+                </fb-container-field>
+            `;
+    }
+}
diff --git a/public/js/extjs/editor/FieldComponent.js b/public/js/extjs/editor/FieldComponent.js
new file mode 100644
index 00000000..7526d958
--- /dev/null
+++ b/public/js/extjs/editor/FieldComponent.js
@@ -0,0 +1,273 @@
+class FieldComponent extends AbstractFieldComponent {
+
+    constructor(editor, type, widgetConfiguration, widgets) {
+
+        super(editor, type, widgetConfiguration, widgets);
+
+        editor.on('init', () => {
+            this.setup();
+        });
+
+        editor.on('preinit', () => {
+
+            this.win = editor.getWin();
+            this.doc = editor.getDoc();
+
+            editor.serializer.addNodeFilter('fb-field', (nodes) => {
+                nodes.forEach((node) => {
+                    if (!!node.attr('contenteditable')) {
+                        node.attr('contenteditable', null);
+                    }
+                });
+            });
+
+        });
+
+        editor.on('drop', (evt) => {
+
+            var element, elementData;
+
+            if (!evt.dataTransfer) {
+                return;
+            }
+
+            evt.preventDefault();
+
+            element = evt.dataTransfer.getData('element');
+
+            if (!element) {
+                return;
+            }
+
+            elementData = JSON.parse(element);
+
+            if (elementData.configIdentifier === 'fb_field_container_fieldset' || elementData.configIdentifier === 'fb_field_container_repeater') {
+                return;
+            }
+
+            editor.insertContent(this.createFieldMarkup(elementData.type, elementData.subType));
+        });
+    }
+
+    setup() {
+
+        const _ = this,
+            template = this.doc.createElement('template');
+
+        this.editor.ui.registry.addContextToolbar('fb-field', {
+            predicate: function (node) {
+                return node.nodeName.toLowerCase() === 'fb-field'
+            },
+            items: 'fb-field-options',
+            scope: 'node',
+            position: 'node'
+        });
+
+        this.editor.ui.registry.addMenuButton('fb-field-options', {
+            icon: 'info',
+            text: 'Field Options',
+            fetch: (callback) => {
+                var items = [
+                    {
+                        type: 'togglemenuitem',
+                        icon: 'format',
+                        text: 'Act as Label',
+                        onAction: (data, b, c) => {
+                            const node = this.editor.selection.getNode();
+                            node.dataset.render_type = data.isActive() ? 'V' : 'L';
+                        },
+                        onSetup: (api) => {
+
+                            const node = this.editor.selection.getNode();
+                            api.setActive(node.dataset.render_type === 'L');
+
+                            return () => {};
+                        }
+                    }
+                ];
+                callback(items);
+            }
+        });
+
+        template.innerHTML = `
+                <style>
+                    :host {
+                        display: inline-block;
+                        background: rgb(101 123 177 / 34%);
+                        padding: 0 3px;
+                        color: rgb(29 72 97);
+                        border-radius: 3px;
+                        font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+                        font-size: 0.9375em;
+                    }
+
+                    :host(:hover) {
+                        cursor: default;
+                    }
+                
+                    span#render-type {
+                        font-weight: bold;
+                        background: #a3b5e1;
+                        border-radius: 4px;
+                        width: 17px;
+                        display: inline-block;
+                        text-align: center;
+                        height: 17px;
+                        font-size: 13px;
+                    }
+                    
+                    button {
+                        background: transparent;
+                        border: 0;
+                        outline: 0;
+                        -webkit-tap-highlight-color: rgba(0,0,0,0);
+                        -webkit-user-select: none;
+                        user-select: none;
+                        font-weight: normal;
+                        padding: 3px;
+                        margin: 0 0 0 5px;
+                        border-radius: 3px;
+                        position: relative;
+                        top: 2px;
+                    }
+        
+                    button svg {
+                        fill: rgb(29 72 97);
+                        display: block;
+                    }
+        
+                    button:hover {
+                        background: rgba(29,72,97,0.30);
+                    }
+
+                    :host([contentEditable=false][data-mce-selected]) {
+                        outline: none !important;
+                        box-shadow: 0 0 0 3px #b4d7ff;
+                    }
+                </style>
+
+                <span>
+                    <span id="render-type">V</span>
+                    <slot>fb-field-not-defined</slot>
+                    <button type="button" id="btn">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path d="M0 9.502v2.5h2.5l7.373-7.374-2.5-2.5L0 9.502zm11.807-6.807c.26-.26.26-.68 0-.94l-1.56-1.56a.664.664 0 0 0-.94 0l-1.22 1.22 2.5 2.5 1.22-1.22z"/></svg>
+                    </button>
+                </span>
+            `;
+
+        class FbField extends this.win.HTMLElement {
+            constructor() {
+
+                super();
+
+                const shadow = this.attachShadow({mode: 'open'});
+
+                this.setAttribute('contenteditable', false);
+
+                this.shadowRoot.appendChild(template.content.cloneNode(true));
+            }
+
+            connectedCallback() {
+
+                let widgetConfig = null,
+                    hasWidgetConfig = false;
+
+                const type = this.dataset.type;
+                const subType = this.dataset.sub_type !== 'null' ? this.dataset.sub_type : null;
+                const widgetComponent = _.getWidgetComponent(type, subType);
+
+                if (widgetComponent !== null) {
+                    widgetConfig = _.getWidgetConfig(widgetComponent.configIdentifier, this.dataset);
+                    hasWidgetConfig = widgetConfig.items.length > 0;
+                }
+
+                const editConditionalBlock = () => {
+                    _.dialog(this, widgetConfig);
+                    return false;
+                }
+
+                if (hasWidgetConfig === false) {
+                    this.shadowRoot.getElementById('btn').style.display = 'none';
+
+                    return;
+                }
+
+                this.shadowRoot.getElementById('btn').addEventListener('click', editConditionalBlock);
+            }
+
+            attributeChangedCallback(name, oldValue, newValue) {
+                if (name === 'data-render_type') {
+                    this.shadowRoot.getElementById('render-type').textContent = newValue;
+                }
+            }
+
+            static get observedAttributes() {
+                return ['data-render_type'];
+            }
+        }
+
+        this.win.customElements.define('fb-field', FbField);
+    }
+
+    dialog(field, widgetConfig) {
+
+        let widgetConfigBody = {
+                type: 'panel',
+                items: []
+            },
+            initialData = {};
+
+        const type = field ? field.dataset.type : null;
+        const subType = field && field.dataset.sub_type !== 'null' ? field.dataset.sub_type : null;
+
+        if (widgetConfig !== null) {
+            widgetConfigBody.items = widgetConfig.items;
+            initialData = widgetConfig.initialData
+        }
+
+        this.editor.windowManager.open({
+            title: 'Field Configuration',
+            body: widgetConfigBody,
+            initialData: initialData,
+            buttons: [
+                {
+                    type: 'cancel',
+                    name: 'closeButton',
+                    text: 'Cancel'
+                },
+                {
+                    type: 'submit',
+                    name: 'submitButton',
+                    text: 'Save',
+                    primary: true
+                }
+            ],
+            onSubmit: (dialog) => {
+
+                const data = dialog.getData();
+
+                if (!field) {
+                    this.editor.insertContent(this.createFieldMarkup(type, subType, data));
+                } else {
+                    this.editor.undoManager.transact(() => {
+                        Ext.Object.each(data, function (index, value) {
+                            field.dataset[index] = value;
+                        });
+                    });
+
+                    this.editor.nodeChanged();
+                }
+
+                dialog.close();
+            }
+        });
+    }
+
+    createFieldMarkup(type, subType, dialogData) {
+
+        const fieldLabel = subType === null ? type : subType;
+
+        return `<fb-field data-type="${type}" data-render_type="V" data-sub_type="${subType}">${fieldLabel}</fb-field>`;
+    }
+
+}
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/eventObserver.js b/public/js/extjs/eventObserver.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/eventObserver.js
rename to public/js/extjs/eventObserver.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formApiMappingEditor.js b/public/js/extjs/extensions/formApiMappingEditor.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formApiMappingEditor.js
rename to public/js/extjs/extensions/formApiMappingEditor.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formDataMappingEditor/formDataMapper.js b/public/js/extjs/extensions/formDataMappingEditor/formDataMapper.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formDataMappingEditor/formDataMapper.js
rename to public/js/extjs/extensions/formDataMappingEditor/formDataMapper.js
diff --git a/public/js/extjs/extensions/formMailEditor.js b/public/js/extjs/extensions/formMailEditor.js
new file mode 100644
index 00000000..f57c8a7a
--- /dev/null
+++ b/public/js/extjs/extensions/formMailEditor.js
@@ -0,0 +1,638 @@
+pimcore.registerNS('Formbuilder.extjs.extensions.formMailEditor');
+Formbuilder.extjs.extensions.formMailEditor = Class.create({
+
+    formId: null,
+    specificLocale: null,
+    callbacks: null,
+    fields: {},
+    selectionWindow: null,
+    detailWindow: null,
+    editPanel: null,
+    selectionId: null,
+    editors: {},
+    additionalParameter: {},
+
+    forceClose: false,
+    configuration: null,
+    editorData: null,
+    mailType: null,
+
+    autoSaveData: {},
+
+    initialize: function (formId, identifier, additionalParameter, specificLocale, callbacks) {
+
+        this.formId = formId;
+        this.specificLocale = specificLocale ? specificLocale : null;
+        this.callbacks = callbacks;
+        this.additionalParameter = additionalParameter ? additionalParameter : {};
+
+        this.editors = {};
+        this.mailType = null;
+        this.forceClose = false;
+        this.selectionId = 'form_mail_selection_' + Ext.id();
+
+        this.mailType = identifier;
+        this.autoSaveData = {};
+
+        this.loadMailEditor();
+    },
+
+    checkClose: function (win) {
+
+        if (this.forceClose === true) {
+            win.closeMe = true;
+            return true;
+        }
+
+        if (win.closeMe) {
+            win.closeMe = false;
+            return true;
+        }
+
+        Ext.Msg.show({
+            title: t('form_builder.mail_editor.close_confirmation_title'),
+            msg: t('form_builder.mail_editor.close_confirmation_message'),
+            buttons: Ext.Msg.YESNO,
+            callback: function (btn) {
+                if (btn === 'yes') {
+                    win.closeMe = true;
+                    win.close();
+                }
+            }
+        });
+
+        return false;
+    },
+
+    onClose: function (editorId) {
+        if (this.editors[editorId]) {
+            this.editors[editorId]['editor'].remove();
+            delete this.editors[editorId];
+        }
+    },
+
+    loadMailEditor: function () {
+
+        if (this.detailWindow !== null) {
+            return this.detailWindow;
+        }
+
+        this.detailWindow = new Ext.Window({
+            width: 1200,
+            height: 768,
+            iconCls: 'pimcore_icon_mail_editor',
+            layout: 'fit',
+            closeAction: 'destroy',
+            plain: true,
+            autoScroll: true,
+            preventRefocus: true,
+            cls: 'formbuilder-mail-editor',
+            modal: true,
+            listeners: {
+                beforeClose: this.checkClose.bind(this)
+            },
+            buttons: [
+                {
+                    text: t('form_builder.output_workflow.apply_and_close'),
+                    iconCls: 'form_builder_output_workflow_apply_data',
+                    handler: this.saveEditorDataAndClose.bind(this)
+                },
+                {
+                    text: t('cancel'),
+                    iconCls: 'pimcore_icon_cancel',
+                    handler: function () {
+                        this.detailWindow.close();
+                    }.bind(this)
+                }
+            ]
+        });
+
+        this.detailWindow.show();
+
+        this.loadEditorData();
+    },
+
+    createPanel: function () {
+
+        var rightHtml = '' +
+            '<div class="mail-editor-selection" id="' + this.selectionId + '"></div>';
+
+        this.editPanel = new Ext.Panel({
+            closable: false,
+            bodyStyle: 'position:relative;',
+            border: false,
+            layout: 'hbox',
+            autoScroll: false
+        });
+
+        this.leftPanel = new Ext.Panel({
+            closable: false,
+            border: false,
+            title: 'Editor' + ' (' + t('form_builder.mail_editor.mail_type_slug') + ': ' + t('form_builder.mail_editor.mail_type_' + this.mailType) + ')',
+            layout: 'fit',
+            flex: 3,
+            align: 'stretch',
+            autoScroll: false
+        });
+
+        this.leftInnerPannel = new Ext.Panel({
+            closable: false,
+            border: false,
+            title: false,
+            autoScroll: true,
+        });
+
+        this.preFillButton = new Ext.Button({
+            text: 'Prefill',
+            anchor: '100%',
+            style: 'margin: 5px 20px; width: 85%;',
+            hidden: this.configuration.widgetFieldsTemplate === null,
+            handler: function (btn) {
+
+                if (!this.editors) {
+                    return;
+                }
+
+                Ext.Object.each(this.editors, function (index, editorData) {
+                    editorData.editor.setContent(this.configuration.widgetFieldsTemplate);
+                }.bind(this));
+
+            }.bind(this)
+        });
+
+        this.rightPanel = new Ext.Panel({
+            closable: false,
+            html: rightHtml,
+            items: [
+                this.preFillButton,
+                {
+                    xtype: 'container',
+                    html: rightHtml,
+                }
+            ],
+            border: false,
+            flex: 1,
+            height: 645,
+            align: 'stretch',
+            title: 'Fields',
+            autoScroll: true
+        });
+
+        this.rightPanel.on('afterrender', this.initSelectionFields.bind(this));
+
+        var mailTypeSelector = new Ext.form.ComboBox({
+            fieldLabel: t('type'),
+            value: 'html',
+            displayField: 'label',
+            valueField: 'value',
+            mode: 'local',
+            queryMode: 'local',
+            labelAlign: 'left',
+            triggerAction: 'all',
+            anchor: '100%',
+            editable: false,
+            summaryDisplay: true,
+            allowBlank: false,
+            name: 'mailType',
+            style: 'margin: 5px 0; padding: 0 10px;',
+            store: new Ext.data.ArrayStore({
+                fields: ['value', 'label'],
+                data: [['html', 'HTML'], ['text', 'TEXT']]
+            }),
+            listeners: {
+                change: function (combo, value, previousValue) {
+
+                    this.preFillButton.setHidden(value === 'text');
+                    this.autoSaveEditorData(previousValue)
+                    this.leftInnerPannel.removeAll();
+                    this.initializeLocalizedEditor(value);
+                }.bind(this),
+                render: function (combo) {
+                    combo.getStore().load();
+                }.bind(this),
+            }
+        });
+
+        this.leftPanel.add([mailTypeSelector, this.leftInnerPannel]);
+        this.editPanel.add([this.leftPanel, this.rightPanel]);
+        this.detailWindow.add(this.editPanel);
+
+        this.initializeLocalizedEditor('html');
+    },
+
+    initializeLocalizedEditor: function (type) {
+
+        var tabs = [],
+            editorField,
+            locales,
+            pimcoreLocales = Ext.isArray(pimcore.settings.websiteLanguages) ? pimcore.settings.websiteLanguages : [];
+
+        if (this.specificLocale === null) {
+            locales = Ext.Array.merge(['default'], pimcoreLocales)
+        } else {
+            locales = [this.specificLocale]
+        }
+
+        Ext.each(locales, function (locale) {
+
+            var editorId = 'form_mail_editor_' + Ext.id(),
+                oldHtml = '<div class="mail-editor" id="' + editorId + '"></div>';
+
+            tabs.push({
+                title: locale === 'default' ? t('default') : pimcore.available_languages[locale],
+                iconCls: locale === 'default' ? 'pimcore_icon_white_flag' : 'pimcore_icon_language_' + locale.toLowerCase(),
+                layout: 'anchor',
+                height: 560,
+                listeners: {
+                    afterrender: this.initEditor.bind(this, type, editorId, locale.toLowerCase()),
+                    beforedestroy: this.onClose.bind(this, editorId),
+                },
+                html: oldHtml
+            });
+        }.bind(this));
+
+        editorField = new Ext.form.FieldSet({
+            cls: 'form_builder_mail_editor_localized_field',
+            layout: 'anchor',
+            hideLabel: false,
+            border: false,
+            items: [{
+                xtype: 'tabpanel',
+                activeTab: 0,
+                layout: 'anchor',
+                width: '100%',
+                defaults: {
+                    autoHeight: true,
+                },
+                items: tabs
+            }]
+        });
+
+        this.leftInnerPannel.add(editorField);
+    },
+
+    initSelectionFields: function () {
+
+        var selectionField;
+
+        selectionField = Ext.get(this.selectionId);
+
+        Ext.Array.each(this.configuration.widgetGroups, function (groupData) {
+            var group;
+            selectionField.createChild('<h4>' + groupData.label + '</h4>');
+            group = selectionField.createChild('<ul class="group"></ul>');
+            Ext.Array.each(groupData.elements, function (element) {
+
+                var subTypeTag = element.subType !== null ? '<span class="tag">[' + element.subType + ']</span>' : '',
+                    child = group.createChild('<li contenteditable="false" draggable="true">' + subTypeTag + '' + element.label + '</li>');
+
+                child.dom.addEventListener('dragstart', function (event) {
+                    event.dataTransfer.setData('element', JSON.stringify(element));
+                });
+            }.bind(this));
+
+        }.bind(this));
+
+    },
+
+    initEditor: function (type, editorId, locale) {
+
+        var editorInstance;
+
+        if (this.editors.hasOwnProperty(editorId)) {
+            return;
+        }
+
+        editorInstance = tinymce.init({
+            icons: 'customIcons',
+            height: 500,
+            language: pimcore.settings['language'],
+            resize: false,
+            menubar: false,
+            block_unsupported_drop: false,
+            newline_behavior: 'linebreak',
+            selector: '#' + editorId,
+            plugins: type === 'html' ? 'code link lists table' : 'code',
+            toolbar: type === 'html' ? 'bold italic | bullist numlist link | code | inserttable' : 'code',
+            custom_elements: '~fb-field,fb-container-field',
+            editable_root: false,
+            forced_root_block: 'div',
+            contextmenu: false,
+            object_resizing: false,
+            table_toolbar: 'rowoptions columnoptions | tabledelete',
+            table_header_type: 'cells',
+            table_default_styles: {},
+            table_default_attributes: {},
+            table_use_colgroups: false,
+            table_appearance_options: false,
+            table_advtab: false,
+            table_row_advtab: false,
+            table_cell_advtab: false,
+            content_style: `
+                
+                .mce-content-body inline-token[contentEditable=false][data-mce-selected] {
+                    outline: none;
+                    cursor: default;
+                }
+                
+                .mce-content-body conditional-block[contenteditable=false][data-mce-selected] {
+                    outline: none;
+                    cursor: default;
+                    box-shadow: 0 0 0 3px #b4d7ff;
+                }
+
+                .mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
+                    outline: none;
+                }
+
+                .mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
+                    outline: none;
+                }
+
+                body {
+                    max-width: 600px;
+                    margin: 2rem auto;
+                }
+
+                a {
+                    color: #2980b9;
+                }
+
+                conditional-block {
+                    margin: 1rem -6px;
+                }
+                
+                table {
+                    width: 100%;
+                }
+                
+                table td {
+                    width: 50%;
+                }
+            `,
+            setup: (editor) => {
+
+                const fieldComponent = new FieldComponent(editor, type, this.configuration.widgetConfiguration, this.getWidgetFieldsAsList());
+                const containerFieldComponent = new ContainerFieldComponent(editor, type, this.configuration.widgetConfiguration, this.getWidgetFieldsAsList());
+
+                tinymce.IconManager.add('customIcons', {
+                    icons: {
+                        'table-column-options': '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h14zM5 13v5h4v-5H5zm14 0h-4v5h4v-5zm0-7h-4v5h4V6zM5 11h4V6H5v5z"/></svg>',
+                    }
+                });
+
+                editor.ui.registry.addMenuButton('inserttable', {
+                    icon: 'table',
+                    tooltip: 'Insert table',
+                    fetch: function (callback) {
+                        callback([
+                            {
+                                type: 'fancymenuitem',
+                                fancytype: 'inserttable',
+                                onAction: function (data) {
+                                    editor.execCommand('mceInsertTable', false, {
+                                        rows: data.numRows,
+                                        columns: data.numColumns,
+                                        options: {
+                                            headerRows: 0
+                                        }
+                                    });
+                                }
+                            }
+                        ]);
+                    }
+                });
+
+                editor.ui.registry.addMenuButton('rowoptions', {
+                    icon: 'table-row-properties',
+                    tooltip: 'Row options',
+                    fetch: (callback) => {
+                        var items = [
+                            {
+                                type: 'menuitem',
+                                text: 'Insert row before',
+                                icon: 'table-insert-row-above',
+                                shortcut: 'alt+↑',
+                                onAction: () => {
+                                    menuActionManager.insertRowBefore();
+                                }
+                            },
+                            {
+                                type: 'menuitem',
+                                text: 'Insert row after',
+                                icon: 'table-insert-row-after',
+                                shortcut: 'alt+↓',
+                                onAction: () => {
+                                    menuActionManager.insertRowAfter();
+                                }
+                            },
+                            {
+                                type: 'menuitem',
+                                text: 'Delete row',
+                                icon: 'table-delete-row',
+                                onAction: () => {
+                                    menuActionManager.deleteRow();
+                                }
+                            }
+                        ];
+                        callback(items);
+                    }
+                });
+
+                editor.ui.registry.addMenuButton('columnoptions', {
+                    icon: 'table-column-options',
+                    tooltip: 'Column options',
+                    fetch: (callback) => {
+                        var items = [
+                            {
+                                type: 'menuitem',
+                                text: 'Insert column before',
+                                icon: 'table-insert-column-before',
+                                shortcut: 'alt+←',
+                                onAction: () => {
+                                    menuActionManager.insertColumnBefore();
+                                }
+                            },
+                            {
+                                type: 'menuitem',
+                                text: 'Insert column after',
+                                icon: 'table-insert-column-after',
+                                shortcut: 'alt+→',
+                                onAction: () => {
+                                    menuActionManager.insertColumnAfter();
+                                }
+                            },
+                            {
+                                type: 'menuitem',
+                                text: 'Delete column',
+                                icon: 'table-delete-column',
+                                onAction: () => {
+                                    menuActionManager.deleteColumn();
+                                }
+                            }
+                        ];
+                        callback(items);
+                    }
+                });
+
+                const menuActionManager = {
+                    insertRowBefore: () => {
+                        tinymce.activeEditor.execCommand('mceTableInsertRowBefore');
+                    },
+                    insertRowAfter: () => {
+                        tinymce.activeEditor.execCommand('mceTableInsertRowAfter');
+                    },
+                    deleteRow: () => {
+                        tinymce.activeEditor.execCommand('mceTableDeleteRow');
+                    },
+                    insertColumnBefore: () => {
+                        tinymce.activeEditor.execCommand('mceTableInsertColBefore');
+                    },
+                    insertColumnAfter: () => {
+                        tinymce.activeEditor.execCommand('mceTableInsertColAfter');
+                    },
+                    deleteColumn: () => {
+                        tinymce.activeEditor.execCommand('mceTableDeleteCol');
+                    }
+                }
+
+                editor.on('init', () => {
+
+                    if (this.editorData !== null && typeof this.editorData === 'object' && this.editorData.hasOwnProperty(locale)) {
+                        if (this.editorData[locale].hasOwnProperty(type)) {
+                            editor.setContent(this.editorData[locale][type]);
+                        }
+                    }
+
+                    this.editors[editorId] = {
+                        type: type,
+                        editor: editor,
+                        locale: locale
+                    };
+
+                });
+            }
+        });
+    },
+
+    loadEditorData: function () {
+
+        var loadSuccess = function (data) {
+
+            var parsedEditorData = {};
+
+            this.detailWindow.setLoading(false);
+            this.configuration = data.configuration;
+            this.editorData = this.callbacks.loadData();
+
+            if (this.editorData !== null && typeof this.editorData === 'object') {
+
+                Ext.Object.each(this.editorData, function (locale, editorData) {
+
+                    var editorContent;
+
+                    // legacy
+                    if (Ext.isString(this.editorData[locale])) {
+                        editorContent = {
+                            text: this.editorData[locale]
+                        }
+                    } else {
+                        editorContent = this.editorData[locale];
+                    }
+
+                    parsedEditorData[locale] = editorContent;
+
+                }.bind(this));
+
+                this.editorData = parsedEditorData;
+            }
+
+            this.createPanel();
+
+        }.bind(this);
+
+        this.detailWindow.setLoading(true);
+
+        Ext.Ajax.request({
+            url: '/admin/formbuilder/mail-editor/load',
+            params: {
+                id: this.formId,
+                mailType: this.mailType,
+                additionalParameter: this.additionalParameter
+            },
+            success: function (resp) {
+                var data = Ext.decode(resp.responseText);
+                loadSuccess(data);
+            }.bind(this)
+        });
+    },
+
+    saveEditorDataAndClose: function () {
+        this.saveEditorData(null, null, function () {
+            this.forceClose = true;
+            this.detailWindow.close();
+        }.bind(this));
+    },
+
+    saveEditorData: function (el, ev, callback) {
+
+        var editorSaveData = this.editorData !== null && typeof this.editorData === 'object' ? this.editorData : {};
+
+        Ext.Object.each(this.editors, function (index, editorData) {
+
+            if (!editorSaveData.hasOwnProperty(editorData['locale'])) {
+                editorSaveData[editorData['locale']] = {};
+            }
+
+            editorSaveData[editorData['locale']][editorData['type']] = editorData['editor'].getContent();
+        });
+
+        this.callbacks.saveData(editorSaveData);
+
+        if (typeof callback === 'function') {
+            callback();
+        }
+    },
+
+    autoSaveEditorData: function (type) {
+
+        var editorSaveData = this.editorData !== null && typeof this.editorData === 'object' ? this.editorData : {};
+
+        Ext.Object.each(this.editors, function (index, editorData) {
+
+            if (!editorSaveData.hasOwnProperty(editorData['locale'])) {
+                editorSaveData[editorData['locale']] = {};
+            }
+
+            editorSaveData[editorData['locale']][type] = editorData['editor'].getContent();
+        });
+
+        this.editorData = editorSaveData;
+    },
+
+    getWidgetFieldsAsList: function () {
+
+        var widgetFields = [];
+
+        Ext.Array.each(this.configuration.widgetGroups, function (groupData) {
+            widgetFields = Ext.Array.merge(this.getWidgetFieldList(groupData.elements), widgetFields);
+        }.bind(this));
+
+        return widgetFields;
+    },
+
+    getWidgetFieldList: function (elements) {
+
+        var widgetFields = [];
+
+        Ext.Array.each(elements, function (element) {
+            widgetFields.push(element);
+
+            if (element.hasOwnProperty('children')) {
+                widgetFields = Ext.Array.merge(this.getWidgetFieldList(element.children), widgetFields);
+            }
+        }.bind(this));
+
+        return widgetFields;
+    }
+});
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formMetaData.js b/public/js/extjs/extensions/formMetaData.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formMetaData.js
rename to public/js/extjs/extensions/formMetaData.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor.js b/public/js/extjs/extensions/formObjectMappingEditor.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor.js
rename to public/js/extjs/extensions/formObjectMappingEditor.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/formObjectTreeMapper.js b/public/js/extjs/extensions/formObjectMappingEditor/formObjectTreeMapper.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/formObjectTreeMapper.js
rename to public/js/extjs/extensions/formObjectMappingEditor/formObjectTreeMapper.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/worker/fieldCollectionWorker.js b/public/js/extjs/extensions/formObjectMappingEditor/worker/fieldCollectionWorker.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/worker/fieldCollectionWorker.js
rename to public/js/extjs/extensions/formObjectMappingEditor/worker/fieldCollectionWorker.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/worker/relationWorker.js b/public/js/extjs/extensions/formObjectMappingEditor/worker/relationWorker.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/worker/relationWorker.js
rename to public/js/extjs/extensions/formObjectMappingEditor/worker/relationWorker.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/plugin.js b/public/js/extjs/plugin.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/plugin.js
rename to public/js/extjs/plugin.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/settings.js b/public/js/extjs/settings.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/settings.js
rename to public/js/extjs/settings.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/types/href.js b/public/js/extjs/types/href.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/types/href.js
rename to public/js/extjs/types/href.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/types/keyValueRepeater.js b/public/js/extjs/types/keyValueRepeater.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/types/keyValueRepeater.js
rename to public/js/extjs/types/keyValueRepeater.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/types/localizedField.js b/public/js/extjs/types/localizedField.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/types/localizedField.js
rename to public/js/extjs/types/localizedField.js
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/vendor/dataObject.js b/public/js/extjs/vendor/dataObject.js
similarity index 100%
rename from src/FormBuilderBundle/Resources/public/js/extjs/vendor/dataObject.js
rename to public/js/extjs/vendor/dataObject.js
diff --git a/src/FormBuilderBundle/Assembler/FormAssembler.php b/src/Assembler/FormAssembler.php
similarity index 83%
rename from src/FormBuilderBundle/Assembler/FormAssembler.php
rename to src/Assembler/FormAssembler.php
index 1d28afa4..f9114bca 100644
--- a/src/FormBuilderBundle/Assembler/FormAssembler.php
+++ b/src/Assembler/FormAssembler.php
@@ -13,21 +13,12 @@
 
 class FormAssembler
 {
-    protected EventDispatcherInterface $eventDispatcher;
-    protected FrontendFormBuilder $frontendFormBuilder;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected FormRuntimeDataAllocatorInterface $formRuntimeDataAllocator;
-
     public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        FrontendFormBuilder $frontendFormBuilder,
-        FormDefinitionManager $formDefinitionManager,
-        FormRuntimeDataAllocatorInterface $formRuntimeDataAllocator
+        protected EventDispatcherInterface $eventDispatcher,
+        protected FrontendFormBuilder $frontendFormBuilder,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected FormRuntimeDataAllocatorInterface $formRuntimeDataAllocator
     ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->frontendFormBuilder = $frontendFormBuilder;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->formRuntimeDataAllocator = $formRuntimeDataAllocator;
     }
 
     public function assemble(FormOptionsResolver $optionsResolver): array
diff --git a/src/FormBuilderBundle/Assembler/FunnelActionElementAssembler.php b/src/Assembler/FunnelActionElementAssembler.php
similarity index 97%
rename from src/FormBuilderBundle/Assembler/FunnelActionElementAssembler.php
rename to src/Assembler/FunnelActionElementAssembler.php
index 422bd4c2..756a865c 100644
--- a/src/FormBuilderBundle/Assembler/FunnelActionElementAssembler.php
+++ b/src/Assembler/FunnelActionElementAssembler.php
@@ -16,11 +16,8 @@
 
 class FunnelActionElementAssembler
 {
-    protected FunnelActionRegistry $funnelActionRegistry;
-
-    public function __construct(FunnelActionRegistry $funnelActionRegistry)
+    public function __construct(protected FunnelActionRegistry $funnelActionRegistry)
     {
-        $this->funnelActionRegistry = $funnelActionRegistry;
     }
 
     public function assembleItem(
diff --git a/src/FormBuilderBundle/Builder/ExtJsFormBuilder.php b/src/Builder/ExtJsFormBuilder.php
similarity index 95%
rename from src/FormBuilderBundle/Builder/ExtJsFormBuilder.php
rename to src/Builder/ExtJsFormBuilder.php
index d6fc227a..ccfca159 100644
--- a/src/FormBuilderBundle/Builder/ExtJsFormBuilder.php
+++ b/src/Builder/ExtJsFormBuilder.php
@@ -14,41 +14,24 @@
 use FormBuilderBundle\Transformer\DynamicOptionsTransformerInterface;
 use FormBuilderBundle\Transformer\OptionsTransformerInterface;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
-use Pimcore\Translation\Translator;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ExtJsFormBuilder
 {
-    protected Configuration $configuration;
-    protected SerializerInterface $serializer;
-    protected TemplateManager $templateManager;
-    protected Translator $translator;
-    protected OptionsTransformerRegistry $optionsTransformerRegistry;
-    protected ConditionalLogicRegistry $conditionalLogicRegistry;
-    protected OutputWorkflowChannelRegistry $outputWorkflowChannelRegistry;
-
     public function __construct(
-        Configuration $configuration,
-        SerializerInterface $serializer,
-        TemplateManager $templateManager,
-        Translator $translator,
-        OptionsTransformerRegistry $optionsTransformerRegistry,
-        ConditionalLogicRegistry $conditionalLogicRegistry,
-        OutputWorkflowChannelRegistry $outputWorkflowChannelRegistry
+        protected Configuration $configuration,
+        protected SerializerInterface $serializer,
+        protected TemplateManager $templateManager,
+        protected TranslatorInterface $translator,
+        protected OptionsTransformerRegistry $optionsTransformerRegistry,
+        protected ConditionalLogicRegistry $conditionalLogicRegistry,
+        protected OutputWorkflowChannelRegistry $outputWorkflowChannelRegistry
     ) {
-        $this->configuration = $configuration;
-        $this->serializer = $serializer;
-        $this->templateManager = $templateManager;
-        $this->translator = $translator;
-        $this->optionsTransformerRegistry = $optionsTransformerRegistry;
-        $this->conditionalLogicRegistry = $conditionalLogicRegistry;
-        $this->outputWorkflowChannelRegistry = $outputWorkflowChannelRegistry;
     }
 
     /**
-     * Generate array form with form attributes and available form types structure.
-     *
      * @throws \Exception
      */
     public function generateExtJsForm(FormDefinitionInterface $formDefinition): array
@@ -359,12 +342,10 @@ private function generateConditionalLogicStore(): array
             ];
         }
 
-        $formConditionalLogicData = [
+        return [
             'actions'    => $actions,
             'conditions' => $conditions,
         ];
-
-        return $formConditionalLogicData;
     }
 
     private function getFieldTypeGroups(): array
diff --git a/src/FormBuilderBundle/Builder/FrontendFormBuilder.php b/src/Builder/FrontendFormBuilder.php
similarity index 84%
rename from src/FormBuilderBundle/Builder/FrontendFormBuilder.php
rename to src/Builder/FrontendFormBuilder.php
index 711292b8..6df48111 100644
--- a/src/FormBuilderBundle/Builder/FrontendFormBuilder.php
+++ b/src/Builder/FrontendFormBuilder.php
@@ -14,24 +14,13 @@
 
 class FrontendFormBuilder
 {
-    protected FormBuilderSubscriber $formBuilderSubscriber;
-    protected RequestStack $requestStack;
-    protected FormFactoryInterface $formFactory;
-    protected FormDataFactoryInterface $formDataFactory;
-    protected UrlGeneratorInterface $router;
-
     public function __construct(
-        FormBuilderSubscriber $formBuilderSubscriber,
-        RequestStack $requestStack,
-        FormFactoryInterface $formFactory,
-        FormDataFactoryInterface $formDataFactory,
-        UrlGeneratorInterface $router
+        protected FormBuilderSubscriber $formBuilderSubscriber,
+        protected RequestStack $requestStack,
+        protected FormFactoryInterface $formFactory,
+        protected FormDataFactoryInterface $formDataFactory,
+        protected UrlGeneratorInterface $router
     ) {
-        $this->formBuilderSubscriber = $formBuilderSubscriber;
-        $this->requestStack = $requestStack;
-        $this->formFactory = $formFactory;
-        $this->formDataFactory = $formDataFactory;
-        $this->router = $router;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Configuration/Configuration.php b/src/Configuration/Configuration.php
similarity index 100%
rename from src/FormBuilderBundle/Configuration/Configuration.php
rename to src/Configuration/Configuration.php
diff --git a/src/FormBuilderBundle/Controller/Admin/ExportController.php b/src/Controller/Admin/ExportController.php
similarity index 95%
rename from src/FormBuilderBundle/Controller/Admin/ExportController.php
rename to src/Controller/Admin/ExportController.php
index d5ca48e8..447c5725 100644
--- a/src/FormBuilderBundle/Controller/Admin/ExportController.php
+++ b/src/Controller/Admin/ExportController.php
@@ -7,8 +7,8 @@
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 use FormBuilderBundle\Model\OutputWorkflowInterface;
 use FormBuilderBundle\Tool\ImportExportProcessor;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Pimcore\Model\Tool\Email;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -17,17 +17,13 @@
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
-use Symfony\Component\Yaml\Yaml;
 
-class ExportController extends AdminController
+class ExportController extends AdminAbstractController
 {
     public const NO_DATA_MESSAGE = 'NO_CSV_DATA_FOUND';
 
-    protected FormDefinitionManager $formDefinitionManager;
-
-    public function __construct(FormDefinitionManager $formDefinitionManager)
+    public function __construct(protected FormDefinitionManager $formDefinitionManager)
     {
-        $this->formDefinitionManager = $formDefinitionManager;
     }
 
     public function importFormAction(Request $request, ImportExportProcessor $importExportProcessor): JsonResponse
@@ -73,7 +69,7 @@ public function exportFormAction(Request $request, ImportExportProcessor $import
         }
 
         $response = new Response($data);
-        $exportName = 'form_export_' . $formId . '.yml';
+        $exportName = 'form_export_' . $formId . '.yaml';
 
         $disposition = $response->headers->makeDisposition(
             ResponseHeaderBag::DISPOSITION_ATTACHMENT,
@@ -198,11 +194,7 @@ private function extractMailParams(Email\Log $log, FormDefinitionInterface $form
         $normalizedParams = [];
         $forbiddenKeys = ['body', '_form_builder_id'];
 
-        try {
-            $mailParams = json_decode($log->getParams(), true);
-        } catch (\Exception $e) {
-            return $normalizedParams;
-        }
+        $mailParams = $log->getParams();
 
         if (empty($mailParams)) {
             return $normalizedParams;
diff --git a/src/FormBuilderBundle/Controller/Admin/MailEditorController.php b/src/Controller/Admin/MailEditorController.php
similarity index 50%
rename from src/FormBuilderBundle/Controller/Admin/MailEditorController.php
rename to src/Controller/Admin/MailEditorController.php
index 0f8e63c2..95ac2000 100644
--- a/src/FormBuilderBundle/Controller/Admin/MailEditorController.php
+++ b/src/Controller/Admin/MailEditorController.php
@@ -4,31 +4,24 @@
 
 use FormBuilderBundle\Builder\ExtJsFormBuilder;
 use FormBuilderBundle\MailEditor\Widget\MailEditorFieldDataWidgetInterface;
+use FormBuilderBundle\MailEditor\Widget\MailEditorWidgetInterface;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Model\Fragment\EntityToArrayAwareInterface;
 use FormBuilderBundle\Registry\MailEditorWidgetRegistry;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
-use Pimcore\Translation\Translator;
+use FormBuilderBundle\MailEditor\TemplateGenerator;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
-class MailEditorController extends AdminController
+class MailEditorController extends AdminAbstractController
 {
-    protected MailEditorWidgetRegistry $mailEditorWidgetRegistry;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected ExtJsFormBuilder $extJsFormBuilder;
-    protected Translator $pimcoreTranslator;
-
     public function __construct(
-        MailEditorWidgetRegistry $mailEditorWidgetRegistry,
-        FormDefinitionManager $formDefinitionManager,
-        ExtJsFormBuilder $extJsFormBuilder,
-        Translator $translator
+        protected MailEditorWidgetRegistry $mailEditorWidgetRegistry,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected ExtJsFormBuilder $extJsFormBuilder,
+        protected TranslatorInterface $translator
     ) {
-        $this->mailEditorWidgetRegistry = $mailEditorWidgetRegistry;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->extJsFormBuilder = $extJsFormBuilder;
-        $this->pimcoreTranslator = $translator;
     }
 
     public function getMailEditorDataAction(Request $request): JsonResponse
@@ -50,34 +43,74 @@ public function getMailEditorDataAction(Request $request): JsonResponse
 
         $allWidgets = [];
         $widgetsConfiguration = [];
+        $widgetFieldsTemplate = null;
 
+        /**
+         * @var string                    $widgetType
+         * @var MailEditorWidgetInterface $widget
+         */
         foreach ($widgets as $widgetType => $widget) {
+
             $groupName = $widget->getWidgetGroupName();
 
             if (!isset($allWidgets[$groupName])) {
                 $allWidgets[$groupName] = [
-                    'label'    => $this->pimcoreTranslator->trans($groupName, [], 'admin'),
+                    'label'    => $this->translator->trans($groupName, [], 'admin'),
                     'elements' => []
                 ];
             }
 
             if ($widget instanceof MailEditorFieldDataWidgetInterface) {
+
+                $fieldConfigElements = [];
                 foreach ($formFields as $field) {
+
                     $widgetFieldType = $widget->getWidgetIdentifierByField($widgetType, $field);
                     $widgetsConfiguration[$widgetFieldType] = $this->translateWidgetConfig($widget->getWidgetConfigByField($field));
-                    $allWidgets[$groupName]['elements'][] = [
+
+                    $fieldConfig = [
                         'type'             => $widgetType,
                         'subType'          => $widget->getSubTypeByField($field),
                         'label'            => $widget->getWidgetLabelByField($field),
+                        'field_type'       => $field['type'] ?? null,
                         'configIdentifier' => $widgetFieldType,
                     ];
+
+                    $children = [];
+                    if (array_key_exists('fields', $field)) {
+                        foreach ($field['fields'] as $subField) {
+                            $widgetFieldType = $widget->getWidgetIdentifierByField($widgetType, $subField);
+
+                            if (!array_key_exists($widgetFieldType, $widgetsConfiguration)) {
+                                $widgetsConfiguration[$widgetFieldType] = $this->translateWidgetConfig($widget->getWidgetConfigByField($subField));
+                            }
+
+                            $children[] = [
+                                'type'             => $widgetType,
+                                'subType'          => $widget->getSubTypeByField($subField),
+                                'label'            => $widget->getWidgetLabelByField($subField),
+                                'field_type'       => $field['type'] ?? null,
+                                'configIdentifier' => $widgetFieldType,
+                            ];
+                        }
+                    }
+
+                    if (count($children) > 0) {
+                        $fieldConfig['children'] = $children;
+                    }
+
+                    $fieldConfigElements[] = $fieldConfig;
                 }
+
+                $allWidgets[$groupName]['elements'] = $fieldConfigElements;
+                $widgetFieldsTemplate = (new TemplateGenerator())->generateWidgetFieldTemplate($fieldConfigElements);
+
             } else {
                 $widgetsConfiguration[$widgetType] = $this->translateWidgetConfig($widget->getWidgetConfig());
                 $allWidgets[$groupName]['elements'][] = [
                     'type'             => $widgetType,
                     'subType'          => null,
-                    'label'            => $this->pimcoreTranslator->trans($widget->getWidgetLabel(), [], 'admin'),
+                    'label'            => $this->translator->trans($widget->getWidgetLabel(), [], 'admin'),
                     'configIdentifier' => $widgetType,
                 ];
             }
@@ -88,34 +121,20 @@ public function getMailEditorDataAction(Request $request): JsonResponse
         $data = [
             'formId'        => (int) $formId,
             'configuration' => [
-                'help'                => '',
-                'widgetGroups'        => $allWidgets,
-                'widgetConfiguration' => $widgetsConfiguration
+                'help'                 => '',
+                'widgetGroups'         => $allWidgets,
+                'widgetConfiguration'  => $widgetsConfiguration,
+                'widgetFieldsTemplate' => $widgetFieldsTemplate,
             ]
         ];
 
         return $this->json($data);
     }
 
-    protected function cleanupMailLayout(array $mailLayout): array
-    {
-        foreach ($mailLayout as $mailType => $layout) {
-            $mailLayout[$mailType] = array_filter($layout, static function ($localizedLayout) {
-                return !empty($localizedLayout);
-            });
-
-            if (count($mailLayout[$mailType]) === 0) {
-                unset($mailLayout[$mailType]);
-            }
-        }
-
-        return $mailLayout;
-    }
-
     protected function translateWidgetConfig(array $config): array
     {
         foreach ($config as $index => $element) {
-            $config[$index]['label'] = $this->pimcoreTranslator->trans($element['label'], [], 'admin');
+            $config[$index]['label'] = $this->translator->trans($element['label'], [], 'admin');
         }
 
         return $config;
diff --git a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowApiController.php b/src/Controller/Admin/OutputWorkflowApiController.php
similarity index 87%
rename from src/FormBuilderBundle/Controller/Admin/OutputWorkflowApiController.php
rename to src/Controller/Admin/OutputWorkflowApiController.php
index 725f46ad..782ee21d 100644
--- a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowApiController.php
+++ b/src/Controller/Admin/OutputWorkflowApiController.php
@@ -7,28 +7,19 @@
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\Registry\ApiProviderRegistry;
 use FormBuilderBundle\Registry\FieldTransformerRegistry;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class OutputWorkflowApiController extends AdminController
+class OutputWorkflowApiController extends AdminAbstractController
 {
-    protected FormDefinitionManager $formDefinitionManager;
-    protected ExtJsFormBuilder $extJsFormBuilder;
-    protected ApiProviderRegistry $apiProviderRegistry;
-    protected FieldTransformerRegistry $fieldTransformerRegistry;
-
     public function __construct(
-        FormDefinitionManager $formDefinitionManager,
-        ExtJsFormBuilder $extJsFormBuilder,
-        ApiProviderRegistry $apiProviderRegistry,
-        FieldTransformerRegistry $fieldTransformerRegistry
+        protected FormDefinitionManager $formDefinitionManager,
+        protected ExtJsFormBuilder $extJsFormBuilder,
+        protected ApiProviderRegistry $apiProviderRegistry,
+        protected FieldTransformerRegistry $fieldTransformerRegistry
     ) {
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->extJsFormBuilder = $extJsFormBuilder;
-        $this->apiProviderRegistry = $apiProviderRegistry;
-        $this->fieldTransformerRegistry = $fieldTransformerRegistry;
     }
 
     public function getFormDataAction(Request $request): JsonResponse
diff --git a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowController.php b/src/Controller/Admin/OutputWorkflowController.php
similarity index 89%
rename from src/FormBuilderBundle/Controller/Admin/OutputWorkflowController.php
rename to src/Controller/Admin/OutputWorkflowController.php
index 340f98ba..52a186c6 100644
--- a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowController.php
+++ b/src/Controller/Admin/OutputWorkflowController.php
@@ -9,32 +9,21 @@
 use FormBuilderBundle\Manager\OutputWorkflowManager;
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\Model\OutputWorkflowInterface;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-class OutputWorkflowController extends AdminController
+class OutputWorkflowController extends AdminAbstractController
 {
-    protected Configuration $configuration;
-    protected FormFactoryInterface $formFactory;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected OutputWorkflowManager $outputWorkflowManager;
-    protected ExtJsFormBuilder $extJsFormBuilder;
-
     public function __construct(
-        Configuration $configuration,
-        FormFactoryInterface $formFactory,
-        FormDefinitionManager $formDefinitionManager,
-        OutputWorkflowManager $outputWorkflowManager,
-        ExtJsFormBuilder $extJsFormBuilder
+        protected Configuration $configuration,
+        protected FormFactoryInterface $formFactory,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected OutputWorkflowManager $outputWorkflowManager,
+        protected ExtJsFormBuilder $extJsFormBuilder
     ) {
-        $this->configuration = $configuration;
-        $this->formFactory = $formFactory;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->outputWorkflowManager = $outputWorkflowManager;
-        $this->extJsFormBuilder = $extJsFormBuilder;
     }
 
     public function getOutputWorkflowTreeAction(Request $request, int $formId): JsonResponse
diff --git a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowFunnelController.php b/src/Controller/Admin/OutputWorkflowFunnelController.php
similarity index 81%
rename from src/FormBuilderBundle/Controller/Admin/OutputWorkflowFunnelController.php
rename to src/Controller/Admin/OutputWorkflowFunnelController.php
index 6c8f183a..96ab4370 100644
--- a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowFunnelController.php
+++ b/src/Controller/Admin/OutputWorkflowFunnelController.php
@@ -6,27 +6,22 @@
 use FormBuilderBundle\OutputWorkflow\Channel\Funnel\Layer\FunnelLayerInterface;
 use FormBuilderBundle\Registry\FunnelActionRegistry;
 use FormBuilderBundle\Registry\FunnelLayerRegistry;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
-class OutputWorkflowFunnelController extends AdminController
+class OutputWorkflowFunnelController extends AdminAbstractController
 {
-    protected SerializerInterface $serializer;
-    protected FunnelLayerRegistry $funnelLayerRegistry;
-    protected FunnelActionRegistry $funnelActionRegistry;
-
     public function __construct(
-        SerializerInterface $serializer,
-        FunnelLayerRegistry $funnelLayerRegistry,
-        FunnelActionRegistry $funnelActionRegistry
+        protected TranslatorInterface $translator,
+        protected SerializerInterface $serializer,
+        protected FunnelLayerRegistry $funnelLayerRegistry,
+        protected FunnelActionRegistry $funnelActionRegistry
     ) {
-        $this->serializer = $serializer;
-        $this->funnelLayerRegistry = $funnelLayerRegistry;
-        $this->funnelActionRegistry = $funnelActionRegistry;
     }
 
     public function getFunnelLayersAction(Request $request): JsonResponse
@@ -59,7 +54,7 @@ public function getFunnelLayersAction(Request $request): JsonResponse
                                 'groups'                      => ['ExtJs'],
                                 AbstractNormalizer::CALLBACKS => [
                                     'label' => function ($data) {
-                                        return $this->trans($data, [], 'messages');
+                                        return $this->translator->trans($data, [], 'messages');
                                     }
                                 ]
                             ]
diff --git a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowObjectController.php b/src/Controller/Admin/OutputWorkflowObjectController.php
similarity index 85%
rename from src/FormBuilderBundle/Controller/Admin/OutputWorkflowObjectController.php
rename to src/Controller/Admin/OutputWorkflowObjectController.php
index 7a129e4d..58d453ae 100644
--- a/src/FormBuilderBundle/Controller/Admin/OutputWorkflowObjectController.php
+++ b/src/Controller/Admin/OutputWorkflowObjectController.php
@@ -9,35 +9,22 @@
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\OutputWorkflow\DynamicObjectResolver\DynamicObjectResolverInterface;
 use FormBuilderBundle\Registry\DynamicObjectResolverRegistry;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Pimcore\Model\DataObject;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-class OutputWorkflowObjectController extends AdminController
+class OutputWorkflowObjectController extends AdminAbstractController
 {
-    protected Configuration $configuration;
-    protected FormFactoryInterface $formFactory;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected OutputWorkflowManager $outputWorkflowManager;
-    protected DynamicObjectResolverRegistry $dynamicObjectResolverRegistry;
-    protected ExtJsFormBuilder $extJsFormBuilder;
-
     public function __construct(
-        Configuration $configuration,
-        FormFactoryInterface $formFactory,
-        FormDefinitionManager $formDefinitionManager,
-        OutputWorkflowManager $outputWorkflowManager,
-        DynamicObjectResolverRegistry $dynamicObjectResolverRegistry,
-        ExtJsFormBuilder $extJsFormBuilder
+        protected Configuration $configuration,
+        protected FormFactoryInterface $formFactory,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected OutputWorkflowManager $outputWorkflowManager,
+        protected DynamicObjectResolverRegistry $dynamicObjectResolverRegistry,
+        protected ExtJsFormBuilder $extJsFormBuilder
     ) {
-        $this->configuration = $configuration;
-        $this->formFactory = $formFactory;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->outputWorkflowManager = $outputWorkflowManager;
-        $this->dynamicObjectResolverRegistry = $dynamicObjectResolverRegistry;
-        $this->extJsFormBuilder = $extJsFormBuilder;
     }
 
     public function getObjectClassesAction(Request $request): JsonResponse
diff --git a/src/FormBuilderBundle/Controller/Admin/SettingsController.php b/src/Controller/Admin/SettingsController.php
similarity index 91%
rename from src/FormBuilderBundle/Controller/Admin/SettingsController.php
rename to src/Controller/Admin/SettingsController.php
index a12436e1..ab69df69 100644
--- a/src/FormBuilderBundle/Controller/Admin/SettingsController.php
+++ b/src/Controller/Admin/SettingsController.php
@@ -11,30 +11,19 @@
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\Registry\DataInjectionRegistry;
 use FormBuilderBundle\Tool\FormDependencyLocator;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
+use Pimcore\Bundle\AdminBundle\Controller\AdminAbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-class SettingsController extends AdminController
+class SettingsController extends AdminAbstractController
 {
-    protected Configuration $configuration;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected ExtJsFormBuilder $extJsFormBuilder;
-    protected ChoiceBuilderRegistry $choiceBuilderRegistry;
-    protected FormDependencyLocator $formDependencyLocator;
-
     public function __construct(
-        Configuration $configuration,
-        FormDefinitionManager $formDefinitionManager,
-        ExtJsFormBuilder $extJsFormBuilder,
-        ChoiceBuilderRegistry $choiceBuilderRegistry,
-        FormDependencyLocator $formDependencyLocator
+        protected Configuration $configuration,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected ExtJsFormBuilder $extJsFormBuilder,
+        protected ChoiceBuilderRegistry $choiceBuilderRegistry,
+        protected FormDependencyLocator $formDependencyLocator
     ) {
-        $this->configuration = $configuration;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->extJsFormBuilder = $extJsFormBuilder;
-        $this->choiceBuilderRegistry = $choiceBuilderRegistry;
-        $this->formDependencyLocator = $formDependencyLocator;
     }
 
     public function getTreeAction(): JsonResponse
diff --git a/src/FormBuilderBundle/Controller/AjaxController.php b/src/Controller/AjaxController.php
similarity index 87%
rename from src/FormBuilderBundle/Controller/AjaxController.php
rename to src/Controller/AjaxController.php
index 07b8f3af..efe542e6 100644
--- a/src/FormBuilderBundle/Controller/AjaxController.php
+++ b/src/Controller/AjaxController.php
@@ -11,15 +11,10 @@
 
 class AjaxController extends FrontendController
 {
-    protected Configuration $configuration;
-    protected DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry;
-
     public function __construct(
-        Configuration $configuration,
-        DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry
+        protected Configuration $configuration,
+        protected DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry
     ) {
-        $this->configuration = $configuration;
-        $this->dynamicMultiFileAdapterRegistry = $dynamicMultiFileAdapterRegistry;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Controller/EmailController.php b/src/Controller/EmailController.php
similarity index 89%
rename from src/FormBuilderBundle/Controller/EmailController.php
rename to src/Controller/EmailController.php
index 969f95aa..19c23aa4 100644
--- a/src/FormBuilderBundle/Controller/EmailController.php
+++ b/src/Controller/EmailController.php
@@ -10,8 +10,6 @@ class EmailController extends FrontendController
 {
     public function emailAction(Request $request): Response
     {
-        // @see https://github.com/pimcore/pimcore/issues/10504
-
         return $this->render('@FormBuilder/email/email.html.twig', [
             'editmode' => $this->editmode,
             'document' => $this->document,
diff --git a/src/FormBuilderBundle/Controller/FunnelController.php b/src/Controller/FunnelController.php
similarity index 75%
rename from src/FormBuilderBundle/Controller/FunnelController.php
rename to src/Controller/FunnelController.php
index a8912820..33b6a8b8 100644
--- a/src/FormBuilderBundle/Controller/FunnelController.php
+++ b/src/Controller/FunnelController.php
@@ -13,18 +13,11 @@
 
 class FunnelController extends FrontendController
 {
-    protected OutputWorkflowRepositoryInterface $outputWorkflowRepository;
-    protected OutputWorkflowDispatcherInterface $outputWorkflowDispatcher;
-    protected FunnelDataResolver $funnelDataResolver;
-
     public function __construct(
-        OutputWorkflowRepositoryInterface $outputWorkflowRepository,
-        OutputWorkflowDispatcherInterface $outputWorkflowDispatcher,
-        FunnelDataResolver $funnelDataResolver,
+        protected OutputWorkflowRepositoryInterface $outputWorkflowRepository,
+        protected OutputWorkflowDispatcherInterface $outputWorkflowDispatcher,
+        protected FunnelDataResolver $funnelDataResolver,
     ) {
-        $this->outputWorkflowRepository = $outputWorkflowRepository;
-        $this->outputWorkflowDispatcher = $outputWorkflowDispatcher;
-        $this->funnelDataResolver = $funnelDataResolver;
     }
 
     public function dispatchAction(Request $request, string $funnelId, string $channelId, string $storageToken): Response
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/ApiProviderPass.php b/src/DependencyInjection/CompilerPass/ApiProviderPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/ApiProviderPass.php
rename to src/DependencyInjection/CompilerPass/ApiProviderPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/ChoiceBuilderPass.php b/src/DependencyInjection/CompilerPass/ChoiceBuilderPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/ChoiceBuilderPass.php
rename to src/DependencyInjection/CompilerPass/ChoiceBuilderPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/DataInjectionPass.php b/src/DependencyInjection/CompilerPass/DataInjectionPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/DataInjectionPass.php
rename to src/DependencyInjection/CompilerPass/DataInjectionPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/DispatcherPass.php b/src/DependencyInjection/CompilerPass/DispatcherPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/DispatcherPass.php
rename to src/DependencyInjection/CompilerPass/DispatcherPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/DynamicMultiFileAdapterPass.php b/src/DependencyInjection/CompilerPass/DynamicMultiFileAdapterPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/DynamicMultiFileAdapterPass.php
rename to src/DependencyInjection/CompilerPass/DynamicMultiFileAdapterPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/DynamicObjectResolverPass.php b/src/DependencyInjection/CompilerPass/DynamicObjectResolverPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/DynamicObjectResolverPass.php
rename to src/DependencyInjection/CompilerPass/DynamicObjectResolverPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/FieldTransformerPass.php b/src/DependencyInjection/CompilerPass/FieldTransformerPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/FieldTransformerPass.php
rename to src/DependencyInjection/CompilerPass/FieldTransformerPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/MailEditorWidgetPass.php b/src/DependencyInjection/CompilerPass/MailEditorWidgetPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/MailEditorWidgetPass.php
rename to src/DependencyInjection/CompilerPass/MailEditorWidgetPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/OptionsTransformerPass.php b/src/DependencyInjection/CompilerPass/OptionsTransformerPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/OptionsTransformerPass.php
rename to src/DependencyInjection/CompilerPass/OptionsTransformerPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputInputTransformerPass.php b/src/DependencyInjection/CompilerPass/OutputInputTransformerPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputInputTransformerPass.php
rename to src/DependencyInjection/CompilerPass/OutputInputTransformerPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowChannelPass.php b/src/DependencyInjection/CompilerPass/OutputWorkflowChannelPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowChannelPass.php
rename to src/DependencyInjection/CompilerPass/OutputWorkflowChannelPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowFunnelActionPass.php b/src/DependencyInjection/CompilerPass/OutputWorkflowFunnelActionPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowFunnelActionPass.php
rename to src/DependencyInjection/CompilerPass/OutputWorkflowFunnelActionPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowFunnelLayerPass.php b/src/DependencyInjection/CompilerPass/OutputWorkflowFunnelLayerPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/OutputWorkflowFunnelLayerPass.php
rename to src/DependencyInjection/CompilerPass/OutputWorkflowFunnelLayerPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/RuntimeDataProviderPass.php b/src/DependencyInjection/CompilerPass/RuntimeDataProviderPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/RuntimeDataProviderPass.php
rename to src/DependencyInjection/CompilerPass/RuntimeDataProviderPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/CompilerPass/StorageProviderPass.php b/src/DependencyInjection/CompilerPass/StorageProviderPass.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/CompilerPass/StorageProviderPass.php
rename to src/DependencyInjection/CompilerPass/StorageProviderPass.php
diff --git a/src/FormBuilderBundle/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
similarity index 100%
rename from src/FormBuilderBundle/DependencyInjection/Configuration.php
rename to src/DependencyInjection/Configuration.php
diff --git a/src/FormBuilderBundle/DependencyInjection/FormBuilderExtension.php b/src/DependencyInjection/FormBuilderExtension.php
similarity index 94%
rename from src/FormBuilderBundle/DependencyInjection/FormBuilderExtension.php
rename to src/DependencyInjection/FormBuilderExtension.php
index 67bcf55a..c4c09df6 100644
--- a/src/FormBuilderBundle/DependencyInjection/FormBuilderExtension.php
+++ b/src/DependencyInjection/FormBuilderExtension.php
@@ -18,6 +18,8 @@ public function prepend(ContainerBuilder $container): void
         $configs = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
 
+        $container->setParameter('formbuilder.use_emailizr', $container->hasExtension('emailizr'));
+
         if ($container->hasExtension('twig') === false) {
             return;
         }
@@ -37,8 +39,8 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../Resources/config']));
-        $loader->load('services.yml');
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
+        $loader->load('services.yaml');
 
         $conditionalLogicDefinition = $container->getDefinition(ConditionalLogicRegistry::class);
 
diff --git a/src/FormBuilderBundle/Doctrine/Type/FormBuilderFieldsType.php b/src/Doctrine/Type/FormBuilderFieldsType.php
similarity index 100%
rename from src/FormBuilderBundle/Doctrine/Type/FormBuilderFieldsType.php
rename to src/Doctrine/Type/FormBuilderFieldsType.php
diff --git a/src/FormBuilderBundle/Document/Areabrick/Form/Form.php b/src/Document/Areabrick/Form/Form.php
similarity index 93%
rename from src/FormBuilderBundle/Document/Areabrick/Form/Form.php
rename to src/Document/Areabrick/Form/Form.php
index 0957d38c..fb6331b2 100644
--- a/src/FormBuilderBundle/Document/Areabrick/Form/Form.php
+++ b/src/Document/Areabrick/Form/Form.php
@@ -12,29 +12,18 @@
 use Pimcore\Extension\Document\Areabrick\EditableDialogBoxConfiguration;
 use Pimcore\Extension\Document\Areabrick\EditableDialogBoxInterface;
 use Pimcore\Model\Document;
-use Pimcore\Translation\Translator;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class Form extends AbstractAreabrick implements EditableDialogBoxInterface
 {
-    protected FormDefinitionManager $formDefinitionManager;
-    protected PresetManager $presetManager;
-    protected FormAssembler $formAssembler;
-    protected TemplateManager $templateManager;
-    protected Translator $translator;
-
     public function __construct(
-        FormDefinitionManager $formDefinitionManager,
-        PresetManager $presetManager,
-        FormAssembler $formAssembler,
-        TemplateManager $templateManager,
-        Translator $translator
+        protected FormDefinitionManager $formDefinitionManager,
+        protected PresetManager $presetManager,
+        protected FormAssembler $formAssembler,
+        protected TemplateManager $templateManager,
+        protected TranslatorInterface $translator
     ) {
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->presetManager = $presetManager;
-        $this->formAssembler = $formAssembler;
-        $this->templateManager = $templateManager;
-        $this->translator = $translator;
     }
 
     public function action(Document\Editable\Area\Info $info): ?Response
diff --git a/src/FormBuilderBundle/DynamicMultiFile/Adapter/DropZoneAdapter.php b/src/DynamicMultiFile/Adapter/DropZoneAdapter.php
similarity index 100%
rename from src/FormBuilderBundle/DynamicMultiFile/Adapter/DropZoneAdapter.php
rename to src/DynamicMultiFile/Adapter/DropZoneAdapter.php
diff --git a/src/FormBuilderBundle/DynamicMultiFile/Adapter/DynamicMultiFileAdapterInterface.php b/src/DynamicMultiFile/Adapter/DynamicMultiFileAdapterInterface.php
similarity index 100%
rename from src/FormBuilderBundle/DynamicMultiFile/Adapter/DynamicMultiFileAdapterInterface.php
rename to src/DynamicMultiFile/Adapter/DynamicMultiFileAdapterInterface.php
diff --git a/src/FormBuilderBundle/DynamicMultiFile/Adapter/FineUploadAdapter.php b/src/DynamicMultiFile/Adapter/FineUploadAdapter.php
similarity index 100%
rename from src/FormBuilderBundle/DynamicMultiFile/Adapter/FineUploadAdapter.php
rename to src/DynamicMultiFile/Adapter/FineUploadAdapter.php
diff --git a/src/FormBuilderBundle/Event/Form/PostSetDataEvent.php b/src/Event/Form/PostSetDataEvent.php
similarity index 61%
rename from src/FormBuilderBundle/Event/Form/PostSetDataEvent.php
rename to src/Event/Form/PostSetDataEvent.php
index 25f98333..632f984c 100644
--- a/src/FormBuilderBundle/Event/Form/PostSetDataEvent.php
+++ b/src/Event/Form/PostSetDataEvent.php
@@ -7,13 +7,10 @@
 
 class PostSetDataEvent extends Event
 {
-    private FormEvent $formEvent;
-    private array $formOptions;
-
-    public function __construct(FormEvent $formEvent, $formOptions)
-    {
-        $this->formEvent = $formEvent;
-        $this->formOptions = $formOptions;
+    public function __construct(
+        private readonly FormEvent $formEvent,
+        private readonly array $formOptions
+    ) {
     }
 
     public function getFormEvent(): FormEvent
diff --git a/src/FormBuilderBundle/Event/Form/PreSetDataEvent.php b/src/Event/Form/PreSetDataEvent.php
similarity index 61%
rename from src/FormBuilderBundle/Event/Form/PreSetDataEvent.php
rename to src/Event/Form/PreSetDataEvent.php
index bbc1da6c..8aec5990 100644
--- a/src/FormBuilderBundle/Event/Form/PreSetDataEvent.php
+++ b/src/Event/Form/PreSetDataEvent.php
@@ -7,13 +7,10 @@
 
 class PreSetDataEvent extends Event
 {
-    private FormEvent $formEvent;
-    private array $formOptions;
-
-    public function __construct(FormEvent $formEvent, $formOptions)
-    {
-        $this->formEvent = $formEvent;
-        $this->formOptions = $formOptions;
+    public function __construct(
+        private readonly FormEvent $formEvent,
+        private readonly array $formOptions
+    ) {
     }
 
     public function getFormEvent(): FormEvent
diff --git a/src/FormBuilderBundle/Event/Form/PreSubmitEvent.php b/src/Event/Form/PreSubmitEvent.php
similarity index 61%
rename from src/FormBuilderBundle/Event/Form/PreSubmitEvent.php
rename to src/Event/Form/PreSubmitEvent.php
index 56e6ab93..52a7cf6a 100644
--- a/src/FormBuilderBundle/Event/Form/PreSubmitEvent.php
+++ b/src/Event/Form/PreSubmitEvent.php
@@ -7,13 +7,10 @@
 
 class PreSubmitEvent extends Event
 {
-    private FormEvent $formEvent;
-    private array $formOptions;
-
-    public function __construct(FormEvent $formEvent, $formOptions)
-    {
-        $this->formEvent = $formEvent;
-        $this->formOptions = $formOptions;
+    public function __construct(
+        private readonly FormEvent $formEvent,
+        private readonly array $formOptions
+    ) {
     }
 
     public function getFormEvent(): FormEvent
diff --git a/src/FormBuilderBundle/Event/FormAssembleEvent.php b/src/Event/FormAssembleEvent.php
similarity index 65%
rename from src/FormBuilderBundle/Event/FormAssembleEvent.php
rename to src/Event/FormAssembleEvent.php
index 8869ca1a..c82a9e17 100644
--- a/src/FormBuilderBundle/Event/FormAssembleEvent.php
+++ b/src/Event/FormAssembleEvent.php
@@ -9,17 +9,13 @@
 
 class FormAssembleEvent extends Event
 {
-    protected FormOptionsResolver $formOptionsResolver;
-    protected ?FormInterface $form;
-
     protected array $formData = [];
-    protected FormDefinitionInterface $formDefinition;
 
-    public function __construct(FormOptionsResolver $formOptionsResolver, FormDefinitionInterface $formDefinition, ?FormInterface $form = null)
-    {
-        $this->formOptionsResolver = $formOptionsResolver;
-        $this->formDefinition = $formDefinition;
-        $this->form = $form;
+    public function __construct(
+        protected FormOptionsResolver $formOptionsResolver,
+        protected FormDefinitionInterface $formDefinition,
+        protected ?FormInterface $form = null
+    ) {
     }
 
     public function getFormOptionsResolver(): FormOptionsResolver
diff --git a/src/FormBuilderBundle/Event/OutputWorkflow/ChannelSubjectGuardEvent.php b/src/Event/OutputWorkflow/ChannelSubjectGuardEvent.php
similarity index 71%
rename from src/FormBuilderBundle/Event/OutputWorkflow/ChannelSubjectGuardEvent.php
rename to src/Event/OutputWorkflow/ChannelSubjectGuardEvent.php
index 15196002..aaa9f3bd 100644
--- a/src/FormBuilderBundle/Event/OutputWorkflow/ChannelSubjectGuardEvent.php
+++ b/src/Event/OutputWorkflow/ChannelSubjectGuardEvent.php
@@ -7,28 +7,18 @@
 
 class ChannelSubjectGuardEvent extends Event
 {
-    protected FormDataInterface $formData;
-    protected mixed $subject;
-    protected array $formRuntimeData;
-    protected string $workflowName;
-    protected string $channelType;
-    protected bool $suspended;
-    protected bool $failed;
-    protected bool $currentChannelOnly;
-    protected ?string $failMessage;
-
-    public function __construct(FormDataInterface $formData, mixed $subject, string $workflowName, string $channelType, array $formRuntimeData)
-    {
-        $this->formData = $formData;
-        $this->subject = $subject;
-        $this->workflowName = $workflowName;
-        $this->channelType = $channelType;
-        $this->formRuntimeData = $formRuntimeData;
-
-        $this->suspended = false;
-        $this->failed = false;
-        $this->currentChannelOnly = true;
-        $this->failMessage = null;
+    protected bool $suspended = false;
+    protected bool $failed = false;
+    protected bool $currentChannelOnly = true;
+    protected ?string $failMessage = null;
+
+    public function __construct(
+        protected FormDataInterface $formData,
+        protected mixed $subject,
+        protected string $workflowName,
+        protected string $channelType,
+        protected array $formRuntimeData
+    ) {
     }
 
     public function setSubject(mixed $subject): void
diff --git a/src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalEvent.php b/src/Event/OutputWorkflow/OutputWorkflowSignalEvent.php
similarity index 68%
rename from src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalEvent.php
rename to src/Event/OutputWorkflow/OutputWorkflowSignalEvent.php
index 52adcb7d..e58deda8 100644
--- a/src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalEvent.php
+++ b/src/Event/OutputWorkflow/OutputWorkflowSignalEvent.php
@@ -8,13 +8,10 @@ class OutputWorkflowSignalEvent extends Event
 {
     public const NAME = 'form_builder.output_workflow.signal';
 
-    protected string $name;
-    protected mixed $data;
-
-    public function __construct(string $name, mixed $data)
-    {
-        $this->name = $name;
-        $this->data = $data;
+    public function __construct(
+        protected string $name,
+        protected mixed $data
+    ) {
     }
 
     public function getName(): string
diff --git a/src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php b/src/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php
similarity index 87%
rename from src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php
rename to src/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php
index bf1033c4..2075728e 100644
--- a/src/FormBuilderBundle/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php
+++ b/src/Event/OutputWorkflow/OutputWorkflowSignalsEvent.php
@@ -7,15 +7,11 @@
 
 class OutputWorkflowSignalsEvent extends Event
 {
-    protected string $channel;
-    protected array $signals;
-    protected array $context;
-
-    public function __construct(string $channel, array $signals, array $context)
-    {
-        $this->channel = $channel;
-        $this->signals = $signals;
-        $this->context = $context;
+    public function __construct(
+        protected string $channel,
+        protected array $signals,
+        protected array $context
+    ) {
     }
 
     public function getChannel(): string
diff --git a/src/FormBuilderBundle/Event/SubmissionEvent.php b/src/Event/SubmissionEvent.php
similarity index 73%
rename from src/FormBuilderBundle/Event/SubmissionEvent.php
rename to src/Event/SubmissionEvent.php
index 581c8e3e..75660d23 100644
--- a/src/FormBuilderBundle/Event/SubmissionEvent.php
+++ b/src/Event/SubmissionEvent.php
@@ -8,20 +8,15 @@
 
 class SubmissionEvent extends Event
 {
-    private Request $request;
-    private FormInterface $form;
-    protected ?array $funnelRuntimeData = null;
-
-    private ?array $formRuntimeData;
     private ?string $redirectUri = null;
     private bool $outputWorkflowFinisherDisabled = false;
 
-    public function __construct(Request $request, ?array $formRuntimeData, FormInterface $form, ?array $funnelRuntimeData = null)
-    {
-        $this->request = $request;
-        $this->formRuntimeData = $formRuntimeData;
-        $this->form = $form;
-        $this->funnelRuntimeData = $funnelRuntimeData;
+    public function __construct(
+        private readonly Request $request,
+        private readonly ?array $formRuntimeData,
+        private readonly FormInterface $form,
+        protected ?array $funnelRuntimeData = null
+    ) {
     }
 
     public function disableOutputWorkflowFinisher(): void
diff --git a/src/FormBuilderBundle/FormBuilderBundle.php b/src/EventListener/Admin/AssetListener.php
similarity index 54%
rename from src/FormBuilderBundle/FormBuilderBundle.php
rename to src/EventListener/Admin/AssetListener.php
index f6930954..58eb4050 100644
--- a/src/FormBuilderBundle/FormBuilderBundle.php
+++ b/src/EventListener/Admin/AssetListener.php
@@ -1,86 +1,40 @@
 <?php
 
-namespace FormBuilderBundle;
+namespace FormBuilderBundle\EventListener\Admin;
 
-use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
-use Doctrine\DBAL\Types\Type;
-use FormBuilderBundle\DependencyInjection\CompilerPass\ApiProviderPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\ChoiceBuilderPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\DataInjectionPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\DispatcherPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\DynamicMultiFileAdapterPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\DynamicObjectResolverPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\FieldTransformerPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\MailEditorWidgetPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\OptionsTransformerPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\OutputInputTransformerPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowChannelPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowFunnelActionPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowFunnelLayerPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\RuntimeDataProviderPass;
-use FormBuilderBundle\DependencyInjection\CompilerPass\StorageProviderPass;
-use FormBuilderBundle\Doctrine\Type\FormBuilderFieldsType;
-use FormBuilderBundle\Factory\FormDefinitionFactoryInterface;
-use FormBuilderBundle\Tool\Install;
-use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
-use Pimcore\Extension\Bundle\Traits\PackageVersionTrait;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Pimcore\Event\BundleManager\PathsEvent;
+use Pimcore\Event\BundleManagerEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class FormBuilderBundle extends AbstractPimcoreBundle
+class AssetListener implements EventSubscriberInterface
 {
-    use PackageVersionTrait;
-
-    public const PACKAGE_NAME = 'dachcom-digital/formbuilder';
-
-    public function boot(): void
-    {
-        $this->addDBALTypes();
-    }
-
-    private function addDBALTypes(): void
+    public static function getSubscribedEvents(): array
     {
-        if (Type::hasType('form_builder_fields')) {
-            return;
-        }
-
-        Type::addType('form_builder_fields', FormBuilderFieldsType::class);
-
-        /** @var FormBuilderFieldsType $formBuilderFieldsType */
-        $formBuilderFieldsType = Type::getType('form_builder_fields');
-        $formBuilderFieldsType->setFormDefinitionFactory($this->container->get(FormDefinitionFactoryInterface::class));
+        return [
+            BundleManagerEvents::CSS_PATHS          => 'addCssFiles',
+            BundleManagerEvents::EDITMODE_CSS_PATHS => 'addEditModeCssFiles',
+            BundleManagerEvents::JS_PATHS           => 'addJsFiles',
+            BundleManagerEvents::EDITMODE_JS_PATHS  => 'addEditModeJsFiles'
+        ];
     }
 
-    public function build(ContainerBuilder $container): void
+    public function addCssFiles(PathsEvent $event): void
     {
-        parent::build($container);
-
-        $this->configureDoctrineExtension($container);
-
-        $container->addCompilerPass(new OptionsTransformerPass());
-        $container->addCompilerPass(new DispatcherPass());
-        $container->addCompilerPass(new ChoiceBuilderPass());
-        $container->addCompilerPass(new MailEditorWidgetPass());
-        $container->addCompilerPass(new OutputInputTransformerPass());
-        $container->addCompilerPass(new OutputWorkflowChannelPass());
-        $container->addCompilerPass(new OutputWorkflowFunnelLayerPass());
-        $container->addCompilerPass(new OutputWorkflowFunnelActionPass());
-        $container->addCompilerPass(new DynamicObjectResolverPass());
-        $container->addCompilerPass(new RuntimeDataProviderPass());
-        $container->addCompilerPass(new DynamicMultiFileAdapterPass());
-        $container->addCompilerPass(new ApiProviderPass());
-        $container->addCompilerPass(new FieldTransformerPass());
-        $container->addCompilerPass(new StorageProviderPass());
-        $container->addCompilerPass(new DataInjectionPass());
+        $event->addPaths([
+            '/bundles/formbuilder/css/admin.css'
+        ]);
     }
 
-    public function getInstaller(): Install
+    public function addEditModeCssFiles(PathsEvent $event): void
     {
-        return $this->container->get(Install::class);
+        $event->addPaths([
+            '/bundles/formbuilder/css/admin-editmode.css',
+        ]);
     }
 
-    public function getJsPaths(): array
+    public function addJsFiles(PathsEvent $event): void
     {
-        return [
+        $event->addPaths([
             '/bundles/formbuilder/js/extjs/plugin.js',
             '/bundles/formbuilder/js/extjs/settings.js',
             '/bundles/formbuilder/js/extjs/types/keyValueRepeater.js',
@@ -144,57 +98,16 @@ public function getJsPaths(): array
             '/bundles/formbuilder/js/extjs/components/successMessageToggleComponent.js',
             '/bundles/formbuilder/js/extjs/components/elements/Formbuilder.HrefTextField.js',
             '/bundles/formbuilder/js/extjs/vendor/dataObject.js',
-        ];
-    }
-
-    public function getCssPaths(): array
-    {
-        return [
-            '/bundles/formbuilder/css/admin.css'
-        ];
+            '/bundles/formbuilder/js/extjs/editor/AbstractFieldComponent.js',
+            '/bundles/formbuilder/js/extjs/editor/ContainerFieldComponent.js',
+            '/bundles/formbuilder/js/extjs/editor/FieldComponent.js'
+        ]);
     }
 
-    public function getEditmodeJsPaths(): array
+    public function addEditModeJsFiles(PathsEvent $event): void
     {
-        return [
+        $event->addPaths([
             '/bundles/formbuilder/js/admin/area.js'
-        ];
-    }
-
-    public function getEditmodeCssPaths(): array
-    {
-        return [
-            '/bundles/formbuilder/css/admin-editmode.css',
-        ];
-    }
-
-    protected function getComposerPackageName(): string
-    {
-        return self::PACKAGE_NAME;
-    }
-
-    protected function configureDoctrineExtension(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(
-            DoctrineOrmMappingsPass::createYamlMappingDriver(
-                [$this->getNameSpacePath() => $this->getNamespaceName()],
-                ['form_builder.persistence.doctrine.manager'],
-                'form_builder.persistence.doctrine.enabled'
-            )
-        );
-    }
-
-    protected function getNamespaceName(): string
-    {
-        return 'FormBuilderBundle\Model';
-    }
-
-    protected function getNameSpacePath(): string
-    {
-        return sprintf(
-            '%s/Resources/config/doctrine/%s',
-            $this->getPath(),
-            'model'
-        );
+        ]);
     }
 }
diff --git a/src/FormBuilderBundle/EventListener/Core/CleanUpListener.php b/src/EventListener/Core/CleanUpListener.php
similarity index 100%
rename from src/FormBuilderBundle/EventListener/Core/CleanUpListener.php
rename to src/EventListener/Core/CleanUpListener.php
diff --git a/src/FormBuilderBundle/EventListener/Core/FunnelFormAssemblingListener.php b/src/EventListener/Core/FunnelFormAssemblingListener.php
similarity index 83%
rename from src/FormBuilderBundle/EventListener/Core/FunnelFormAssemblingListener.php
rename to src/EventListener/Core/FunnelFormAssemblingListener.php
index f290282b..675f89c4 100644
--- a/src/FormBuilderBundle/EventListener/Core/FunnelFormAssemblingListener.php
+++ b/src/EventListener/Core/FunnelFormAssemblingListener.php
@@ -5,7 +5,6 @@
 use FormBuilderBundle\Event\FormAssembleEvent;
 use FormBuilderBundle\Form\FormValuesInputApplierInterface;
 use FormBuilderBundle\FormBuilderEvents;
-use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\OutputWorkflow\Channel\Funnel\Action\ReturnToFormAction;
 use FormBuilderBundle\Resolver\FunnelDataResolver;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -16,18 +15,11 @@
 
 class FunnelFormAssemblingListener implements EventSubscriberInterface
 {
-    protected RequestStack $requestStack;
-    protected FunnelDataResolver $funnelDataResolver;
-    protected FormValuesInputApplierInterface $formValuesInputApplier;
-
     public function __construct(
-        RequestStack $requestStack,
-        FunnelDataResolver $funnelDataResolver,
-        FormValuesInputApplierInterface $formValuesInputApplier
+        protected RequestStack $requestStack,
+        protected FunnelDataResolver $funnelDataResolver,
+        protected FormValuesInputApplierInterface $formValuesInputApplier
     ) {
-        $this->requestStack = $requestStack;
-        $this->funnelDataResolver = $funnelDataResolver;
-        $this->formValuesInputApplier = $formValuesInputApplier;
     }
 
     public static function getSubscribedEvents(): array
diff --git a/src/FormBuilderBundle/EventListener/Core/FunnelRouteListener.php b/src/EventListener/Core/FunnelRouteListener.php
similarity index 88%
rename from src/FormBuilderBundle/EventListener/Core/FunnelRouteListener.php
rename to src/EventListener/Core/FunnelRouteListener.php
index b14a53ea..4d2ddff7 100644
--- a/src/FormBuilderBundle/EventListener/Core/FunnelRouteListener.php
+++ b/src/EventListener/Core/FunnelRouteListener.php
@@ -12,15 +12,10 @@
 
 class FunnelRouteListener implements EventSubscriberInterface
 {
-    protected FunnelDataResolver $funnelDataResolver;
-    protected SignalSubscribeHandler $signalSubscribeHandler;
-
     public function __construct(
-        FunnelDataResolver $funnelDataResolver,
-        SignalSubscribeHandler $signalSubscribeHandler,
+        protected FunnelDataResolver $funnelDataResolver,
+        protected SignalSubscribeHandler $signalSubscribeHandler,
     ) {
-        $this->funnelDataResolver = $funnelDataResolver;
-        $this->signalSubscribeHandler = $signalSubscribeHandler;
     }
 
     public static function getSubscribedEvents(): array
diff --git a/src/FormBuilderBundle/EventListener/Core/MailParamListener.php b/src/EventListener/Core/MailParamListener.php
similarity index 92%
rename from src/FormBuilderBundle/EventListener/Core/MailParamListener.php
rename to src/EventListener/Core/MailParamListener.php
index a33aa86b..4d43e63f 100644
--- a/src/FormBuilderBundle/EventListener/Core/MailParamListener.php
+++ b/src/EventListener/Core/MailParamListener.php
@@ -20,10 +20,6 @@ public function watchEmailParams(MailEvent $event): void
     {
         $mail = $event->getMail();
 
-        if (!$mail instanceof Mail) {
-            return;
-        }
-
         // mail does not have nice way to check existing params
         $params = $mail->getParams();
 
diff --git a/src/FormBuilderBundle/EventListener/Core/RequestListener.php b/src/EventListener/Core/RequestListener.php
similarity index 87%
rename from src/FormBuilderBundle/EventListener/Core/RequestListener.php
rename to src/EventListener/Core/RequestListener.php
index 94f41bed..e2408604 100644
--- a/src/FormBuilderBundle/EventListener/Core/RequestListener.php
+++ b/src/EventListener/Core/RequestListener.php
@@ -19,21 +19,12 @@
 
 class RequestListener implements EventSubscriberInterface
 {
-    protected FrontendFormBuilder $frontendFormBuilder;
-    protected EventDispatcherInterface $eventDispatcher;
-    protected FormSubmissionFinisherInterface $formSubmissionFinisher;
-    protected FormDefinitionManager $formDefinitionManager;
-
     public function __construct(
-        FrontendFormBuilder $frontendFormBuilder,
-        EventDispatcherInterface $eventDispatcher,
-        FormSubmissionFinisherInterface $formSubmissionFinisher,
-        FormDefinitionManager $formDefinitionManager
+        protected FrontendFormBuilder $frontendFormBuilder,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected FormSubmissionFinisherInterface $formSubmissionFinisher,
+        protected FormDefinitionManager $formDefinitionManager
     ) {
-        $this->frontendFormBuilder = $frontendFormBuilder;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->formSubmissionFinisher = $formSubmissionFinisher;
-        $this->formDefinitionManager = $formDefinitionManager;
     }
 
     public static function getSubscribedEvents(): array
@@ -182,7 +173,7 @@ protected function detectFormRuntimeDataInRequest(Request $request, FormDefiniti
         }
 
         if (isset($data['formRuntimeData']) && is_string($data['formRuntimeData'])) {
-            return json_decode($data['formRuntimeData'], true);
+            return json_decode($data['formRuntimeData'], true, 512, JSON_THROW_ON_ERROR);
         }
 
         return null;
diff --git a/src/FormBuilderBundle/EventSubscriber/FormBuilderSubscriber.php b/src/EventSubscriber/FormBuilderSubscriber.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/FormBuilderSubscriber.php
rename to src/EventSubscriber/FormBuilderSubscriber.php
diff --git a/src/FormBuilderBundle/EventSubscriber/SignalStorage/ArraySignalStorage.php b/src/EventSubscriber/SignalStorage/ArraySignalStorage.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/SignalStorage/ArraySignalStorage.php
rename to src/EventSubscriber/SignalStorage/ArraySignalStorage.php
diff --git a/src/FormBuilderBundle/EventSubscriber/SignalStorage/FormDataSignalStorage.php b/src/EventSubscriber/SignalStorage/FormDataSignalStorage.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/SignalStorage/FormDataSignalStorage.php
rename to src/EventSubscriber/SignalStorage/FormDataSignalStorage.php
diff --git a/src/FormBuilderBundle/EventSubscriber/SignalStorage/ProviderAwareStorageInterface.php b/src/EventSubscriber/SignalStorage/ProviderAwareStorageInterface.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/SignalStorage/ProviderAwareStorageInterface.php
rename to src/EventSubscriber/SignalStorage/ProviderAwareStorageInterface.php
diff --git a/src/FormBuilderBundle/EventSubscriber/SignalStorage/SignalStorageInterface.php b/src/EventSubscriber/SignalStorage/SignalStorageInterface.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/SignalStorage/SignalStorageInterface.php
rename to src/EventSubscriber/SignalStorage/SignalStorageInterface.php
diff --git a/src/FormBuilderBundle/EventSubscriber/SignalSubscribeHandler.php b/src/EventSubscriber/SignalSubscribeHandler.php
similarity index 100%
rename from src/FormBuilderBundle/EventSubscriber/SignalSubscribeHandler.php
rename to src/EventSubscriber/SignalSubscribeHandler.php
diff --git a/src/FormBuilderBundle/Exception/OutputWorkflow/GuardChannelException.php b/src/Exception/OutputWorkflow/GuardChannelException.php
similarity index 100%
rename from src/FormBuilderBundle/Exception/OutputWorkflow/GuardChannelException.php
rename to src/Exception/OutputWorkflow/GuardChannelException.php
diff --git a/src/FormBuilderBundle/Exception/OutputWorkflow/GuardException.php b/src/Exception/OutputWorkflow/GuardException.php
similarity index 100%
rename from src/FormBuilderBundle/Exception/OutputWorkflow/GuardException.php
rename to src/Exception/OutputWorkflow/GuardException.php
diff --git a/src/FormBuilderBundle/Exception/OutputWorkflow/GuardOutputWorkflowException.php b/src/Exception/OutputWorkflow/GuardOutputWorkflowException.php
similarity index 100%
rename from src/FormBuilderBundle/Exception/OutputWorkflow/GuardOutputWorkflowException.php
rename to src/Exception/OutputWorkflow/GuardOutputWorkflowException.php
diff --git a/src/FormBuilderBundle/Exception/OutputWorkflow/GuardStackedException.php b/src/Exception/OutputWorkflow/GuardStackedException.php
similarity index 100%
rename from src/FormBuilderBundle/Exception/OutputWorkflow/GuardStackedException.php
rename to src/Exception/OutputWorkflow/GuardStackedException.php
diff --git a/src/FormBuilderBundle/Factory/FormDataFactory.php b/src/Factory/FormDataFactory.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/FormDataFactory.php
rename to src/Factory/FormDataFactory.php
diff --git a/src/FormBuilderBundle/Factory/FormDataFactoryInterface.php b/src/Factory/FormDataFactoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/FormDataFactoryInterface.php
rename to src/Factory/FormDataFactoryInterface.php
diff --git a/src/FormBuilderBundle/Factory/FormDefinitionFactory.php b/src/Factory/FormDefinitionFactory.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/FormDefinitionFactory.php
rename to src/Factory/FormDefinitionFactory.php
diff --git a/src/FormBuilderBundle/Factory/FormDefinitionFactoryInterface.php b/src/Factory/FormDefinitionFactoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/FormDefinitionFactoryInterface.php
rename to src/Factory/FormDefinitionFactoryInterface.php
diff --git a/src/FormBuilderBundle/Factory/ObjectResolverFactory.php b/src/Factory/ObjectResolverFactory.php
similarity index 60%
rename from src/FormBuilderBundle/Factory/ObjectResolverFactory.php
rename to src/Factory/ObjectResolverFactory.php
index b37c54e3..b4d60986 100644
--- a/src/FormBuilderBundle/Factory/ObjectResolverFactory.php
+++ b/src/Factory/ObjectResolverFactory.php
@@ -8,10 +8,12 @@
 use FormBuilderBundle\OutputWorkflow\Channel\Object\NewObjectResolver;
 use FormBuilderBundle\Registry\DynamicObjectResolverRegistry;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ObjectResolverFactory implements ObjectResolverFactoryInterface
 {
     public function __construct(
+        protected TranslatorInterface $translator,
         protected DynamicObjectResolverRegistry $dynamicObjectResolverRegistry,
         protected FormValuesOutputApplierInterface $formValuesOutputApplier,
         protected EventDispatcherInterface $eventDispatcher,
@@ -21,11 +23,25 @@ public function __construct(
 
     public function createForNewObject(array $objectMappingData): NewObjectResolver
     {
-        return new NewObjectResolver($this->formValuesOutputApplier, $this->eventDispatcher, $this->modelFactory, $this->dynamicObjectResolverRegistry, $objectMappingData);
+        return new NewObjectResolver(
+            $this->translator,
+            $this->formValuesOutputApplier,
+            $this->eventDispatcher,
+            $this->modelFactory,
+            $this->dynamicObjectResolverRegistry,
+            $objectMappingData
+        );
     }
 
     public function createForExistingObject(array $objectMappingData): ExistingObjectResolver
     {
-        return new ExistingObjectResolver($this->formValuesOutputApplier, $this->eventDispatcher, $this->modelFactory, $this->dynamicObjectResolverRegistry, $objectMappingData);
+        return new ExistingObjectResolver(
+            $this->translator,
+            $this->formValuesOutputApplier,
+            $this->eventDispatcher,
+            $this->modelFactory,
+            $this->dynamicObjectResolverRegistry,
+            $objectMappingData
+        );
     }
 }
diff --git a/src/FormBuilderBundle/Factory/ObjectResolverFactoryInterface.php b/src/Factory/ObjectResolverFactoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/ObjectResolverFactoryInterface.php
rename to src/Factory/ObjectResolverFactoryInterface.php
diff --git a/src/FormBuilderBundle/Factory/OutputWorkflowFactory.php b/src/Factory/OutputWorkflowFactory.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/OutputWorkflowFactory.php
rename to src/Factory/OutputWorkflowFactory.php
diff --git a/src/FormBuilderBundle/Factory/OutputWorkflowFactoryInterface.php b/src/Factory/OutputWorkflowFactoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Factory/OutputWorkflowFactoryInterface.php
rename to src/Factory/OutputWorkflowFactoryInterface.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementConfigType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementConfigType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementConfigType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Api/DataMappingElementConfigType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/FieldConfigType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Api/FieldConfigType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Api/FieldConfigType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Api/FieldConfigType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/ApiChannelType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/ApiChannelType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/ApiChannelType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/ApiChannelType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php
similarity index 94%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php
index 6ff07ee0..cd175e90 100644
--- a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php
+++ b/src/Form/Admin/Type/OutputWorkflow/Channel/EmailChannelType.php
@@ -23,7 +23,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $builder->add('forcePlainText', CheckboxType::class);
         $builder->add('disableDefaultMailBody', CheckboxType::class);
         $builder->add('disableMailLogging', CheckboxType::class);
-        $builder->add('mailLayoutData', TextType::class);
+        $builder->add('mailLayoutData', CollectionType::class, ['allow_add' => true, 'entry_type' => TextType::class]);
 
         $builder->get('ignoreFields')->addEventListener(
             FormEvents::PRE_SUBMIT, function (FormEvent $event) {
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionCoreConfigType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionCoreConfigType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionCoreConfigType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionCoreConfigType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php
similarity index 86%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php
index 0b3d1d5d..6df2188c 100644
--- a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php
+++ b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionType.php
@@ -11,11 +11,8 @@
 
 class FunnelActionType extends AbstractType
 {
-    protected FunnelActionRegistry $funnelActionRegistry;
-
-    public function __construct(FunnelActionRegistry $funnelActionRegistry)
+    public function __construct(protected FunnelActionRegistry $funnelActionRegistry)
     {
-        $this->funnelActionRegistry = $funnelActionRegistry;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionsCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionsCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionsCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/FunnelActionsCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ChannelActionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ChannelActionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ChannelActionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ChannelActionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/DisabledActionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/DisabledActionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/DisabledActionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/DisabledActionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ReturnToFormActionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ReturnToFormActionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ReturnToFormActionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Action/Type/ReturnToFormActionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayerType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayerType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayerType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php
similarity index 87%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php
index 58126d5c..dfdc87ba 100644
--- a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php
+++ b/src/Form/Admin/Type/OutputWorkflow/Channel/FunnelChannelType.php
@@ -12,11 +12,8 @@
 
 class FunnelChannelType extends AbstractType
 {
-    protected FunnelLayerRegistry $funnelLayerRegistry;
-
-    public function __construct(FunnelLayerRegistry $funnelLayerRegistry)
+    public function __construct(protected FunnelLayerRegistry $funnelLayerRegistry)
     {
-        $this->funnelLayerRegistry = $funnelLayerRegistry;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/FieldConfigType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/FieldConfigType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/FieldConfigType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/FieldConfigType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementConfigType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementConfigType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementConfigType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/ObjectMappingElementConfigType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/FieldCollectionWorkerType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/FieldCollectionWorkerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/FieldCollectionWorkerType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/FieldCollectionWorkerType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/RelationWorkerType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/RelationWorkerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/RelationWorkerType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/RelationWorkerType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/Object/Worker/Validation/ValidationType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/ObjectChannelType.php b/src/Form/Admin/Type/OutputWorkflow/Channel/ObjectChannelType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Channel/ObjectChannelType.php
rename to src/Form/Admin/Type/OutputWorkflow/Channel/ObjectChannelType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/FixedCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Component/FixedCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/FixedCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Component/FixedCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/LocalizedValuesCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/Component/LocalizedValuesCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/LocalizedValuesCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/Component/LocalizedValuesCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php b/src/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php
similarity index 77%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php
rename to src/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php
index 6a60bf97..80a8f18c 100644
--- a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php
+++ b/src/Form/Admin/Type/OutputWorkflow/Component/OutputWorkflowChannelChoiceType.php
@@ -9,11 +9,8 @@
 
 class OutputWorkflowChannelChoiceType extends AbstractType
 {
-    protected OutputWorkflowChannelRegistry $channelRegistry;
-
-    public function __construct(OutputWorkflowChannelRegistry $channelRegistry)
+    public function __construct(protected OutputWorkflowChannelRegistry $channelRegistry)
     {
-        $this->channelRegistry = $channelRegistry;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/PimcoreHrefType.php b/src/Form/Admin/Type/OutputWorkflow/Component/PimcoreHrefType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/Component/PimcoreHrefType.php
rename to src/Form/Admin/Type/OutputWorkflow/Component/PimcoreHrefType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php b/src/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php
similarity index 93%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php
rename to src/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php
index 7a669c6d..d9b9d365 100644
--- a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php
+++ b/src/Form/Admin/Type/OutputWorkflow/OutputWorkflowChannelType.php
@@ -17,11 +17,8 @@
 
 class OutputWorkflowChannelType extends AbstractType
 {
-    protected OutputWorkflowChannelRegistry $channelRegistry;
-
-    public function __construct(OutputWorkflowChannelRegistry $channelRegistry)
+    public function __construct(protected OutputWorkflowChannelRegistry $channelRegistry)
     {
-        $this->channelRegistry = $channelRegistry;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowCollectionType.php b/src/Form/Admin/Type/OutputWorkflow/OutputWorkflowCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowCollectionType.php
rename to src/Form/Admin/Type/OutputWorkflow/OutputWorkflowCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowType.php b/src/Form/Admin/Type/OutputWorkflow/OutputWorkflowType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/OutputWorkflowType.php
rename to src/Form/Admin/Type/OutputWorkflow/OutputWorkflowType.php
diff --git a/src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/SuccessManagementType.php b/src/Form/Admin/Type/OutputWorkflow/SuccessManagementType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Admin/Type/OutputWorkflow/SuccessManagementType.php
rename to src/Form/Admin/Type/OutputWorkflow/SuccessManagementType.php
diff --git a/src/FormBuilderBundle/Form/AdvancedChoiceBuilderInterface.php b/src/Form/AdvancedChoiceBuilderInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/AdvancedChoiceBuilderInterface.php
rename to src/Form/AdvancedChoiceBuilderInterface.php
diff --git a/src/FormBuilderBundle/Form/ChoiceBuilderInterface.php b/src/Form/ChoiceBuilderInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/ChoiceBuilderInterface.php
rename to src/Form/ChoiceBuilderInterface.php
diff --git a/src/FormBuilderBundle/Form/Data/FormData.php b/src/Form/Data/FormData.php
similarity index 86%
rename from src/FormBuilderBundle/Form/Data/FormData.php
rename to src/Form/Data/FormData.php
index 0afb3fdd..271a3a09 100644
--- a/src/FormBuilderBundle/Form/Data/FormData.php
+++ b/src/Form/Data/FormData.php
@@ -7,14 +7,12 @@
 
 class FormData implements FormDataInterface
 {
-    protected FormDefinitionInterface $formDefinition;
-    protected array $data = [];
     protected array $attachments = [];
 
-    public function __construct(FormDefinitionInterface $formDefinition, array $data = [])
-    {
-        $this->formDefinition = $formDefinition;
-        $this->data = $data;
+    public function __construct(
+        protected FormDefinitionInterface $formDefinition,
+        protected array $data = []
+    ) {
     }
 
     public function getFormDefinition(): FormDefinitionInterface
diff --git a/src/FormBuilderBundle/Form/Data/FormDataInterface.php b/src/Form/Data/FormDataInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Data/FormDataInterface.php
rename to src/Form/Data/FormDataInterface.php
diff --git a/src/FormBuilderBundle/Form/DataInjector/DataInjectorInterface.php b/src/Form/DataInjector/DataInjectorInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/DataInjector/DataInjectorInterface.php
rename to src/Form/DataInjector/DataInjectorInterface.php
diff --git a/src/FormBuilderBundle/Form/DataInjector/ExpressionDataInjector.php b/src/Form/DataInjector/ExpressionDataInjector.php
similarity index 100%
rename from src/FormBuilderBundle/Form/DataInjector/ExpressionDataInjector.php
rename to src/Form/DataInjector/ExpressionDataInjector.php
diff --git a/src/FormBuilderBundle/Form/Extension/HelpExtension.php b/src/Form/Extension/HelpExtension.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Extension/HelpExtension.php
rename to src/Form/Extension/HelpExtension.php
diff --git a/src/FormBuilderBundle/Form/FormErrorsSerializer.php b/src/Form/FormErrorsSerializer.php
similarity index 100%
rename from src/FormBuilderBundle/Form/FormErrorsSerializer.php
rename to src/Form/FormErrorsSerializer.php
diff --git a/src/FormBuilderBundle/Form/FormErrorsSerializerInterface.php b/src/Form/FormErrorsSerializerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/FormErrorsSerializerInterface.php
rename to src/Form/FormErrorsSerializerInterface.php
diff --git a/src/FormBuilderBundle/Form/FormValuesInputApplier.php b/src/Form/FormValuesInputApplier.php
similarity index 90%
rename from src/FormBuilderBundle/Form/FormValuesInputApplier.php
rename to src/Form/FormValuesInputApplier.php
index 2df3084d..783147f5 100644
--- a/src/FormBuilderBundle/Form/FormValuesInputApplier.php
+++ b/src/Form/FormValuesInputApplier.php
@@ -13,13 +13,10 @@
 
 class FormValuesInputApplier implements FormValuesInputApplierInterface
 {
-    protected Configuration $configuration;
-    protected InputTransformerRegistry $inputTransformerRegistry;
-
-    public function __construct(Configuration $configuration, InputTransformerRegistry $inputTransformerRegistry)
-    {
-        $this->configuration = $configuration;
-        $this->inputTransformerRegistry = $inputTransformerRegistry;
+    public function __construct(
+        protected Configuration $configuration,
+        protected InputTransformerRegistry $inputTransformerRegistry
+    ) {
     }
 
     public function apply(array $form, FormDefinitionInterface $formDefinition): array
diff --git a/src/FormBuilderBundle/Form/FormValuesInputApplierInterface.php b/src/Form/FormValuesInputApplierInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/FormValuesInputApplierInterface.php
rename to src/Form/FormValuesInputApplierInterface.php
diff --git a/src/FormBuilderBundle/Form/FormValuesOutputApplier.php b/src/Form/FormValuesOutputApplier.php
similarity index 96%
rename from src/FormBuilderBundle/Form/FormValuesOutputApplier.php
rename to src/Form/FormValuesOutputApplier.php
index e46d6814..a9c0fcce 100644
--- a/src/FormBuilderBundle/Form/FormValuesOutputApplier.php
+++ b/src/Form/FormValuesOutputApplier.php
@@ -21,14 +21,12 @@
  */
 class FormValuesOutputApplier implements FormValuesOutputApplierInterface
 {
-    protected Configuration $configuration;
-    protected OutputTransformerRegistry $outputTransformerRegistry;
     protected ?string $channel;
 
-    public function __construct(Configuration $configuration, OutputTransformerRegistry $outputTransformerRegistry)
-    {
-        $this->configuration = $configuration;
-        $this->outputTransformerRegistry = $outputTransformerRegistry;
+    public function __construct(
+        protected Configuration $configuration,
+        protected OutputTransformerRegistry $outputTransformerRegistry
+    ) {
     }
 
     public function applyForChannel(FormInterface $form, array $ignoreFields, string $channel, ?string $locale): array
diff --git a/src/FormBuilderBundle/Form/FormValuesOutputApplierInterface.php b/src/Form/FormValuesOutputApplierInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/FormValuesOutputApplierInterface.php
rename to src/Form/FormValuesOutputApplierInterface.php
diff --git a/src/FormBuilderBundle/Form/RuntimeData/FormRuntimeDataAllocator.php b/src/Form/RuntimeData/FormRuntimeDataAllocator.php
similarity index 82%
rename from src/FormBuilderBundle/Form/RuntimeData/FormRuntimeDataAllocator.php
rename to src/Form/RuntimeData/FormRuntimeDataAllocator.php
index d4f59003..f737e6d9 100644
--- a/src/FormBuilderBundle/Form/RuntimeData/FormRuntimeDataAllocator.php
+++ b/src/Form/RuntimeData/FormRuntimeDataAllocator.php
@@ -7,11 +7,8 @@
 
 class FormRuntimeDataAllocator implements FormRuntimeDataAllocatorInterface
 {
-    protected RuntimeDataProviderRegistry $runtimeDataProviderRegistry;
-
-    public function __construct(RuntimeDataProviderRegistry $runtimeDataProviderRegistry)
+    public function __construct(protected RuntimeDataProviderRegistry $runtimeDataProviderRegistry)
     {
-        $this->runtimeDataProviderRegistry = $runtimeDataProviderRegistry;
     }
 
     public function allocate(FormDefinitionInterface $formDefinition, array $systemRuntimeData): RuntimeDataCollector
diff --git a/src/FormBuilderBundle/Form/RuntimeData/FormRuntimeDataAllocatorInterface.php b/src/Form/RuntimeData/FormRuntimeDataAllocatorInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/RuntimeData/FormRuntimeDataAllocatorInterface.php
rename to src/Form/RuntimeData/FormRuntimeDataAllocatorInterface.php
diff --git a/src/FormBuilderBundle/Form/RuntimeData/Provider/RequestDataProvider.php b/src/Form/RuntimeData/Provider/RequestDataProvider.php
similarity index 100%
rename from src/FormBuilderBundle/Form/RuntimeData/Provider/RequestDataProvider.php
rename to src/Form/RuntimeData/Provider/RequestDataProvider.php
diff --git a/src/FormBuilderBundle/Form/RuntimeData/RuntimeDataCollector.php b/src/Form/RuntimeData/RuntimeDataCollector.php
similarity index 100%
rename from src/FormBuilderBundle/Form/RuntimeData/RuntimeDataCollector.php
rename to src/Form/RuntimeData/RuntimeDataCollector.php
diff --git a/src/FormBuilderBundle/Form/RuntimeData/RuntimeDataProviderInterface.php b/src/Form/RuntimeData/RuntimeDataProviderInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Form/RuntimeData/RuntimeDataProviderInterface.php
rename to src/Form/RuntimeData/RuntimeDataProviderInterface.php
diff --git a/src/FormBuilderBundle/Form/Type/Container/ContainerType.php b/src/Form/Type/Container/ContainerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/Container/ContainerType.php
rename to src/Form/Type/Container/ContainerType.php
diff --git a/src/FormBuilderBundle/Form/Type/Container/FieldSetContainerType.php b/src/Form/Type/Container/FieldSetContainerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/Container/FieldSetContainerType.php
rename to src/Form/Type/Container/FieldSetContainerType.php
diff --git a/src/FormBuilderBundle/Form/Type/Container/RepeaterContainerType.php b/src/Form/Type/Container/RepeaterContainerType.php
similarity index 96%
rename from src/FormBuilderBundle/Form/Type/Container/RepeaterContainerType.php
rename to src/Form/Type/Container/RepeaterContainerType.php
index 85a08c3d..992a52d5 100644
--- a/src/FormBuilderBundle/Form/Type/Container/RepeaterContainerType.php
+++ b/src/Form/Type/Container/RepeaterContainerType.php
@@ -11,15 +11,15 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Pimcore\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class RepeaterContainerType extends AbstractType
 {
     use Traits\ContainerTrait;
 
-    protected Translator $translator;
+    protected TranslatorInterface $translator;
 
-    public function setTranslator(Translator $translator): void
+    public function setTranslator(TranslatorInterface $translator): void
     {
         $this->translator = $translator;
     }
diff --git a/src/FormBuilderBundle/Form/Type/Container/Traits/ContainerTrait.php b/src/Form/Type/Container/Traits/ContainerTrait.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/Container/Traits/ContainerTrait.php
rename to src/Form/Type/Container/Traits/ContainerTrait.php
diff --git a/src/FormBuilderBundle/Form/Type/ContainerCollectionType.php b/src/Form/Type/ContainerCollectionType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/ContainerCollectionType.php
rename to src/Form/Type/ContainerCollectionType.php
diff --git a/src/FormBuilderBundle/Form/Type/DynamicChoiceType.php b/src/Form/Type/DynamicChoiceType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/DynamicChoiceType.php
rename to src/Form/Type/DynamicChoiceType.php
diff --git a/src/FormBuilderBundle/Form/Type/DynamicFormType.php b/src/Form/Type/DynamicFormType.php
similarity index 87%
rename from src/FormBuilderBundle/Form/Type/DynamicFormType.php
rename to src/Form/Type/DynamicFormType.php
index 91612af9..7c7d2909 100644
--- a/src/FormBuilderBundle/Form/Type/DynamicFormType.php
+++ b/src/Form/Type/DynamicFormType.php
@@ -18,15 +18,11 @@
 class DynamicFormType extends AbstractType
 {
     public const EMPTY_RUNTIME_DATA_KEY = 'no-runtime-data';
-    protected CsrfTokenManagerInterface $defaultTokenManager;
-    protected Configuration $configuration;
 
     public function __construct(
-        CsrfTokenManagerInterface $defaultTokenManager,
-        Configuration $configuration
+        protected CsrfTokenManagerInterface $defaultTokenManager,
+        protected Configuration $configuration
     ) {
-        $this->defaultTokenManager = $defaultTokenManager;
-        $this->configuration = $configuration;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -56,16 +52,16 @@ function ($conditionalLogic) {
                 return is_array($conditionalLogic) ? json_encode($conditionalLogic) : null;
             },
             function ($conditionalLogic) {
-                return empty($conditionalLogic) ? null : json_decode($conditionalLogic, true);
+                return empty($conditionalLogic) ? null : json_decode($conditionalLogic, true, 512, JSON_THROW_ON_ERROR);
             }
         ));
 
         $builder->get('formRuntimeData')->addModelTransformer(new CallbackTransformer(
             function ($runtimeData) {
-                return is_array($runtimeData) ? json_encode($runtimeData) : null;
+                return is_array($runtimeData) ? json_encode($runtimeData, JSON_THROW_ON_ERROR) : null;
             },
             function ($runtimeData) {
-                return empty($runtimeData) ? null : json_decode($runtimeData, true);
+                return empty($runtimeData) ? null : json_decode($runtimeData, true, 512, JSON_THROW_ON_ERROR);
             }
         ));
     }
@@ -74,11 +70,7 @@ protected function addRuntimeData(FormBuilderInterface $builder, array $options)
     {
         $runtimeData = $options['runtime_data'] ?? null;
 
-        if (isset($runtimeData['email'], $runtimeData['email']['_deprecated_note'])) {
-            unset($runtimeData['email']['_deprecated_note']);
-        }
-
-        $token = is_array($runtimeData) ? md5(json_encode($runtimeData)) : md5(self::EMPTY_RUNTIME_DATA_KEY);
+        $token = is_array($runtimeData) ? md5(json_encode($runtimeData, JSON_THROW_ON_ERROR)) : md5(self::EMPTY_RUNTIME_DATA_KEY);
 
         $builder
             ->add('formRuntimeData', HiddenType::class, [
diff --git a/src/FormBuilderBundle/Form/Type/DynamicMultiFile/DropZoneType.php b/src/Form/Type/DynamicMultiFile/DropZoneType.php
similarity index 95%
rename from src/FormBuilderBundle/Form/Type/DynamicMultiFile/DropZoneType.php
rename to src/Form/Type/DynamicMultiFile/DropZoneType.php
index 650b5827..76b3af67 100644
--- a/src/FormBuilderBundle/Form/Type/DynamicMultiFile/DropZoneType.php
+++ b/src/Form/Type/DynamicMultiFile/DropZoneType.php
@@ -7,15 +7,12 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Pimcore\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DropZoneType extends AbstractType
 {
-    protected Translator $translator;
-
-    public function __construct(Translator $translator)
+    public function __construct(protected TranslatorInterface $translator)
     {
-        $this->translator = $translator;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Form/Type/DynamicMultiFile/FineUploaderType.php b/src/Form/Type/DynamicMultiFile/FineUploaderType.php
similarity index 96%
rename from src/FormBuilderBundle/Form/Type/DynamicMultiFile/FineUploaderType.php
rename to src/Form/Type/DynamicMultiFile/FineUploaderType.php
index 29cef1b6..5f733c99 100644
--- a/src/FormBuilderBundle/Form/Type/DynamicMultiFile/FineUploaderType.php
+++ b/src/Form/Type/DynamicMultiFile/FineUploaderType.php
@@ -7,15 +7,12 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Pimcore\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FineUploaderType extends AbstractType
 {
-    protected Translator $translator;
-
-    public function __construct(Translator $translator)
+    public function __construct(protected TranslatorInterface $translator)
     {
-        $this->translator = $translator;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Form/Type/DynamicMultiFileType.php b/src/Form/Type/DynamicMultiFileType.php
similarity index 81%
rename from src/FormBuilderBundle/Form/Type/DynamicMultiFileType.php
rename to src/Form/Type/DynamicMultiFileType.php
index 565b8790..5fe1666a 100644
--- a/src/FormBuilderBundle/Form/Type/DynamicMultiFileType.php
+++ b/src/Form/Type/DynamicMultiFileType.php
@@ -13,18 +13,11 @@
 
 class DynamicMultiFileType extends AbstractType
 {
-    protected FormFactoryInterface $formFactory;
-    protected Configuration $configuration;
-    protected DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry;
-
     public function __construct(
-        FormFactoryInterface $formFactory,
-        Configuration $configuration,
-        DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry
+        protected FormFactoryInterface $formFactory,
+        protected Configuration $configuration,
+        protected DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry
     ) {
-        $this->formFactory = $formFactory;
-        $this->configuration = $configuration;
-        $this->dynamicMultiFileAdapterRegistry = $dynamicMultiFileAdapterRegistry;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Form/Type/HoneypotType.php b/src/Form/Type/HoneypotType.php
similarity index 92%
rename from src/FormBuilderBundle/Form/Type/HoneypotType.php
rename to src/Form/Type/HoneypotType.php
index d9207eb4..38d9802a 100644
--- a/src/FormBuilderBundle/Form/Type/HoneypotType.php
+++ b/src/Form/Type/HoneypotType.php
@@ -11,11 +11,8 @@
 
 class HoneypotType extends AbstractType
 {
-    protected Configuration $configuration;
-
-    public function __construct(Configuration $configuration)
+    public function __construct(protected Configuration $configuration)
     {
-        $this->configuration = $configuration;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Form/Type/HtmlTagType.php b/src/Form/Type/HtmlTagType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/HtmlTagType.php
rename to src/Form/Type/HtmlTagType.php
diff --git a/src/FormBuilderBundle/Form/Type/LayerType.php b/src/Form/Type/LayerType.php
similarity index 100%
rename from src/FormBuilderBundle/Form/Type/LayerType.php
rename to src/Form/Type/LayerType.php
diff --git a/src/FormBuilderBundle/Form/Type/Recaptcha3Type.php b/src/Form/Type/Recaptcha3Type.php
similarity index 89%
rename from src/FormBuilderBundle/Form/Type/Recaptcha3Type.php
rename to src/Form/Type/Recaptcha3Type.php
index 5d4de0cc..545eb2bf 100644
--- a/src/FormBuilderBundle/Form/Type/Recaptcha3Type.php
+++ b/src/Form/Type/Recaptcha3Type.php
@@ -12,11 +12,8 @@
 
 final class Recaptcha3Type extends AbstractType
 {
-    protected Configuration $configuration;
-
-    public function __construct(Configuration $configuration)
+    public function __construct(protected Configuration $configuration)
     {
-        $this->configuration = $configuration;
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options): void
diff --git a/src/FormBuilderBundle/Form/Type/SnippetType.php b/src/Form/Type/SnippetType.php
similarity index 85%
rename from src/FormBuilderBundle/Form/Type/SnippetType.php
rename to src/Form/Type/SnippetType.php
index b5d5b69c..7acd1190 100644
--- a/src/FormBuilderBundle/Form/Type/SnippetType.php
+++ b/src/Form/Type/SnippetType.php
@@ -12,13 +12,10 @@
 
 class SnippetType extends AbstractType
 {
-    protected RequestStack $requestStack;
-    protected LocaleDataMapper $localeDataMapper;
-
-    public function __construct(RequestStack $requestStack, LocaleDataMapper $localeDataMapper)
-    {
-        $this->requestStack = $requestStack;
-        $this->localeDataMapper = $localeDataMapper;
+    public function __construct(
+        protected RequestStack $requestStack,
+        protected LocaleDataMapper $localeDataMapper
+    ){
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle.php b/src/FormBuilderBundle.php
new file mode 100644
index 00000000..d9c1f4e2
--- /dev/null
+++ b/src/FormBuilderBundle.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace FormBuilderBundle;
+
+use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
+use Doctrine\DBAL\Types\Type;
+use FormBuilderBundle\DependencyInjection\CompilerPass\ApiProviderPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\ChoiceBuilderPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\DataInjectionPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\DispatcherPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\DynamicMultiFileAdapterPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\DynamicObjectResolverPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\FieldTransformerPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\MailEditorWidgetPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\OptionsTransformerPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\OutputInputTransformerPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowChannelPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowFunnelActionPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\OutputWorkflowFunnelLayerPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\RuntimeDataProviderPass;
+use FormBuilderBundle\DependencyInjection\CompilerPass\StorageProviderPass;
+use FormBuilderBundle\Doctrine\Type\FormBuilderFieldsType;
+use FormBuilderBundle\Factory\FormDefinitionFactoryInterface;
+use FormBuilderBundle\Tool\Install;
+use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
+use Pimcore\Extension\Bundle\Traits\PackageVersionTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class FormBuilderBundle extends AbstractPimcoreBundle
+{
+    use PackageVersionTrait;
+
+    public const PACKAGE_NAME = 'dachcom-digital/formbuilder';
+
+    public function boot(): void
+    {
+        $this->addDBALTypes();
+    }
+
+    private function addDBALTypes(): void
+    {
+        if (Type::hasType('form_builder_fields')) {
+            return;
+        }
+
+        Type::addType('form_builder_fields', FormBuilderFieldsType::class);
+
+        /** @var FormBuilderFieldsType $formBuilderFieldsType */
+        $formBuilderFieldsType = Type::getType('form_builder_fields');
+        $formBuilderFieldsType->setFormDefinitionFactory($this->container->get(FormDefinitionFactoryInterface::class));
+    }
+
+    public function build(ContainerBuilder $container): void
+    {
+        parent::build($container);
+
+        $this->configureDoctrineExtension($container);
+
+        $container->addCompilerPass(new OptionsTransformerPass());
+        $container->addCompilerPass(new DispatcherPass());
+        $container->addCompilerPass(new ChoiceBuilderPass());
+        $container->addCompilerPass(new MailEditorWidgetPass());
+        $container->addCompilerPass(new OutputInputTransformerPass());
+        $container->addCompilerPass(new OutputWorkflowChannelPass());
+        $container->addCompilerPass(new OutputWorkflowFunnelLayerPass());
+        $container->addCompilerPass(new OutputWorkflowFunnelActionPass());
+        $container->addCompilerPass(new DynamicObjectResolverPass());
+        $container->addCompilerPass(new RuntimeDataProviderPass());
+        $container->addCompilerPass(new DynamicMultiFileAdapterPass());
+        $container->addCompilerPass(new ApiProviderPass());
+        $container->addCompilerPass(new FieldTransformerPass());
+        $container->addCompilerPass(new StorageProviderPass());
+        $container->addCompilerPass(new DataInjectionPass());
+    }
+
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
+
+    public function getInstaller(): Install
+    {
+        return $this->container->get(Install::class);
+    }
+
+    protected function getComposerPackageName(): string
+    {
+        return self::PACKAGE_NAME;
+    }
+
+    protected function configureDoctrineExtension(ContainerBuilder $container): void
+    {
+        $container->addCompilerPass(
+            DoctrineOrmMappingsPass::createYamlMappingDriver(
+                [$this->getNameSpacePath() => $this->getNamespaceName()],
+                ['form_builder.persistence.doctrine.manager'],
+                'form_builder.persistence.doctrine.enabled'
+            )
+        );
+    }
+
+    protected function getNamespaceName(): string
+    {
+        return 'FormBuilderBundle\Model';
+    }
+
+    protected function getNameSpacePath(): string
+    {
+        return sprintf(
+            '%s/config/doctrine/%s',
+            $this->getPath(),
+            'model'
+        );
+    }
+}
diff --git a/src/FormBuilderBundle/MailEditor/Parser/PlaceholderParser.php b/src/FormBuilderBundle/MailEditor/Parser/PlaceholderParser.php
deleted file mode 100644
index 2e6b35f5..00000000
--- a/src/FormBuilderBundle/MailEditor/Parser/PlaceholderParser.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace FormBuilderBundle\MailEditor\Parser;
-
-use FormBuilderBundle\Registry\MailEditorWidgetRegistry;
-use Symfony\Component\Form\FormInterface;
-
-class PlaceholderParser implements PlaceholderParserInterface
-{
-    protected array $outputData;
-    protected FormInterface $form;
-    protected MailEditorWidgetRegistry $mailEditorWidgetRegistry;
-
-    public function __construct(MailEditorWidgetRegistry $mailEditorWidgetRegistry)
-    {
-        $this->mailEditorWidgetRegistry = $mailEditorWidgetRegistry;
-    }
-
-    public function replacePlaceholderWithOutputData(string $layout, FormInterface $form, array $outputData): string
-    {
-        $this->outputData = $outputData;
-        $this->form = $form;
-
-        return preg_replace_callback($this->getPlaceholderRegex(), [$this, 'parseSquareBracketsTag'], $layout);
-    }
-
-    /**
-     * @throws \Exception
-     */
-    protected function parseSquareBracketsTag(array $tag): ?string
-    {
-        $type = $tag[1];
-        $config = $this->parseSquareBracketsAttributes($tag[2]);
-
-        if (!$this->mailEditorWidgetRegistry->has($type)) {
-            return null;
-        }
-
-        $widget = $this->mailEditorWidgetRegistry->get($type);
-
-        // add field value to widget.
-        if (isset($config['sub-type'], $this->outputData[$config['sub-type']])) {
-            $config['outputData'] = $this->outputData[$config['sub-type']];
-        }
-
-        $cleanConfig = [
-            'form' => $this->form
-        ];
-
-        foreach ($config as $key => $value) {
-            if ($value === 'true' || $value === 'false') {
-                $value = $value === 'true';
-            }
-
-            $cleanConfig[$key] = $value;
-        }
-
-        return $widget->getValueForOutput($cleanConfig);
-    }
-
-    protected function parseSquareBracketsAttributes(string $text): array
-    {
-        $attributes = [];
-        $pattern = $this->getSquareBracketsAttributeRegex();
-        $text = preg_replace('/[\x{00a0}\x{200b}]+/u', ' ', $text);
-        if (preg_match_all($pattern, $text, $match, PREG_SET_ORDER)) {
-            foreach ($match as $m) {
-                if (!empty($m[1])) {
-                    $attributes[strtolower($m[1])] = stripcslashes($m[2]);
-                } elseif (!empty($m[3])) {
-                    $attributes[strtolower($m[3])] = stripcslashes($m[4]);
-                } elseif (!empty($m[5])) {
-                    $attributes[strtolower($m[5])] = stripcslashes($m[6]);
-                } elseif (isset($m[7]) && strlen($m[7])) {
-                    $attributes[] = stripcslashes($m[7]);
-                } elseif (isset($m[8])) {
-                    $attributes[] = stripcslashes($m[8]);
-                }
-            }
-            foreach ($attributes as &$value) {
-                if (str_contains($value, '<')) {
-                    if (preg_match('/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value) !== 1) {
-                        $value = '';
-                    }
-                }
-            }
-        } else {
-            $attributes = [ltrim($text)];
-        }
-
-        return $attributes;
-    }
-
-    protected function getSquareBracketsAttributeRegex(): string
-    {
-        return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
-    }
-
-    protected function getPlaceholderRegex(): string
-    {
-        $allowedRex = implode('|', $this->mailEditorWidgetRegistry->getAllIdentifier());
-
-        return '/\\[\\[(' . $allowedRex . ')(.*?)\\]\\]/';
-    }
-}
diff --git a/src/FormBuilderBundle/MailEditor/Widget/FormFieldWidget.php b/src/FormBuilderBundle/MailEditor/Widget/FormFieldWidget.php
deleted file mode 100644
index 922b4e21..00000000
--- a/src/FormBuilderBundle/MailEditor/Widget/FormFieldWidget.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-namespace FormBuilderBundle\MailEditor\Widget;
-
-use FormBuilderBundle\Form\FormValuesOutputApplierInterface;
-
-class FormFieldWidget implements MailEditorWidgetInterface, MailEditorFieldDataWidgetInterface
-{
-    public function getWidgetGroupName(): string
-    {
-        return 'form_builder.mail_editor.widget_provider.form_fields';
-    }
-
-    public function getSubTypeByField(array $field): string
-    {
-        return $field['name'];
-    }
-
-    public function getWidgetIdentifierByField(string $widgetType, array $field): string
-    {
-        return sprintf('%s_%s', $widgetType, $field['type']);
-    }
-
-    public function getWidgetLabelByField(array $field): string
-    {
-        return $field['display_name'];
-    }
-
-    public function getWidgetConfigByField(array $field): array
-    {
-        return [
-            'show_label' => [
-                'type'         => 'checkbox',
-                'defaultValue' => true,
-                'label'        => 'form_builder.mail_editor.widget_provider.form_fields.show_labels'
-            ],
-        ];
-    }
-
-    public function getValueForOutput(array $config): string
-    {
-        $renderLabels = !isset($config['show_label']) || $config['show_label'] === true;
-
-        $outputData = $config['outputData'] ?? null;
-        $fieldType = $outputData['field_type'] ?? null;
-
-        if (!is_array($outputData)) {
-            return '';
-        }
-
-        $fieldValue = '';
-        if ($fieldType === FormValuesOutputApplierInterface::FIELD_TYPE_CONTAINER) {
-            $fieldValue .= $this->parseContainerField($outputData, $renderLabels);
-        } else {
-            $fieldValue .= $this->parseSimpleField($outputData, $renderLabels);
-        }
-
-        return $fieldValue;
-    }
-
-    protected function parseContainerField(array $outputData, bool $renderLabels): string
-    {
-        $fieldValue = '';
-
-        $label = $outputData['label'];
-        $blockLabel = $outputData['block_label'];
-
-        if (!is_array($outputData['fields'])) {
-            return $fieldValue;
-        }
-
-        if ($renderLabels === true) {
-            $fieldValue .= !empty($label) ? sprintf('%s:<br>', $label) : '';
-        }
-
-        foreach ($outputData['fields'] as $blockIndex => $subFieldCollection) {
-            $fieldValue .= !empty($blockLabel) ? sprintf('%s:<br>', $blockLabel) : '';
-            foreach ($subFieldCollection as $subFieldOutputData) {
-                $subFieldType = $subFieldOutputData['field_type'];
-                if ($subFieldType === FormValuesOutputApplierInterface::FIELD_TYPE_CONTAINER) {
-                    $fieldValue .= $this->parseContainerField($subFieldOutputData, $renderLabels);
-                } else {
-                    // currently we need to force subfields labels in container
-                    // since we have no options to define their states.
-                    $fieldValue .= $this->parseSimpleField($subFieldOutputData, true);
-                    $fieldValue .= '<br>';
-                }
-            }
-
-            if ($blockIndex + 1 !== count($outputData['fields'])) {
-                $fieldValue .= '<br>';
-            }
-        }
-
-        return $fieldValue;
-    }
-
-    protected function parseSimpleField(array $outputData, bool $renderLabels): string
-    {
-        $fieldValue = '';
-
-        $label = $outputData['label'];
-        if ($renderLabels === true) {
-            $fieldValue .= !empty($label) ? sprintf('%s: ', $label) : '';
-        }
-
-        $fieldValue .= $this->parseFieldValue($outputData['value']);
-
-        return $fieldValue;
-    }
-
-    protected function parseFieldValue(array|string $fieldValue): string
-    {
-        if (is_array($fieldValue)) {
-            return implode(', ', $fieldValue);
-        }
-
-        return $fieldValue;
-    }
-
-    public function getWidgetLabel(): string
-    {
-        throw new \RuntimeException('"getWidgetLabel" is not allowed within implemented MailEditorFieldDataWidgetInterface');
-    }
-
-    public function getWidgetConfig(): array
-    {
-        throw new \RuntimeException('"getWidgetConfig" is not allowed within implemented MailEditorFieldDataWidgetInterface');
-    }
-}
diff --git a/src/FormBuilderBundle/Migrations/Version20211011171530.php b/src/FormBuilderBundle/Migrations/Version20211011171530.php
deleted file mode 100644
index 14828a08..00000000
--- a/src/FormBuilderBundle/Migrations/Version20211011171530.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace FormBuilderBundle\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-use Doctrine\Migrations\Exception\MigrationNotExecuted;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Yaml\Yaml;
-
-final class Version20211011171530 extends AbstractMigration
-{
-    public function up(Schema $schema): void
-    {
-        if (!$schema->hasTable('formbuilder_forms')) {
-            throw new MigrationNotExecuted('Table formbuilder_forms is missing');
-        }
-
-        $table = $schema->getTable('formbuilder_forms');
-
-        if (!$table->hasColumn('configuration')) {
-            $this->addSql('ALTER TABLE formbuilder_forms ADD configuration LONGTEXT DEFAULT NULL COMMENT "(DC2Type:object)"');
-        }
-
-        if (!$table->hasColumn('conditionalLogic')) {
-            $this->addSql('ALTER TABLE formbuilder_forms ADD conditionalLogic LONGTEXT DEFAULT NULL COMMENT "(DC2Type:object)"');
-        }
-
-        if (!$table->hasColumn('fields')) {
-            $this->addSql('ALTER TABLE formbuilder_forms ADD fields LONGTEXT DEFAULT NULL COMMENT "(DC2Type:form_builder_fields)"');
-        }
-
-        $legacyFormStoragePath = PIMCORE_PRIVATE_VAR . '/bundles/FormBuilderBundle/forms';
-
-        if (!is_dir($legacyFormStoragePath)) {
-            return;
-        }
-
-        $finder = new Finder();
-
-        foreach ($finder->in($legacyFormStoragePath)->files()->name('*.yml') as $configFile) {
-
-            $data = Yaml::parse($configFile->getContents());
-
-            $fileNameData = explode('_', $configFile->getFilename());
-
-            if (count($fileNameData) !== 2) {
-                $this->write(sprintf('Cannot migrate "%s", form definition id not found', $configFile->getFilename()));
-                continue;
-            }
-
-            $formDefinitionId = (int) $fileNameData[1];
-
-            $this->write(sprintf('Migrating Form "%s"...', $configFile->getFilename()));
-
-            $configuration = $data['config'] ?? [];
-            $conditionalLogic = $data['conditional_logic'] ?? [];
-            $fields = $data['fields'] ?? [];
-
-            $fixedFields = $this->ensureSymfony5Compatibility($fields);
-
-            $this->addSql(sprintf('UPDATE formbuilder_forms SET `configuration` = "%s" WHERE `id` = %d', addslashes(serialize($configuration)), $formDefinitionId));
-            $this->addSql(sprintf('UPDATE formbuilder_forms SET `conditionalLogic` = "%s" WHERE `id` = %d', addslashes(serialize($conditionalLogic)), $formDefinitionId));
-            $this->addSql(sprintf('UPDATE formbuilder_forms SET `fields` = "%s" WHERE `id` = %d', addslashes(serialize($fixedFields)), $formDefinitionId));
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        // disabled
-    }
-
-    private function ensureSymfony5Compatibility(array $fields): array
-    {
-        $fixedFields = [];
-        foreach ($fields as $field) {
-            if ($field['type'] === 'choice') {
-                $this->fixChoiceField($field);
-            }
-
-            if (isset($field['constraints'])) {
-                $this->fixConstraints($field);
-            }
-
-            $fixedFields[] = $field;
-        }
-
-        return $fixedFields;
-    }
-
-    private function fixChoiceField(array &$field): void
-    {
-        if (array_key_exists('choice_attr', $field['options'])) {
-            return;
-        }
-
-        $field['options']['choice_attr'] = [];
-    }
-
-    private function fixConstraints(array &$field): void
-    {
-        for ($i = 0; $i < count($field['constraints']); $i++) {
-
-            if ($field['constraints'][$i]['type'] !== 'email') {
-                continue;
-            }
-
-            unset($field['constraints'][$i]['config']['checkMX'], $field['constraints'][$i]['config']['checkHost']);
-        }
-    }
-}
diff --git a/src/FormBuilderBundle/Migrations/Version20211208110858.php b/src/FormBuilderBundle/Migrations/Version20211208110858.php
deleted file mode 100644
index a67543ab..00000000
--- a/src/FormBuilderBundle/Migrations/Version20211208110858.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace FormBuilderBundle\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-use FormBuilderBundle\Tool\Install;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-class Version20211208110858 extends AbstractMigration implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function doesSqlMigrations(): bool
-    {
-        return false;
-    }
-
-    public function up(Schema $schema): void
-    {
-        $installer = $this->container->get(Install::class);
-        $installer->updateTranslations();
-    }
-
-    public function down(Schema $schema): void
-    {
-        // nothing to do
-    }
-}
diff --git a/src/FormBuilderBundle/Migrations/Version20221121130120.php b/src/FormBuilderBundle/Migrations/Version20221121130120.php
deleted file mode 100644
index ab2fb925..00000000
--- a/src/FormBuilderBundle/Migrations/Version20221121130120.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace FormBuilderBundle\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-use FormBuilderBundle\Tool\Install;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-final class Version20221121130120 extends AbstractMigration implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $installer = $this->container->get(Install::class);
-        $installer->updateTranslations();
-
-        if ($schema->hasTable('formbuilder_output_workflow')) {
-            $table = $schema->getTable('formbuilder_output_workflow');
-            if (!$table->hasColumn('funnel_workflow')) {
-                $this->addSql('ALTER TABLE `formbuilder_output_workflow` ADD `funnel_workflow` TINYINT(1) NOT NULL;');
-            }
-        }
-
-        if ($schema->hasTable('formbuilder_output_workflow_channel')) {
-
-            $table = $schema->getTable('formbuilder_output_workflow_channel');
-
-            if (!$table->hasColumn('funnel_actions')) {
-                $this->addSql('ALTER TABLE `formbuilder_output_workflow_channel` ADD `funnel_actions` LONGTEXT DEFAULT NULL COMMENT "(DC2Type:object)";');
-            }
-
-            if (!$table->hasColumn('name')) {
-                $this->addSql('ALTER TABLE `formbuilder_output_workflow_channel` ADD `name` VARCHAR(190) NOT NULL;');
-                $this->addSql('UPDATE `formbuilder_output_workflow_channel` SET `name` = (SELECT UUID());');
-                $this->addSql('CREATE UNIQUE INDEX `ow_name` ON `formbuilder_output_workflow_channel` (`output_workflow`, `name`);');
-            }
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        // nothing to do
-    }
-}
diff --git a/src/FormBuilderBundle/Migrations/Version20230303094642.php b/src/FormBuilderBundle/Migrations/Version20230303094642.php
deleted file mode 100644
index 3c9679fc..00000000
--- a/src/FormBuilderBundle/Migrations/Version20230303094642.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FormBuilderBundle\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-use FormBuilderBundle\Tool\Install;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-final class Version20230303094642 extends AbstractMigration implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function doesSqlMigrations(): bool
-    {
-        return false;
-    }
-
-    public function up(Schema $schema): void
-    {
-        $installer = $this->container->get(Install::class);
-        $installer->updateTranslations();
-    }
-
-    public function down(Schema $schema): void
-    {
-        // nothing to do
-    }
-}
diff --git a/src/FormBuilderBundle/Migrations/Version20230515072503.php b/src/FormBuilderBundle/Migrations/Version20230515072503.php
deleted file mode 100644
index 74a21d87..00000000
--- a/src/FormBuilderBundle/Migrations/Version20230515072503.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FormBuilderBundle\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-use Doctrine\ORM\EntityRepository;
-use FormBuilderBundle\Model\OutputWorkflowChannel;
-use Pimcore\Model\DataObject;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-final class Version20230515072503 extends AbstractMigration implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function doesSqlMigrations(): bool
-    {
-        return false;
-    }
-
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $em = $this->container->get('doctrine.orm.entity_manager');
-
-        /** @var EntityRepository $repository */
-        $repository = $em->getRepository(OutputWorkflowChannel::class);
-
-        /** @var OutputWorkflowChannel $channel */
-        foreach ($repository->findAll() as $channel) {
-
-            if ($channel->getType() !== 'object') {
-                continue;
-            }
-
-            $this->write(sprintf('Migrate object output channel %d', $channel->getId()));
-            $channel->setConfiguration($this->parseLegacyDynamicObjectResolver($channel->getConfiguration()));
-            $em->persist($channel);
-        }
-
-        $em->flush();
-    }
-
-    public function down(Schema $schema): void
-    {
-        // nothing to do
-    }
-
-    protected function parseLegacyDynamicObjectResolver(array $configuration): array
-    {
-        if (!array_key_exists('dynamicObjectResolver', $configuration)) {
-            return $configuration;
-        }
-
-        // already migrated
-        if (array_key_exists('dynamicObjectResolverClass', $configuration)) {
-            return $configuration;
-        }
-
-        $dynamicObjectResolverClass = null;
-        if (!empty($configuration['dynamicObjectResolver'])) {
-            $resolvingObject = $configuration['resolvingObject'] ?? null;
-            if (is_array($resolvingObject)) {
-                $object = DataObject::getById($resolvingObject['id']);
-                $dynamicObjectResolverClass = $object instanceof DataObject\Concrete ? $object->getClassName() : null;
-            }
-        }
-
-        if ($dynamicObjectResolverClass === null) {
-            unset($configuration['dynamicObjectResolver'], $configuration['resolvingObject']);
-
-            return $configuration;
-        }
-
-        $configuration['dynamicObjectResolverClass'] = $dynamicObjectResolverClass;
-        unset($configuration['resolvingObject']);
-
-        return $configuration;
-    }
-}
diff --git a/src/FormBuilderBundle/Resources/config/services.yml b/src/FormBuilderBundle/Resources/config/services.yml
deleted file mode 100644
index 2c1c6ddf..00000000
--- a/src/FormBuilderBundle/Resources/config/services.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-imports:
-    - { resource: services/conditional_logic/*.yml }
-    - { resource: services/mail_editor/*.yml }
-    - { resource: services/output_workflow/*.yml }
-    - { resource: services/forms/*.yml }
-    - { resource: services/transformer/*.yml }
-    - { resource: services/*.yml }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/config/services/mail_editor/config.yml b/src/FormBuilderBundle/Resources/config/services/mail_editor/config.yml
deleted file mode 100644
index eb931d4b..00000000
--- a/src/FormBuilderBundle/Resources/config/services/mail_editor/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-services:
-
-    _defaults:
-        autowire: true
-        autoconfigure: true
-        public: true
-
-    FormBuilderBundle\Registry\MailEditorWidgetRegistry: ~
-
-    FormBuilderBundle\MailEditor\Parser\PlaceholderParser: ~
-    FormBuilderBundle\MailEditor\Parser\PlaceholderParserInterface: '@FormBuilderBundle\MailEditor\Parser\PlaceholderParser'
diff --git a/src/FormBuilderBundle/Resources/config/types/field_types.yml b/src/FormBuilderBundle/Resources/config/types/field_types.yml
deleted file mode 100644
index 2618b08b..00000000
--- a/src/FormBuilderBundle/Resources/config/types/field_types.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
-    - { resource: type/*.yml }
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/dialogs/placeholder.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/dialogs/placeholder.js
deleted file mode 100644
index bfd92299..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/dialogs/placeholder.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-CKEDITOR.dialog.add('formmaileditor', function (editor) {
-    var generalLabel = editor.lang.common.generalTab,
-        validNameRegex = /^[^\[\]<>]+$/;
-
-    return {
-        title: 'Configuration',
-        minWidth: 300,
-        minHeight: 80,
-        contents: [
-            {
-                id: 'info',
-                label: generalLabel,
-                title: generalLabel,
-                elements: [
-                    {
-                        id: 'attribute',
-                        type: 'text',
-                        label: 'Attribute',
-                        required: true,
-                        validate: CKEDITOR.dialog.validate.regex(validNameRegex, 'invalid'),
-                        setup: function (widget) {
-                            this.setValue(widget.data.attribute);
-                            this.disable();
-                        },
-                        commit: function (widget) {
-                            widget.setData('attribute', this.getValue());
-                        }
-                    }
-                ]
-            }
-        ]
-    };
-});
\ No newline at end of file
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/plugin.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/plugin.js
deleted file mode 100644
index 9128ef14..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/formmaileditor/plugin.js
+++ /dev/null
@@ -1,252 +0,0 @@
-(function () {
-    CKEDITOR.plugins.add('formmaileditor', {
-        requires: 'widget',
-
-        onLoad: function () {
-            CKEDITOR.addCss('.fme-placeholder{background-color:#ff0}');
-        },
-
-        init: function (editor) {
-
-            CKEDITOR.dialog.add('formmaileditor', '/bundles/formbuilder/js/extjs/ckeditor/formmaileditor/dialogs/placeholder.js');
-
-            editor.widgets.add('formmaileditor', {
-
-                dialog: 'formmaileditor',
-                template: '<span class="fme-placeholder">[[]]</span>',
-                pathName: 'formmaileditor',
-
-                init: function () {
-
-                    var attribute = this.element.getText().slice(2, -2),
-                        typeData = attribute.split(' ');
-                    var subType = null,
-                        subTypeData = / sub-type="([^"]*)"/g.exec(attribute);
-
-                    if (subTypeData !== null && subTypeData[1] !== undefined) {
-                        subType = subTypeData[1];
-                    }
-
-                    this.setData('attribute', attribute);
-                    this.setData('type', typeData[0]);
-                    this.setData('subType', subType);
-                },
-
-                data: function () {
-                    var type = this.data.type,
-                        subType = this.data.subType;
-
-                    if (subType !== null) {
-                        subType = ' sub-type="' + subType + '"';
-                    } else {
-                        subType = '';
-                    }
-
-                    var attributes = '';
-                    if (this.data.hasOwnProperty('additionalData')) {
-                        Object.keys(this.data.additionalData).forEach(function (key) {
-                            attributes += (' ' + key + '="' + this.data.additionalData[key] + '"');
-                        }.bind(this));
-                        this.element.setText('[[' + type + subType + attributes + ']]');
-                    } else {
-                        this.element.setText('[[' + this.data.attribute + ']]');
-                    }
-                },
-
-                downcast: function (el) {
-
-                    var attributes = '',
-                        type = this.data.type,
-                        subType = this.data.subType;
-
-                    if (subType !== null) {
-                        subType = ' sub-type="' + subType + '"';
-                    } else {
-                        subType = '';
-                    }
-
-                    if (this.data.hasOwnProperty('additionalData')) {
-                        Object.keys(this.data.additionalData).forEach(function (key) {
-                            attributes += (' ' + key + '="' + this.data.additionalData[key] + '"');
-                        }.bind(this));
-                        return new CKEDITOR.htmlParser.text('[[' + type + subType + attributes + ']]');
-                    } else {
-                        return new CKEDITOR.htmlParser.text('[[' + this.data.attribute + ']]');
-                    }
-                },
-
-                getLabel: function () {
-                    return this.editor.lang.widget.label.replace(/%1/, this.data.attribute + ' ' + this.pathName);
-                }
-            });
-
-            editor.on('paste', function (evt) {
-
-                var renderedSubType,
-                    mailEditorWidget;
-
-                mailEditorWidget = evt.data.dataTransfer.getData('mail_editor_widget');
-
-                if (!mailEditorWidget) {
-                    return;
-                }
-
-                renderedSubType = mailEditorWidget.subType !== 'null' ? (' sub-type="' + mailEditorWidget.subType + '"') : '';
-                evt.data.dataValue = '<span class="fme-placeholder">[[' + mailEditorWidget.type + renderedSubType + ']]</span>';
-
-            });
-        },
-
-        afterInit: function (editor) {
-            var placeholderReplaceRegex = /\[\[([^\[\]])+\]\]/g;
-
-            editor.dataProcessor.dataFilter.addRules({
-                text: function (text, node) {
-                    var dtd = node.parent && CKEDITOR.dtd[node.parent.name];
-
-                    if (dtd && !dtd.span)
-                        return;
-
-                    return text.replace(placeholderReplaceRegex, function (match) {
-                        var widgetWrapper,
-                            innerElement = new CKEDITOR.htmlParser.element('span', {
-                                'class': 'fme-placeholder'
-                            });
-
-                        innerElement.add(new CKEDITOR.htmlParser.text(match));
-                        widgetWrapper = editor.widgets.wrapElement(innerElement, 'formmaileditor');
-
-                        return widgetWrapper.getOuterHtml();
-                    });
-                }
-            });
-        }
-    });
-
-    CKEDITOR.on('dialogDefinition', function (ev) {
-
-        var dialogName = ev.data.name,
-            dialogDefinition = ev.data.definition;
-
-        if (dialogName !== 'formmaileditor') {
-            return;
-        }
-
-        var config = ev.editor.config._formMailEditorConfiguration,
-            widgetFields = ev.editor.config._formMailEditorWidgetFields,
-            tableProperties = dialogDefinition.getContents('info');
-
-        var isVisibleConfigField = function (widgetData, configIdentifier) {
-
-            var isRelated = false;
-            for (var i = 0; i < widgetFields.length; i++) {
-                var widgetField = widgetFields[i];
-                if (widgetField.type === widgetData.type && widgetField.subType === widgetData.subType && widgetField.configIdentifier === configIdentifier) {
-                    isRelated = true;
-                    break;
-                }
-            }
-
-            return isRelated;
-
-        }, parseAdditionalData = function (widgetData, configKey, data) {
-
-            var additionalData = {};
-            if (widgetData.hasOwnProperty('additionalData') && typeof widgetData.additionalData === 'object') {
-                additionalData = widgetData.additionalData;
-            }
-
-            if (data === null || data === '') {
-                if (additionalData.hasOwnProperty(configKey)) {
-                    delete additionalData[configKey];
-                }
-            } else {
-                additionalData[configKey] = data;
-            }
-
-            return additionalData;
-
-        }, generateFieldKey = function (widgetData, configKey) {
-            var type = widgetData.type,
-                subType = widgetData.subType;
-
-            if (subType === null) {
-                return type + '_' + configKey;
-            }
-
-            return type + '_' + subType + '_' + configKey;
-        };
-
-        Object.keys(config).forEach(function (configIdentifier) {
-            var configElements = config[configIdentifier];
-            Object.keys(configElements).forEach(function (configKey) {
-                var configElement = configElements[configKey];
-                switch (configElement.type) {
-                    case 'checkbox' :
-                        tableProperties.add({
-                            type: 'checkbox',
-                            id: configIdentifier,
-                            label: configElement.label,
-                            'default': configElement.defaultValue === true,
-                            setup: function (widget) {
-                                var fieldName = generateFieldKey(widget.data, configKey);
-                                if (widget.data.hasOwnProperty(fieldName)) {
-                                    this.setValue(widget.data[fieldName]);
-                                }
-                                this.getElement().getParent().setStyle('display', isVisibleConfigField(widget.data, this.id) ? 'block' : 'none');
-                            },
-                            commit: function (widget) {
-                                var fieldName = generateFieldKey(widget.data, configKey);
-                                if (isVisibleConfigField(widget.data, this.id)) {
-                                    widget.setData(fieldName, this.getValue());
-                                    widget.setData('additionalData', parseAdditionalData(widget.data, configKey, this.getValue()));
-                                }
-                            }
-                        });
-                        break;
-                    case 'input' :
-                        tableProperties.add({
-                            type: 'text',
-                            id: configIdentifier,
-                            label: configElement.label,
-                            'default': configElement.defaultValue !== null ? configElement.defaultValue : '',
-                            setup: function (widget) {
-                                var fieldName = generateFieldKey(widget.data, configKey);
-                                if (widget.data.hasOwnProperty(fieldName)) {
-                                    this.setValue(widget.data[fieldName]);
-                                }
-                                this.getElement().getParent().setStyle('display', isVisibleConfigField(widget.data, this.id) ? 'block' : 'none');
-                            },
-                            commit: function (widget) {
-                                var fieldName = generateFieldKey(widget.data, configKey);
-                                if (isVisibleConfigField(widget.data, this.id)) {
-                                    widget.setData(fieldName, this.getValue());
-                                    widget.setData('additionalData', parseAdditionalData(widget.data, configKey, this.getValue()));
-                                }
-                            }
-                        });
-                        break;
-                    case 'read-only' :
-                        tableProperties.add({
-                            type: 'text',
-                            id: configIdentifier,
-                            label: configElement.label,
-                            'default': configElement.defaultValue !== null ? configElement.defaultValue : '',
-                            setup: function (widget) {
-                                var fieldName = generateFieldKey(widget.data, configKey);
-                                if (widget.data.hasOwnProperty(fieldName)) {
-                                    this.setValue(widget.data[fieldName]);
-                                }
-                                this.getElement().getParent().setStyle('display', isVisibleConfigField(widget.data, this.id) ? 'block' : 'none');
-                                this.disable();
-                            },
-                            commit: function (widget) {
-                                // nothing to do so far.
-                            }
-                        });
-                        break;
-                }
-            });
-        });
-    });
-})();
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/lineutils/plugin.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/lineutils/plugin.js
deleted file mode 100644
index 39f5586c..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/lineutils/plugin.js
+++ /dev/null
@@ -1,1018 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
- /**
- * @fileOverview A set of utilities to find and create horizontal spaces in edited content.
- */
-
-'use strict';
-
-( function() {
-
-	CKEDITOR.plugins.add( 'lineutils' );
-
-	/**
-	 * Determines a position relative to an element in DOM (before).
-	 *
-	 * @readonly
-	 * @property {Number} [=0]
-	 * @member CKEDITOR
-	 */
-	CKEDITOR.LINEUTILS_BEFORE = 1;
-
-	/**
-	 * Determines a position relative to an element in DOM (after).
-	 *
-	 * @readonly
-	 * @property {Number} [=2]
-	 * @member CKEDITOR
-	 */
-	CKEDITOR.LINEUTILS_AFTER = 2;
-
-	/**
-	 * Determines a position relative to an element in DOM (inside).
-	 *
-	 * @readonly
-	 * @property {Number} [=4]
-	 * @member CKEDITOR
-	 */
-	CKEDITOR.LINEUTILS_INSIDE = 4;
-
-	/**
-	 * A utility that traverses the DOM tree and discovers elements
-	 * (relations) matching user-defined lookups.
-	 *
-	 * @private
-	 * @class CKEDITOR.plugins.lineutils.finder
-	 * @constructor Creates a Finder class instance.
-	 * @param {CKEDITOR.editor} editor Editor instance that the Finder belongs to.
-	 * @param {Object} def Finder's definition.
-	 * @since 4.3
-	 */
-	function Finder( editor, def ) {
-		CKEDITOR.tools.extend( this, {
-			editor: editor,
-			editable: editor.editable(),
-			doc: editor.document,
-			win: editor.window
-		}, def, true );
-
-		this.inline = this.editable.isInline();
-
-		if ( !this.inline ) {
-			this.frame = this.win.getFrame();
-		}
-
-		this.target = this[ this.inline ? 'editable' : 'doc' ];
-	}
-
-	Finder.prototype = {
-		/**
-		 * Initializes searching for elements with every mousemove event fired.
-		 * To stop searching use {@link #stop}.
-		 *
-		 * @param {Function} [callback] Function executed on every iteration.
-		 */
-		start: function( callback ) {
-			var that = this,
-				editor = this.editor,
-				doc = this.doc,
-				el, elfp, x, y;
-
-			var moveBuffer = CKEDITOR.tools.eventsBuffer( 50, function() {
-					if ( editor.readOnly || editor.mode != 'wysiwyg' )
-						return;
-
-					that.relations = {};
-
-					// Sometimes it happens that elementFromPoint returns null (especially on IE).
-					// Any further traversal makes no sense if there's no start point. Abort.
-					// Note: In IE8 elementFromPoint may return zombie nodes of undefined nodeType,
-					// so rejecting those as well.
-					if ( !( elfp = doc.$.elementFromPoint( x, y ) ) || !elfp.nodeType ) {
-						return;
-					}
-
-					el = new CKEDITOR.dom.element( elfp );
-
-					that.traverseSearch( el );
-
-					if ( !isNaN( x + y ) ) {
-						that.pixelSearch( el, x, y );
-					}
-
-					callback && callback( that.relations, x, y );
-				} );
-
-			// Searching starting from element from point on mousemove.
-			this.listener = this.editable.attachListener( this.target, 'mousemove', function( evt ) {
-				x = evt.data.$.clientX;
-				y = evt.data.$.clientY;
-
-				moveBuffer.input();
-			} );
-
-			this.editable.attachListener( this.inline ? this.editable : this.frame, 'mouseout', function() {
-				moveBuffer.reset();
-			} );
-		},
-
-		/**
-		 * Stops observing mouse events attached by {@link #start}.
-		 */
-		stop: function() {
-			if ( this.listener ) {
-				this.listener.removeListener();
-			}
-		},
-
-		/**
-		 * Returns a range representing the relation, according to its element
-		 * and type.
-		 *
-		 * @param {Object} location Location containing a unique identifier and type.
-		 * @returns {CKEDITOR.dom.range} Range representing the relation.
-		 */
-		getRange: ( function() {
-			var where = {};
-
-			where[ CKEDITOR.LINEUTILS_BEFORE ] = CKEDITOR.POSITION_BEFORE_START;
-			where[ CKEDITOR.LINEUTILS_AFTER ] = CKEDITOR.POSITION_AFTER_END;
-			where[ CKEDITOR.LINEUTILS_INSIDE ] = CKEDITOR.POSITION_AFTER_START;
-
-			return function( location ) {
-				var range = this.editor.createRange();
-
-				range.moveToPosition( this.relations[ location.uid ].element, where[ location.type ] );
-
-				return range;
-			};
-		} )(),
-
-		/**
-		 * Stores given relation in a {@link #relations} object. Processes the relation
-		 * to normalize and avoid duplicates.
-		 *
-		 * @param {CKEDITOR.dom.element} el Element of the relation.
-		 * @param {Number} type Relation, one of `CKEDITOR.LINEUTILS_AFTER`, `CKEDITOR.LINEUTILS_BEFORE`, `CKEDITOR.LINEUTILS_INSIDE`.
-		 */
-		store: ( function() {
-			function merge( el, type, relations ) {
-				var uid = el.getUniqueId();
-
-				if ( uid in relations ) {
-					relations[ uid ].type |= type;
-				} else {
-					relations[ uid ] = { element: el, type: type };
-				}
-			}
-
-			return function( el, type ) {
-				var alt;
-
-				// Normalization to avoid duplicates:
-				// CKEDITOR.LINEUTILS_AFTER becomes CKEDITOR.LINEUTILS_BEFORE of el.getNext().
-				if ( is( type, CKEDITOR.LINEUTILS_AFTER ) && isStatic( alt = el.getNext() ) && alt.isVisible() ) {
-					merge( alt, CKEDITOR.LINEUTILS_BEFORE, this.relations );
-					type ^= CKEDITOR.LINEUTILS_AFTER;
-				}
-
-				// Normalization to avoid duplicates:
-				// CKEDITOR.LINEUTILS_INSIDE becomes CKEDITOR.LINEUTILS_BEFORE of el.getFirst().
-				if ( is( type, CKEDITOR.LINEUTILS_INSIDE ) && isStatic( alt = el.getFirst() ) && alt.isVisible() ) {
-					merge( alt, CKEDITOR.LINEUTILS_BEFORE, this.relations );
-					type ^= CKEDITOR.LINEUTILS_INSIDE;
-				}
-
-				merge( el, type, this.relations );
-			};
-		} )(),
-
-		/**
-		 * Traverses the DOM tree towards root, checking all ancestors
-		 * with lookup rules, avoiding duplicates. Stores positive relations
-		 * in the {@link #relations} object.
-		 *
-		 * @param {CKEDITOR.dom.element} el Element which is the starting point.
-		 */
-		traverseSearch: function( el ) {
-			var l, type, uid;
-
-			// Go down DOM towards root (or limit).
-			do {
-				uid = el.$[ 'data-cke-expando' ];
-
-				// This element was already visited and checked.
-				if ( uid && uid in this.relations ) {
-					continue;
-				}
-
-				if ( el.equals( this.editable ) ) {
-					return;
-				}
-
-				if ( isStatic( el ) ) {
-					// Collect all addresses yielded by lookups for that element.
-					for ( l in this.lookups ) {
-
-						if ( ( type = this.lookups[ l ]( el ) ) ) {
-							this.store( el, type );
-						}
-					}
-				}
-			} while ( !isLimit( el ) && ( el = el.getParent() ) );
-		},
-
-		/**
-		 * Iterates vertically pixel-by-pixel within a given element starting
-		 * from given coordinates, searching for elements in the neighborhood.
-		 * Once an element is found it is processed by {@link #traverseSearch}.
-		 *
-		 * @param {CKEDITOR.dom.element} el Element which is the starting point.
-		 * @param {Number} [x] Horizontal mouse coordinate relative to the viewport.
-		 * @param {Number} [y] Vertical mouse coordinate relative to the viewport.
-		 */
-		pixelSearch: ( function() {
-			var contains = CKEDITOR.env.ie || CKEDITOR.env.webkit ?
-				function( el, found ) {
-					return el.contains( found );
-				} : function( el, found ) {
-					return !!( el.compareDocumentPosition( found ) & 16 );
-				};
-
-			// Iterates pixel-by-pixel from starting coordinates, moving by defined
-			// step and getting elementFromPoint in every iteration. Iteration stops when:
-			//  * A valid element is found.
-			//  * Condition function returns `false` (i.e. reached boundaries of viewport).
-			//  * No element is found (i.e. coordinates out of viewport).
-			//  * Element found is ascendant of starting element.
-			//
-			// @param {Object} doc Native DOM document.
-			// @param {Object} el Native DOM element.
-			// @param {Number} xStart Horizontal starting coordinate to use.
-			// @param {Number} yStart Vertical starting coordinate to use.
-			// @param {Number} step Step of the algorithm.
-			// @param {Function} condition A condition relative to current vertical coordinate.
-			function iterate( el, xStart, yStart, step, condition ) {
-				var y = yStart,
-					tryouts = 0,
-					found;
-
-				while ( condition( y ) ) {
-					y += step;
-
-					// If we try and we try, and still nothing's found, let's end
-					// that party.
-					if ( ++tryouts == 25 ) {
-						return;
-					}
-
-					found = this.doc.$.elementFromPoint( xStart, y );
-
-					// Nothing found. This is crazy... but...
-					// It might be that a line, which is in different document,
-					// covers that pixel (elementFromPoint is doc-sensitive).
-					// Better let's have another try.
-					if ( !found ) {
-						continue;
-					}
-
-					// Still in the same element.
-					else if ( found == el ) {
-						tryouts = 0;
-						continue;
-					}
-
-					// Reached the edge of an element and found an ancestor or...
-					// A line, that covers that pixel. Better let's have another try.
-					else if ( !contains( el, found ) ) {
-						continue;
-					}
-
-					tryouts = 0;
-
-					// Found a valid element. Stop iterating.
-					if ( isStatic( ( found = new CKEDITOR.dom.element( found ) ) ) ) {
-						return found;
-					}
-				}
-			}
-
-			return function( el, x, y ) {
-				var paneHeight = this.win.getViewPaneSize().height,
-
-					// Try to find an element iterating *up* from the starting point.
-					neg = iterate.call( this, el.$, x, y, -1, function( y ) {
-						return y > 0;
-					} ),
-
-					// Try to find an element iterating *down* from the starting point.
-					pos = iterate.call( this, el.$, x, y, 1, function( y ) {
-						return y < paneHeight;
-					} );
-
-				if ( neg ) {
-					this.traverseSearch( neg );
-
-					// Iterate towards DOM root until neg is a direct child of el.
-					while ( !neg.getParent().equals( el ) ) {
-						neg = neg.getParent();
-					}
-				}
-
-				if ( pos ) {
-					this.traverseSearch( pos );
-
-					// Iterate towards DOM root until pos is a direct child of el.
-					while ( !pos.getParent().equals( el ) ) {
-						pos = pos.getParent();
-					}
-				}
-
-				// Iterate forwards starting from neg and backwards from
-				// pos to harvest all children of el between those elements.
-				// Stop when neg and pos meet each other or there's none of them.
-				// TODO (?) reduce number of hops forwards/backwards.
-				while ( neg || pos ) {
-					if ( neg ) {
-						neg = neg.getNext( isStatic );
-					}
-
-					if ( !neg || neg.equals( pos ) ) {
-						break;
-					}
-
-					this.traverseSearch( neg );
-
-					if ( pos ) {
-						pos = pos.getPrevious( isStatic );
-					}
-
-					if ( !pos || pos.equals( neg ) ) {
-						break;
-					}
-
-					this.traverseSearch( pos );
-				}
-			};
-		} )(),
-
-		/**
-		 * Unlike {@link #traverseSearch}, it collects **all** elements from editable's DOM tree
-		 * and runs lookups for every one of them, collecting relations.
-		 *
-		 * @returns {Object} {@link #relations}.
-		 */
-		greedySearch: function() {
-			this.relations = {};
-
-			var all = this.editable.getElementsByTag( '*' ),
-				i = 0,
-				el, type, l;
-
-			while ( ( el = all.getItem( i++ ) ) ) {
-				// Don't consider editable, as it might be inline,
-				// and i.e. checking it's siblings is pointless.
-				if ( el.equals( this.editable ) ) {
-					continue;
-				}
-
-				// On IE8 element.getElementsByTagName returns comments... sic! (https://dev.ckeditor.com/ticket/13176)
-				if ( el.type != CKEDITOR.NODE_ELEMENT ) {
-					continue;
-				}
-
-				// Don't visit non-editable internals, for example widget's
-				// guts (above wrapper, below nested). Still check editable limits,
-				// as they are siblings with editable contents.
-				if ( !el.hasAttribute( 'contenteditable' ) && el.isReadOnly() ) {
-					continue;
-				}
-
-				if ( isStatic( el ) && el.isVisible() ) {
-					// Collect all addresses yielded by lookups for that element.
-					for ( l in this.lookups ) {
-						if ( ( type = this.lookups[ l ]( el ) ) ) {
-							this.store( el, type );
-						}
-					}
-				}
-			}
-
-			return this.relations;
-		}
-
-		/**
-		 * Relations express elements in DOM that match user-defined {@link #lookups}.
-		 * Every relation has its own `type` that determines whether
-		 * it refers to the space before, after or inside the `element`.
-		 * This object stores relations found by {@link #traverseSearch} or {@link #greedySearch}, structured
-		 * in the following way:
-		 *
-		 *		relations: {
-		 *			// Unique identifier of the element.
-		 *			Number: {
-		 *				// Element of this relation.
-		 *				element: {@link CKEDITOR.dom.element}
-		 *				// Conjunction of CKEDITOR.LINEUTILS_BEFORE, CKEDITOR.LINEUTILS_AFTER and CKEDITOR.LINEUTILS_INSIDE.
-		 *				type: Number
-		 *			},
-		 *			...
-		 *		}
-		 *
-		 * @property {Object} relations
-		 * @readonly
-		 */
-
-		/**
-		 * A set of user-defined functions used by Finder to check if an element
-		 * is a valid relation, belonging to {@link #relations}.
-		 * When the criterion is met, lookup returns a logical conjunction of `CKEDITOR.LINEUTILS_BEFORE`,
-		 * `CKEDITOR.LINEUTILS_AFTER` or `CKEDITOR.LINEUTILS_INSIDE`.
-		 *
-		 * Lookups are passed along with Finder's definition.
-		 *
-		 *		lookups: {
-		 *			'some lookup': function( el ) {
-		 *				if ( someCondition )
-		 *					return CKEDITOR.LINEUTILS_BEFORE;
-		 *			},
-		 *			...
-		 *		}
-		 *
-		 * @property {Object} lookups
-		 */
-	};
-
-
-	/**
-	 * A utility that analyses relations found by
-	 * CKEDITOR.plugins.lineutils.finder and locates them
-	 * in the viewport as horizontal lines of specific coordinates.
-	 *
-	 * @private
-	 * @class CKEDITOR.plugins.lineutils.locator
-	 * @constructor Creates a Locator class instance.
-	 * @param {CKEDITOR.editor} editor Editor instance that Locator belongs to.
-	 * @since 4.3
-	 */
-	function Locator( editor, def ) {
-		CKEDITOR.tools.extend( this, def, {
-			editor: editor
-		}, true );
-	}
-
-	Locator.prototype = {
-		/**
-		 * Locates the Y coordinate for all types of every single relation and stores
-		 * them in an object.
-		 *
-		 * @param {Object} relations {@link CKEDITOR.plugins.lineutils.finder#relations}.
-		 * @returns {Object} {@link #locations}.
-		 */
-		locate: ( function() {
-			function locateSibling( rel, type ) {
-				var sib = rel.element[ type === CKEDITOR.LINEUTILS_BEFORE ? 'getPrevious' : 'getNext' ]();
-
-				// Return the middle point between siblings.
-				if ( sib && isStatic( sib ) ) {
-					rel.siblingRect = sib.getClientRect();
-
-					if ( type == CKEDITOR.LINEUTILS_BEFORE ) {
-						return ( rel.siblingRect.bottom + rel.elementRect.top ) / 2;
-					} else {
-						return ( rel.elementRect.bottom + rel.siblingRect.top ) / 2;
-					}
-				}
-
-				// If there's no sibling, use the edge of an element.
-				else {
-					if ( type == CKEDITOR.LINEUTILS_BEFORE ) {
-						return rel.elementRect.top;
-					} else {
-						return rel.elementRect.bottom;
-					}
-				}
-			}
-
-			return function( relations ) {
-				var rel;
-
-				this.locations = {};
-
-				for ( var uid in relations ) {
-					rel = relations[ uid ];
-					rel.elementRect = rel.element.getClientRect();
-
-					if ( is( rel.type, CKEDITOR.LINEUTILS_BEFORE ) ) {
-						this.store( uid, CKEDITOR.LINEUTILS_BEFORE, locateSibling( rel, CKEDITOR.LINEUTILS_BEFORE ) );
-					}
-
-					if ( is( rel.type, CKEDITOR.LINEUTILS_AFTER ) ) {
-						this.store( uid, CKEDITOR.LINEUTILS_AFTER, locateSibling( rel, CKEDITOR.LINEUTILS_AFTER ) );
-					}
-
-					// The middle point of the element.
-					if ( is( rel.type, CKEDITOR.LINEUTILS_INSIDE ) ) {
-						this.store( uid, CKEDITOR.LINEUTILS_INSIDE, ( rel.elementRect.top + rel.elementRect.bottom ) / 2 );
-					}
-				}
-
-				return this.locations;
-			};
-		} )(),
-
-		/**
-		 * Calculates distances from every location to given vertical coordinate
-		 * and sorts locations according to that distance.
-		 *
-		 * @param {Number} y The vertical coordinate used for sorting, used as a reference.
-		 * @param {Number} [howMany] Determines the number of "closest locations" to be returned.
-		 * @returns {Array} Sorted, array representation of {@link #locations}.
-		 */
-		sort: ( function() {
-			var locations, sorted,
-				dist, i;
-
-			function distance( y, uid, type ) {
-				return Math.abs( y - locations[ uid ][ type ] );
-			}
-
-			return function( y, howMany ) {
-				locations = this.locations;
-				sorted = [];
-
-				for ( var uid in locations ) {
-					for ( var type in locations[ uid ] ) {
-						dist = distance( y, uid, type );
-
-						// An array is empty.
-						if ( !sorted.length ) {
-							sorted.push( { uid: +uid, type: type, dist: dist } );
-						} else {
-							// Sort the array on fly when it's populated.
-							for ( i = 0; i < sorted.length; i++ ) {
-								if ( dist < sorted[ i ].dist ) {
-									sorted.splice( i, 0, { uid: +uid, type: type, dist: dist } );
-									break;
-								}
-							}
-
-							// Nothing was inserted, so the distance is bigger than
-							// any of already calculated: push to the end.
-							if ( i == sorted.length ) {
-								sorted.push( { uid: +uid, type: type, dist: dist } );
-							}
-						}
-					}
-				}
-
-				if ( typeof howMany != 'undefined' ) {
-					return sorted.slice( 0, howMany );
-				} else {
-					return sorted;
-				}
-			};
-		} )(),
-
-		/**
-		 * Stores the location in a collection.
-		 *
-		 * @param {Number} uid Unique identifier of the relation.
-		 * @param {Number} type One of `CKEDITOR.LINEUTILS_BEFORE`, `CKEDITOR.LINEUTILS_AFTER` and `CKEDITOR.LINEUTILS_INSIDE`.
-		 * @param {Number} y Vertical position of the relation.
-		 */
-		store: function( uid, type, y ) {
-			if ( !this.locations[ uid ] ) {
-				this.locations[ uid ] = {};
-			}
-
-			this.locations[ uid ][ type ] = y;
-		}
-
-		/**
-		 * @readonly
-		 * @property {Object} locations
-		 */
-	};
-
-	var tipCss = {
-			display: 'block',
-			width: '0px',
-			height: '0px',
-			'border-color': 'transparent',
-			'border-style': 'solid',
-			position: 'absolute',
-			top: '-6px'
-		},
-
-		lineStyle = {
-			height: '0px',
-			'border-top': '1px dashed red',
-			position: 'absolute',
-			'z-index': 9999
-		},
-
-		lineTpl =
-			'<div data-cke-lineutils-line="1" class="cke_reset_all" style="{lineStyle}">' +
-				'<span style="{tipLeftStyle}">&nbsp;</span>' +
-				'<span style="{tipRightStyle}">&nbsp;</span>' +
-			'</div>';
-
-	/**
-	 * A utility that draws horizontal lines in DOM according to locations
-	 * returned by CKEDITOR.plugins.lineutils.locator.
-	 *
-	 * @private
-	 * @class CKEDITOR.plugins.lineutils.liner
-	 * @constructor Creates a Liner class instance.
-	 * @param {CKEDITOR.editor} editor Editor instance that Liner belongs to.
-	 * @param {Object} def Liner's definition.
-	 * @since 4.3
-	 */
-	function Liner( editor, def ) {
-		var editable = editor.editable();
-
-		CKEDITOR.tools.extend( this, {
-			editor: editor,
-			editable: editable,
-			inline: editable.isInline(),
-			doc: editor.document,
-			win: editor.window,
-			container: CKEDITOR.document.getBody(),
-			winTop: CKEDITOR.document.getWindow()
-		}, def, true );
-
-		this.hidden = {};
-		this.visible = {};
-
-		if ( !this.inline ) {
-			this.frame = this.win.getFrame();
-		}
-
-		this.queryViewport();
-
-		// Callbacks must be wrapped. Otherwise they're not attached
-		// to global DOM objects (i.e. topmost window) for every editor
-		// because they're treated as duplicates. They belong to the
-		// same prototype shared among Liner instances.
-		var queryViewport = CKEDITOR.tools.bind( this.queryViewport, this ),
-			hideVisible = CKEDITOR.tools.bind( this.hideVisible, this ),
-			removeAll = CKEDITOR.tools.bind( this.removeAll, this );
-
-		editable.attachListener( this.winTop, 'resize', queryViewport );
-		editable.attachListener( this.winTop, 'scroll', queryViewport );
-
-		editable.attachListener( this.winTop, 'resize', hideVisible );
-		editable.attachListener( this.win, 'scroll', hideVisible );
-
-		editable.attachListener( this.inline ? editable : this.frame, 'mouseout', function( evt ) {
-			var x = evt.data.$.clientX,
-				y = evt.data.$.clientY;
-
-			this.queryViewport();
-
-			// Check if mouse is out of the element (iframe/editable).
-			if ( x <= this.rect.left || x >= this.rect.right || y <= this.rect.top || y >= this.rect.bottom ) {
-				this.hideVisible();
-			}
-
-			// Check if mouse is out of the top-window vieport.
-			if ( x <= 0 || x >= this.winTopPane.width || y <= 0 || y >= this.winTopPane.height ) {
-				this.hideVisible();
-			}
-		}, this );
-
-		editable.attachListener( editor, 'resize', queryViewport );
-		editable.attachListener( editor, 'mode', removeAll );
-		editor.on( 'destroy', removeAll );
-
-		this.lineTpl = new CKEDITOR.template( lineTpl ).output( {
-			lineStyle: CKEDITOR.tools.writeCssText(
-				CKEDITOR.tools.extend( {}, lineStyle, this.lineStyle, true )
-			),
-			tipLeftStyle: CKEDITOR.tools.writeCssText(
-				CKEDITOR.tools.extend( {}, tipCss, {
-					left: '0px',
-					'border-left-color': 'red',
-					'border-width': '6px 0 6px 6px'
-				}, this.tipCss, this.tipLeftStyle, true )
-			),
-			tipRightStyle: CKEDITOR.tools.writeCssText(
-				CKEDITOR.tools.extend( {}, tipCss, {
-					right: '0px',
-					'border-right-color': 'red',
-					'border-width': '6px 6px 6px 0'
-				}, this.tipCss, this.tipRightStyle, true )
-			)
-		} );
-	}
-
-	Liner.prototype = {
-		/**
-		 * Permanently removes all lines (both hidden and visible) from DOM.
-		 */
-		removeAll: function() {
-			var l;
-
-			for ( l in this.hidden ) {
-				this.hidden[ l ].remove();
-				delete this.hidden[ l ];
-			}
-
-			for ( l in this.visible ) {
-				this.visible[ l ].remove();
-				delete this.visible[ l ];
-			}
-		},
-
-		/**
-		 * Hides a given line.
-		 *
-		 * @param {CKEDITOR.dom.element} line The line to be hidden.
-		 */
-		hideLine: function( line ) {
-			var uid = line.getUniqueId();
-
-			line.hide();
-
-			this.hidden[ uid ] = line;
-			delete this.visible[ uid ];
-		},
-
-		/**
-		 * Shows a given line.
-		 *
-		 * @param {CKEDITOR.dom.element} line The line to be shown.
-		 */
-		showLine: function( line ) {
-			var uid = line.getUniqueId();
-
-			line.show();
-
-			this.visible[ uid ] = line;
-			delete this.hidden[ uid ];
-		},
-
-		/**
-		 * Hides all visible lines.
-		 */
-		hideVisible: function() {
-			for ( var l in this.visible ) {
-				this.hideLine( this.visible[ l ] );
-			}
-		},
-
-		/**
-		 * Shows a line at given location.
-		 *
-		 * @param {Object} location Location object containing the unique identifier of the relation
-		 * and its type. Usually returned by {@link CKEDITOR.plugins.lineutils.locator#sort}.
-		 * @param {Function} [callback] A callback to be called once the line is shown.
-		 */
-		placeLine: function( location, callback ) {
-			var styles, line, l;
-
-			// No style means that line would be out of viewport.
-			if ( !( styles = this.getStyle( location.uid, location.type ) ) ) {
-				return;
-			}
-
-			// Search for any visible line of a different hash first.
-			// It's faster to re-position visible line than to show it.
-			for ( l in this.visible ) {
-				if ( this.visible[ l ].getCustomData( 'hash' ) !== this.hash ) {
-					line = this.visible[ l ];
-					break;
-				}
-			}
-
-			// Search for any hidden line of a different hash.
-			if ( !line ) {
-				for ( l in this.hidden ) {
-					if ( this.hidden[ l ].getCustomData( 'hash' ) !== this.hash ) {
-						this.showLine( ( line = this.hidden[ l ] ) );
-						break;
-					}
-				}
-			}
-
-			// If no line available, add the new one.
-			if ( !line ) {
-				this.showLine( ( line = this.addLine() ) );
-			}
-
-			// Mark the line with current hash.
-			line.setCustomData( 'hash', this.hash );
-
-			// Mark the line as visible.
-			this.visible[ line.getUniqueId() ] = line;
-
-			line.setStyles( styles );
-
-			callback && callback( line );
-		},
-
-		/**
-		 * Creates a style set to be used by the line, representing a particular
-		 * relation (location).
-		 *
-		 * @param {Number} uid Unique identifier of the relation.
-		 * @param {Number} type Type of the relation.
-		 * @returns {Object} An object containing styles.
-		 */
-		getStyle: function( uid, type ) {
-			var rel = this.relations[ uid ],
-				loc = this.locations[ uid ][ type ],
-				styles = {},
-				hdiff;
-
-			// Line should be between two elements.
-			if ( rel.siblingRect ) {
-				styles.width = Math.max( rel.siblingRect.width, rel.elementRect.width );
-			}
-			// Line is relative to a single element.
-			else {
-				styles.width = rel.elementRect.width;
-			}
-
-			// Let's calculate the vertical position of the line.
-			if ( this.inline ) {
-				// (https://dev.ckeditor.com/ticket/13155)
-				styles.top = loc + this.winTopScroll.y - this.rect.relativeY;
-			} else {
-				styles.top = this.rect.top + this.winTopScroll.y + loc;
-			}
-
-			// Check if line would be vertically out of the viewport.
-			if ( styles.top - this.winTopScroll.y < this.rect.top || styles.top - this.winTopScroll.y > this.rect.bottom ) {
-				return false;
-			}
-
-			// Now let's calculate the horizontal alignment (left and width).
-			if ( this.inline ) {
-				// (https://dev.ckeditor.com/ticket/13155)
-				styles.left = rel.elementRect.left - this.rect.relativeX;
-			} else {
-				if ( rel.elementRect.left > 0 )
-					styles.left = this.rect.left + rel.elementRect.left;
-
-				// H-scroll case. Left edge of element may be out of viewport.
-				else {
-					styles.width += rel.elementRect.left;
-					styles.left = this.rect.left;
-				}
-
-				// H-scroll case. Right edge of element may be out of viewport.
-				if ( ( hdiff = styles.left + styles.width - ( this.rect.left + this.winPane.width ) ) > 0 ) {
-					styles.width -= hdiff;
-				}
-			}
-
-			// Finally include horizontal scroll of the global window.
-			styles.left += this.winTopScroll.x;
-
-			// Append 'px' to style values.
-			for ( var style in styles ) {
-				styles[ style ] = CKEDITOR.tools.cssLength( styles[ style ] );
-			}
-
-			return styles;
-		},
-
-		/**
-		 * Adds a new line to DOM.
-		 *
-		 * @returns {CKEDITOR.dom.element} A brand-new line.
-		 */
-		addLine: function() {
-			var line = CKEDITOR.dom.element.createFromHtml( this.lineTpl );
-
-			line.appendTo( this.container );
-
-			return line;
-		},
-
-		/**
-		 * Assigns a unique hash to the instance that is later used
-		 * to tell unwanted lines from new ones. This method **must** be called
-		 * before a new set of relations is to be visualized so {@link #cleanup}
-		 * eventually hides obsolete lines. This is because lines
-		 * are re-used between {@link #placeLine} calls and the number of
-		 * necessary ones may vary depending on the number of relations.
-		 *
-		 * @param {Object} relations {@link CKEDITOR.plugins.lineutils.finder#relations}.
-		 * @param {Object} locations {@link CKEDITOR.plugins.lineutils.locator#locations}.
-		 */
-		prepare: function( relations, locations ) {
-			this.relations = relations;
-			this.locations = locations;
-			this.hash = Math.random();
-		},
-
-		/**
-		 * Hides all visible lines that do not belong to current hash
-		 * and no longer represent relations (locations).
-		 *
-		 * See also: {@link #prepare}.
-		 */
-		cleanup: function() {
-			var line;
-
-			for ( var l in this.visible ) {
-				line = this.visible[ l ];
-
-				if ( line.getCustomData( 'hash' ) !== this.hash ) {
-					this.hideLine( line );
-				}
-			}
-		},
-
-		/**
-		 * Queries dimensions of the viewport, editable, frame etc.
-		 * that are used for correct positioning of the line.
-		 */
-		queryViewport: function() {
-			this.winPane = this.win.getViewPaneSize();
-			this.winTopScroll = this.winTop.getScrollPosition();
-			this.winTopPane = this.winTop.getViewPaneSize();
-
-			// (https://dev.ckeditor.com/ticket/13155)
-			this.rect = this.getClientRect( this.inline ? this.editable : this.frame );
-		},
-
-		/**
-		 * Returns `boundingClientRect` of an element, shifted by the position
-		 * of `container` when the container is not `static` (https://dev.ckeditor.com/ticket/13155).
-		 *
-		 * See also: {@link CKEDITOR.dom.element#getClientRect}.
-		 *
-		 * @param {CKEDITOR.dom.element} el A DOM element.
-		 * @returns {Object} A shifted rect, extended by `relativeY` and `relativeX` properties.
-		 */
-		getClientRect: function( el ) {
-			var rect = el.getClientRect(),
-				relativeContainerDocPosition = this.container.getDocumentPosition(),
-				relativeContainerComputedPosition = this.container.getComputedStyle( 'position' );
-
-			// Static or not, those values are used to offset the position of the line so they cannot be undefined.
-			rect.relativeX = rect.relativeY = 0;
-
-			if ( relativeContainerComputedPosition != 'static' ) {
-				// Remember the offset used to shift the clientRect.
-				rect.relativeY = relativeContainerDocPosition.y;
-				rect.relativeX = relativeContainerDocPosition.x;
-
-				rect.top -= rect.relativeY;
-				rect.bottom -= rect.relativeY;
-				rect.left -= rect.relativeX;
-				rect.right -= rect.relativeX;
-			}
-
-			return rect;
-		}
-	};
-
-	function is( type, flag ) {
-		return type & flag;
-	}
-
-	var floats = { left: 1, right: 1, center: 1 },
-		positions = { absolute: 1, fixed: 1 };
-
-	function isElement( node ) {
-		return node && node.type == CKEDITOR.NODE_ELEMENT;
-	}
-
-	function isFloated( el ) {
-		return !!( floats[ el.getComputedStyle( 'float' ) ] || floats[ el.getAttribute( 'align' ) ] );
-	}
-
-	function isPositioned( el ) {
-		return !!positions[ el.getComputedStyle( 'position' ) ];
-	}
-
-	function isLimit( node ) {
-		return isElement( node ) && node.getAttribute( 'contenteditable' ) == 'true';
-	}
-
-	function isStatic( node ) {
-		return isElement( node ) && !isFloated( node ) && !isPositioned( node );
-	}
-
-	/**
-	 * Global namespace storing definitions and global helpers for the Line Utilities plugin.
-	 *
-	 * @private
-	 * @class
-	 * @singleton
-	 * @since 4.3
-	 */
-	CKEDITOR.plugins.lineutils = {
-		finder: Finder,
-		locator: Locator,
-		liner: Liner
-	};
-} )();
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/de.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/de.js
deleted file mode 100644
index 235197ce..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/de.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-CKEDITOR.plugins.setLang( 'notification', 'de', {
-	closed: 'Benachrichtigung geschlossen.'
-} );
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/en.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/en.js
deleted file mode 100644
index 79008810..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/lang/en.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-CKEDITOR.plugins.setLang( 'notification', 'en', {
-	closed: 'Notification closed.'
-} );
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/plugin.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/plugin.js
deleted file mode 100644
index 2551f01b..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/notification/plugin.js
+++ /dev/null
@@ -1,933 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @fileOverview The "Notification" plugin.
- *
- */
-
-'use strict';
-
-( function() {
-
-	CKEDITOR.plugins.add( 'notification', {
-		lang: 'az,bg,ca,cs,da,de,de-ch,en,en-au,eo,es,es-mx,et,eu,fa,fr,gl,hr,hu,id,it,ja,km,ko,ku,lt,lv,nb,nl,oc,pl,pt,pt-br,ro,ru,sk,sq,sr,sr-latn,sv,tr,ug,uk,zh,zh-cn', // %REMOVE_LINE_CORE%
-
-		init: function( editor ) {
-			editor._.notificationArea = new Area( editor );
-
-			// Overwrites default `editor.showNotification`.
-			editor.showNotification = function( message, type, progressOrDuration ) {
-				var progress, duration;
-
-				if ( type == 'progress' ) {
-					progress = progressOrDuration;
-				} else {
-					duration = progressOrDuration;
-				}
-
-				var notification = new CKEDITOR.plugins.notification( editor, {
-					message: message,
-					type: type,
-					progress: progress,
-					duration: duration
-				} );
-
-				notification.show();
-
-				return notification;
-			};
-
-			// Close the last notification on ESC.
-			editor.on( 'key', function( evt ) {
-				if ( evt.data.keyCode == 27 ) { /* ESC */
-					var notifications = editor._.notificationArea.notifications;
-
-					if ( !notifications.length ) {
-						return;
-					}
-
-					// As long as this is not a common practice to inform screen-reader users about actions, in this case
-					// this is the best solution (unfortunately there is no standard for accessibility for notifications).
-					// Notification has an `alert` aria role what means that it does not get a focus nor is needed to be
-					// closed (unlike `alertdialog`). However notification will capture ESC key so we need to inform user
-					// why it does not do other actions.
-					say( editor.lang.notification.closed );
-
-					// Hide last.
-					notifications[ notifications.length - 1 ].hide();
-
-					evt.cancel();
-				}
-			} );
-
-			// Send the message to the screen readers.
-			function say( text ) {
-				var message = new CKEDITOR.dom.element( 'div' );
-				message.setStyles( {
-					position: 'fixed',
-					'margin-left': '-9999px'
-				} );
-				message.setAttributes( {
-					'aria-live': 'assertive',
-					'aria-atomic': 'true'
-				} );
-				message.setText( text );
-
-				CKEDITOR.document.getBody().append( message );
-
-				setTimeout( function() {
-					message.remove();
-				}, 100 );
-			}
-		}
-	} );
-
-	/**
-	 * Notification class. Notifications are used to display short messages to the user. They might be used to show the result of
-	 * asynchronous actions or information about changes in the editor content. It is recommended to use them instead of
-	 * alert dialogs. They should **not** be used if a user response is required nor with dialog windows (e.g. in dialog validation).
-	 *
-	 * There are four types of notifications available, see the {@link #type} property.
-	 *
-	 * Note that the notification constructor only creates a notification instance. To show it, use the {@link #show} method:
-	 *
-	 *		var notification = new CKEDITOR.plugins.notification( editor, { message: 'Foo' } );
-	 *		notification.show();
-	 *
-	 * You can also use the {@link CKEDITOR.editor#showNotification} method:
-	 *
-	 *		editor.showNotification( 'Foo' );
-	 *
-	 * All of the notification actions: ({@link #show}, {@link #update} and {@link #hide}) fire cancelable events
-	 * on the related {@link CKEDITOR.editor} instance so you can integrate editor notifications with your website notifications.
-	 *
-	 * Refer to the [Notifications](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_notifications.html) article for more information about this feature.
-	 *
-	 * @since 4.5.0
-	 * @class CKEDITOR.plugins.notification
-	 * @constructor Create a notification object. Call {@link #show} to show the created notification.
-	 * @param {CKEDITOR.editor} editor The editor instance.
-	 * @param {Object} options
-	 * @param {String} options.message The message displayed in the notification.
-	 * @param {String} [options.type='info'] Notification type, see {@link #type}.
-	 * @param {Number} [options.progress=0] If the type is `progress` this may be a progress from 0 to 1.
-	 * @param {Number} [options.duration] How long the notification will be visible, see {@link #duration}.
-	 */
-	function Notification( editor, options ) {
-		CKEDITOR.tools.extend( this, options, {
-			editor: editor,
-			id: 'cke-' + CKEDITOR.tools.getUniqueId(),
-			area: editor._.notificationArea
-		} );
-
-		if ( !options.type ) {
-			this.type = 'info';
-		}
-
-		this.element = this._createElement();
-
-		// Don't allow dragging on notification (https://dev.ckeditor.com/ticket/13184).
-		editor.plugins.clipboard && CKEDITOR.plugins.clipboard.preventDefaultDropOnElement( this.element );
-	}
-
-	/**
-	 * The editor instance.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.editor} editor
-	 */
-
-	/**
-	 * Message displayed in the notification.
-	 *
-	 * @readonly
-	 * @property {String} message
-	 */
-
-	/**
-	 * Notification type. There are four types available:
-	 *
-	 * * `info` (default) &ndash; Information for the user (e.g. "File is uploading.", "ACF modified content."),
-	 * * `warning` &ndash; Warning or error message (e.g. "This type of file is not supported.",
-	 * "You cannot paste the script."),
-	 * * `success` &ndash; Information that an operation finished successfully (e.g. "File uploaded.", "Data imported.").
-	 * * `progress` &ndash; Information about the progress of an operation. When the operation is done, the notification
-	 * type should be changed to `success`.
-	 *
-	 * @readonly
-	 * @property {String} type
-	 */
-
-	/**
-	 * If the notification {@link #type} is `'progress'`, this is the progress from `0` to `1`.
-	 *
-	 * @readonly
-	 * @property {Number} progress
-	 */
-
-	/**
-	 * Notification duration. Determines after how many milliseconds the notification should close automatically.
-	 * `0` means that the notification will not close automatically and that the user needs to close it manually.
-	 * The default value for `warning` and `progress` notifications is `0`. For `info` and `success` the value can
-	 * either be set through the {@link CKEDITOR.config#notification_duration} configuration option or equals `5000`
-	 * if the configuration option is not set.
-	 *
-	 * @readonly
-	 * @property {Number} duration
-	 */
-
-	/**
-	 * Unique notification ID.
-	 *
-	 * @readonly
-	 * @property {Number} id
-	 */
-
-	/**
-	 * Notification DOM element. There is one element per notification. It is created when the notification is created,
-	 * even if it is not shown. If the notification is hidden, the element is detached from the document but not deleted.
-	 * It will be reused if the notification is shown again.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.dom.element} element
-	 */
-
-	/**
-	 * {@link CKEDITOR.plugins.notification.area Notification area} reference.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.plugins.notification.area} area
-	 */
-
-	Notification.prototype = {
-		/**
-		 * Adds the notification element to the notification area. The notification will be hidden automatically if
-		 * {@link #duration} is set.
-		 *
-		 * Fires the {@link CKEDITOR.editor#notificationShow} event.
-		 */
-		show: function() {
-			if ( this.editor.fire( 'notificationShow', { notification: this } ) === false ) {
-				return;
-			}
-
-			this.area.add( this );
-
-			this._hideAfterTimeout();
-		},
-
-		/**
-		 * Updates the notification object and element.
-		 *
-		 * Fires the {@link CKEDITOR.editor#notificationUpdate} event.
-		 *
-		 * @param {Object} options
-		 * @param {String} [options.message] {@link #message}
-		 * @param {String} [options.type] {@link #type}
-		 * @param {Number} [options.progress] {@link #progress}
-		 * @param {Number} [options.duration] {@link #duration}
-		 * @param {Boolean} [options.important=false] If the update is important, the notification will be shown
-		 * if it was hidden and read by screen readers.
-		 */
-		update: function( options ) {
-			var show = true;
-
-			if ( this.editor.fire( 'notificationUpdate', { notification: this, options: options } ) === false ) {
-				// The idea of cancelable event is to let user create his own way of displaying notification, so if
-				// `notificationUpdate` event will be canceled there will be no interaction with notification area, but on
-				// the other hand the logic should work anyway so object will be updated (including `element` property).
-				// Note: we can safely update the element's attributes below, because this element is created inside
-				// the constructor. If the notificatinShow event was canceled as well, the element is detached from DOM.
-				show = false;
-			}
-
-			var element = this.element,
-				messageElement = element.findOne( '.cke_notification_message' ),
-				progressElement = element.findOne( '.cke_notification_progress' ),
-				type = options.type;
-
-			element.removeAttribute( 'role' );
-
-			// Change type to progress if `options.progress` is set.
-			if ( options.progress && this.type != 'progress' ) {
-				type = 'progress';
-			}
-
-			if ( type ) {
-				element.removeClass( this._getClass() );
-				element.removeAttribute( 'aria-label' );
-
-				this.type = type;
-
-				element.addClass( this._getClass() );
-				element.setAttribute( 'aria-label', this.type );
-
-				if ( this.type == 'progress' && !progressElement ) {
-					progressElement = this._createProgressElement();
-					progressElement.insertBefore( messageElement );
-				} else if ( this.type != 'progress' && progressElement ) {
-					progressElement.remove();
-				}
-			}
-
-			if ( options.message !== undefined ) {
-				this.message = options.message;
-				messageElement.setHtml( this.message );
-			}
-
-			if ( options.progress !== undefined ) {
-				this.progress = options.progress;
-
-				if ( progressElement ) {
-					progressElement.setStyle( 'width', this._getPercentageProgress() );
-				}
-			}
-
-			if ( show && options.important ) {
-				element.setAttribute( 'role', 'alert' );
-
-				if ( !this.isVisible() ) {
-					this.area.add( this );
-				}
-			}
-
-			// Overwrite even if it is undefined.
-			this.duration = options.duration;
-
-			this._hideAfterTimeout();
-		},
-
-		/**
-		 * Removes the notification element from the notification area.
-		 *
-		 * Fires the {@link CKEDITOR.editor#notificationHide} event.
-		 */
-		hide: function() {
-			if ( this.editor.fire( 'notificationHide', { notification: this } ) === false ) {
-				return;
-			}
-
-			this.area.remove( this );
-		},
-
-		/**
-		 * Returns `true` if the notification is in the notification area.
-		 *
-		 * @returns {Boolean} `true` if the notification is in the notification area.
-		 */
-		isVisible: function() {
-			return CKEDITOR.tools.indexOf( this.area.notifications, this ) >= 0;
-		},
-
-		/**
-		 * Creates the notification DOM element.
-		 *
-		 * @private
-		 * @returns {CKEDITOR.dom.element} Notification DOM element.
-		 */
-		_createElement: function() {
-			var notification = this,
-				notificationElement, notificationMessageElement, notificationCloseElement,
-				close = this.editor.lang.common.close;
-
-			notificationElement = new CKEDITOR.dom.element( 'div' );
-			notificationElement.addClass( 'cke_notification' );
-			notificationElement.addClass( this._getClass() );
-			notificationElement.setAttributes( {
-				id: this.id,
-				role: 'alert',
-				'aria-label': this.type
-			} );
-
-			if ( this.type == 'progress' )
-				notificationElement.append( this._createProgressElement() );
-
-			notificationMessageElement = new CKEDITOR.dom.element( 'p' );
-			notificationMessageElement.addClass( 'cke_notification_message' );
-			notificationMessageElement.setHtml( this.message );
-			notificationElement.append( notificationMessageElement );
-
-			notificationCloseElement = CKEDITOR.dom.element.createFromHtml(
-				'<a class="cke_notification_close" href="javascript:void(0)" title="' + close + '" role="button" tabindex="-1">' +
-					'<span class="cke_label">X</span>' +
-				'</a>' );
-			notificationElement.append( notificationCloseElement );
-
-			notificationCloseElement.on( 'click', function() {
-				// Focus editor on close (https://dev.ckeditor.com/ticket/12865)
-				notification.editor.focus();
-
-				notification.hide();
-			} );
-
-			return notificationElement;
-		},
-
-		/**
-		 * Gets the notification CSS class.
-		 *
-		 * @private
-		 * @returns {String} Notification CSS class.
-		 */
-		_getClass: function() {
-			return ( this.type == 'progress' ) ?
-				'cke_notification_info' :
-				( 'cke_notification_' + this.type );
-		},
-
-		/**
-		 * Creates a progress element for the notification element.
-		 *
-		 * @private
-		 * @returns {CKEDITOR.dom.element} Progress element for the notification element.
-		 */
-		_createProgressElement: function() {
-			var element = new CKEDITOR.dom.element( 'span' );
-			element.addClass( 'cke_notification_progress' );
-			element.setStyle( 'width', this._getPercentageProgress() );
-			return element;
-		},
-
-		/**
-		 * Gets the progress as a percentage (ex. `0.3` -> `30%`).
-		 *
-		 * @private
-		 * @returns {String} Progress as a percentage.
-		 */
-		_getPercentageProgress: function() {
-			return Math.round( ( this.progress || 0 ) * 100 ) + '%';
-		},
-
-		/**
-		 * Hides the notification after a timeout.
-		 *
-		 * @private
-		 */
-		_hideAfterTimeout: function() {
-			var notification = this,
-				duration;
-
-			if ( this._hideTimeoutId ) {
-				clearTimeout( this._hideTimeoutId );
-			}
-
-			if ( typeof this.duration == 'number' ) {
-				duration = this.duration;
-			} else if ( this.type == 'info' || this.type == 'success' ) {
-				duration = ( typeof this.editor.config.notification_duration == 'number' ) ?
-					this.editor.config.notification_duration :
-					5000;
-			}
-
-			if ( duration ) {
-				notification._hideTimeoutId = setTimeout( function() {
-					notification.hide();
-				}, duration );
-			}
-		}
-	};
-
-	/**
-	 * Notification area is an area where all notifications are put. The area is laid out dynamically.
-	 * When the first notification is added, the area is shown and all listeners are added.
-	 * When the last notification is removed, the area is hidden and all listeners are removed.
-	 *
-	 * @since 4.5.0
-	 * @private
-	 * @class CKEDITOR.plugins.notification.area
-	 * @constructor
-	 * @param {CKEDITOR.editor} editor The editor instance.
-	 */
-	function Area( editor ) {
-		var that = this;
-
-		this.editor = editor;
-		this.notifications = [];
-		this.element = this._createElement();
-		this._uiBuffer = CKEDITOR.tools.eventsBuffer( 10, this._layout, this );
-		this._changeBuffer = CKEDITOR.tools.eventsBuffer( 500, this._layout, this );
-
-		editor.on( 'destroy', function() {
-			that._removeListeners();
-			that.element.remove();
-		} );
-	}
-
-	/**
-	 * The editor instance.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.editor} editor
-	 */
-
-	/**
-	 * The array of added notifications.
-	 *
-	 * @readonly
-	 * @property {Array} notifications
-	 */
-
-	/**
-	 * Notification area DOM element. This element is created when the area object is created. It will be attached to the document
-	 * when the first notification is added and removed when the last notification is removed.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.dom.element} element
-	 */
-
-	/**
-	 * Notification width. Cached for performance reasons.
-	 *
-	 * @private
-	 * @property {CKEDITOR.dom.element} _notificationWidth
-	 */
-
-	/**
-	 * Notification margin. Cached for performance reasons.
-	 *
-	 * @private
-	 * @property {CKEDITOR.dom.element} _notificationMargin
-	 */
-
-	/**
-	 * Event buffer object for UI events to optimize performance.
-	 *
-	 * @private
-	 * @property {Object} _uiBuffer
-	 */
-
-	/**
-	 * Event buffer object for editor change events to optimize performance.
-	 *
-	 * @private
-	 * @property {Object} _changeBuffer
-	 */
-
-	Area.prototype = {
-		/**
-		 * Adds the notification to the notification area. If it is the first notification, the area will also be attached to
-		 * the document and listeners will be attached.
-		 *
-		 * Note that the proper way to show a notification is to call the {@link CKEDITOR.plugins.notification#show} method.
-		 *
-		 * @param {CKEDITOR.plugins.notification} notification Notification to add.
-		 */
-		add: function( notification ) {
-			this.notifications.push( notification );
-
-			this.element.append( notification.element );
-
-			if ( this.element.getChildCount() == 1 ) {
-				CKEDITOR.document.getBody().append( this.element );
-				this._attachListeners();
-			}
-
-			this._layout();
-		},
-
-		/**
-		 * Removes the notification from the notification area. If it is the last notification, the area will also be
-		 * detached from the document and listeners will be detached.
-		 *
-		 * Note that the proper way to hide a notification is to call the {@link CKEDITOR.plugins.notification#hide} method.
-		 *
-		 * @param {CKEDITOR.plugins.notification} notification Notification to remove.
-		 */
-		remove: function( notification ) {
-			var i = CKEDITOR.tools.indexOf( this.notifications, notification );
-
-			if ( i < 0 ) {
-				return;
-			}
-
-			this.notifications.splice( i, 1 );
-
-			notification.element.remove();
-
-			if ( !this.element.getChildCount() ) {
-				this._removeListeners();
-				this.element.remove();
-			}
-		},
-
-		/**
-		 * Creates the notification area element.
-		 *
-		 * @private
-		 * @returns {CKEDITOR.dom.element} Notification area element.
-		 */
-		_createElement: function() {
-			var editor = this.editor,
-				config = editor.config,
-				notificationArea = new CKEDITOR.dom.element( 'div' );
-
-			notificationArea.addClass( 'cke_notifications_area' );
-			notificationArea.setAttribute( 'id', 'cke_notifications_area_' + editor.name );
-			notificationArea.setStyle( 'z-index', config.baseFloatZIndex - 2 );
-
-			return notificationArea;
-		},
-
-		/**
-		 * Attaches listeners to the notification area.
-		 *
-		 * @private
-		 */
-		_attachListeners: function() {
-			var win = CKEDITOR.document.getWindow(),
-				editor = this.editor;
-
-			win.on( 'scroll', this._uiBuffer.input );
-			win.on( 'resize', this._uiBuffer.input );
-			editor.on( 'change', this._changeBuffer.input );
-			editor.on( 'floatingSpaceLayout', this._layout, this, null, 20 );
-			editor.on( 'blur', this._layout, this, null, 20 );
-		},
-
-		/**
-		 * Detaches listeners from the notification area.
-		 *
-		 * @private
-		 */
-		_removeListeners: function() {
-			var win = CKEDITOR.document.getWindow(),
-				editor = this.editor;
-
-			win.removeListener( 'scroll', this._uiBuffer.input );
-			win.removeListener( 'resize', this._uiBuffer.input );
-			editor.removeListener( 'change', this._changeBuffer.input );
-			editor.removeListener( 'floatingSpaceLayout', this._layout );
-			editor.removeListener( 'blur', this._layout );
-		},
-
-		/**
-		 * Sets the position of the notification area based on the editor content, toolbar as well as
-		 * viewport position and dimensions.
-		 *
-		 * @private
-		 */
-		_layout: function() {
-			var area = this.element,
-				editor = this.editor,
-				contentsRect = editor.ui.contentsElement.getClientRect(),
-				contentsPos = editor.ui.contentsElement.getDocumentPosition(),
-				top,
-				topRect,
-				areaRect = area.getClientRect(),
-				notification,
-				notificationWidth = this._notificationWidth,
-				notificationMargin = this._notificationMargin,
-				win = CKEDITOR.document.getWindow(),
-				scrollPos = win.getScrollPosition(),
-				viewRect = win.getViewPaneSize(),
-				body = CKEDITOR.document.getBody(),
-				bodyPos = body.getDocumentPosition(),
-				cssLength = CKEDITOR.tools.cssLength;
-
-			// Cache for optimization
-			if ( !notificationWidth || !notificationMargin ) {
-				notification = this.element.getChild( 0 );
-				notificationWidth = this._notificationWidth = notification.getClientRect().width;
-				notificationMargin = this._notificationMargin =
-					parseInt( notification.getComputedStyle( 'margin-left' ), 10 ) +
-					parseInt( notification.getComputedStyle( 'margin-right' ), 10 );
-			}
-
-			// Check if toolbar exist and if so, then assign values to it (#491).
-			if ( editor.toolbar ) {
-				top = editor.ui.space( 'top' );
-				topRect = top.getClientRect();
-			}
-
-
-			// --------------------------------------- Horizontal layout ----------------------------------------
-
-			// +---Viewport-------------------------------+          +---Viewport-------------------------------+
-			// |                                          |          |                                          |
-			// | +---Toolbar----------------------------+ |          | +---Content----------------------------+ |
-			// | |                                      | |          | |                                      | |
-			// | +---Content----------------------------+ |          | |                                      | |
-			// | |                                      | |          | +---Toolbar----------------------+     | |
-			// | |      +------Notification------+      | |          | |                                |     | |
-			// | |                                      | |    OR    | +--------------------------------+     | |
-			// | |                                      | |          | |                                      | |
-			// | |                                      | |          | |      +------Notification------+      | |
-			// | |                                      | |          | |                                      | |
-			// | |                                      | |          | |                                      | |
-			// | +--------------------------------------+ |          | +--------------------------------------+ |
-			// +------------------------------------------+          +------------------------------------------+
-			if ( top && top.isVisible() &&
-				topRect.bottom > contentsRect.top &&
-				topRect.bottom < contentsRect.bottom - areaRect.height ) {
-				setBelowToolbar();
-
-			// +---Viewport-------------------------------+
-			// |                                          |
-			// | +---Content----------------------------+ |
-			// | |                                      | |
-			// | |      +------Notification------+      | |
-			// | |                                      | |
-			// | |                                      | |
-			// | |                                      | |
-			// | +--------------------------------------+ |
-			// |                                          |
-			// +------------------------------------------+
-			} else if ( contentsRect.top > 0 ) {
-				setTopStandard();
-
-			//   +---Content----------------------------+
-			//   |                                      |
-			// +---Viewport-------------------------------+
-			// | |                                      | |
-			// | |      +------Notification------+      | |
-			// | |                                      | |
-			// | |                                      | |
-			// | |                                      | |
-			// | +--------------------------------------+ |
-			// |                                          |
-			// +------------------------------------------+
-			} else if ( contentsPos.y + contentsRect.height - areaRect.height > scrollPos.y ) {
-				setTopFixed();
-
-			//   +---Content----------------------------+              +---Content----------------------------+
-			//   |                                      |              |                                      |
-			//   |                                      |              |                                      |
-			//   |                                      |              |      +------Notification------+      |
-			//   |                                      |              |                                      |
-			//   |                                      |      OR      +--------------------------------------+
-			// +---Viewport-------------------------------+
-			// | |      +------Notification------+      | |          +---Viewport-------------------------------+
-			// | |                                      | |          |                                          |
-			// | +--------------------------------------+ |          |                                          |
-			// |                                          |          |                                          |
-			// +------------------------------------------+          +------------------------------------------+
-			} else {
-				setBottom();
-			}
-
-			function setTopStandard() {
-				area.setStyles( {
-					position: 'absolute',
-					top: cssLength( contentsPos.y )
-				} );
-			}
-
-			function setBelowToolbar() {
-				area.setStyles( {
-					position: 'fixed',
-					top: cssLength( topRect.bottom )
-				} );
-			}
-
-			function setTopFixed() {
-				area.setStyles( {
-					position: 'fixed',
-					top: 0
-				} );
-			}
-
-			function setBottom() {
-				area.setStyles( {
-					position: 'absolute',
-					top: cssLength( contentsPos.y + contentsRect.height - areaRect.height )
-				} );
-			}
-
-			// ---------------------------------------- Vertical layout -----------------------------------------
-
-			var leftBase = area.getStyle( 'position' ) == 'fixed' ?
-				contentsRect.left :
-				body.getComputedStyle( 'position' ) != 'static' ? contentsPos.x - bodyPos.x : contentsPos.x;
-
-			// Content is narrower than notification
-			if ( contentsRect.width < notificationWidth + notificationMargin ) {
-
-				// +---Viewport-------------------------------+
-				// |                                          |
-				// |                 +---Content------------+ |
-				// |                 |                      | |
-				// |             +------Notification------+ | |
-				// |                 |                      | |
-				// |                 +----------------------+ |
-				// |                                          |
-				// +------------------------------------------+
-				if ( contentsPos.x + notificationWidth + notificationMargin > scrollPos.x + viewRect.width ) {
-					setRight();
-
-				// +---Viewport-------------------------------+               +---Viewport--------------------------+
-				// |                                          |               |                                     |
-				// |     +---Content------------+             |            +---Content------------+                 |
-				// |     |                      |             |            |  |                   |                 |
-				// |     | +------Notification------+         |    OR      | +------Notification------+             |
-				// |     |                      |             |            |  |                   |                 |
-				// |     +----------------------+             |            +----------------------+                 |
-				// |                                          |               |                                     |
-				// +------------------------------------------+               +-------------------------------------+
-				} else {
-					setLeft();
-				}
-
-			// Content is wider than notification.
-			} else {
-
-				//                       +--+Viewport+------------------------+
-				//                       |                                    |
-				//                       |             +---Content-----------------------------------------+
-				//                       |             |                      |                            |
-				//                       |             | +-----+Notification+-----+                        |
-				//                       |             |                      |                            |
-				//                       |             |                      |                            |
-				//                       |             |                      |                            |
-				//                       |             +---------------------------------------------------+
-				//                       |                                    |
-				//                       +------------------------------------+
-				if ( contentsPos.x + notificationWidth + notificationMargin > scrollPos.x + viewRect.width ) {
-					setLeft();
-
-				//                       +---Viewport-------------------------+
-				//                       |                                    |
-				//                       |  +---Content----------------------------------------------+
-				//                       |  |                                 |                      |
-				//                       |  |      +------Notification------+ |                      |
-				//                       |  |                                 |                      |
-				//                       |  |                                 |                      |
-				//                       |  +--------------------------------------------------------+
-				//                       |                                    |
-				//                       +------------------------------------+
-				} else if ( contentsPos.x + contentsRect.width / 2 +
-					notificationWidth / 2 + notificationMargin > scrollPos.x + viewRect.width ) {
-					setRightFixed();
-
-				//                       +---Viewport-------------------------+
-				//                       |                                    |
-				//   +---Content----------------------------+                 |
-				//   |                   |                  |                 |
-				//   |           +------Notification------+ |                 |
-				//   |                   |                  |                 |
-				//   |                   |                  |                 |
-				//   +--------------------------------------+                 |
-				//                       |                                    |
-				//                       +------------------------------------+
-				} else if ( contentsRect.left + contentsRect.width - notificationWidth - notificationMargin < 0 ) {
-					setRight();
-
-				//                       +---Viewport-------------------------+
-				//                       |                                    |
-				// +---Content---------------------------------------------+  |
-				// |                     |                                 |  |
-				// |                     | +------Notification------+      |  |
-				// |                     |                                 |  |
-				// |                     |                                 |  |
-				// +-------------------------------------------------------+  |
-				//                       |                                    |
-				//                       +------------------------------------+
-				} else if ( contentsRect.left + contentsRect.width / 2 - notificationWidth / 2 < 0 ) {
-					setLeftFixed();
-
-				//                       +---Viewport-------------------------+
-				//                       |                                    |
-				//                       | +---Content----------------------+ |
-				//                       | |                                | |
-				//                       | |    +-----Notification-----+    | |
-				//                       | |                                | |
-				//                       | |                                | |
-				//                       | +--------------------------------+ |
-				//                       |                                    |
-				//                       +------------------------------------+
-				} else {
-					setCenter();
-				}
-			}
-
-			function setLeft() {
-				area.setStyle( 'left', cssLength( leftBase ) );
-			}
-
-			function setLeftFixed() {
-				area.setStyle( 'left', cssLength( leftBase - contentsPos.x + scrollPos.x ) );
-			}
-
-			function setCenter() {
-				area.setStyle( 'left', cssLength( leftBase + contentsRect.width / 2 - notificationWidth / 2 - notificationMargin / 2 ) );
-			}
-
-			function setRight() {
-				area.setStyle( 'left', cssLength( leftBase + contentsRect.width - notificationWidth - notificationMargin ) );
-			}
-
-			function setRightFixed() {
-				area.setStyle( 'left', cssLength( leftBase - contentsPos.x + scrollPos.x + viewRect.width -
-					notificationWidth - notificationMargin ) );
-			}
-		}
-	};
-
-	CKEDITOR.plugins.notification = Notification;
-
-	/**
-	 * After how many milliseconds the notification of the `info` and `success`
-	 * {@link CKEDITOR.plugins.notification#type type} should close automatically.
-	 * `0` means that notifications will not close automatically.
-	 * Note that `warning` and `progress` notifications will never close automatically.
-	 *
-	 * Refer to the [Notifications](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_notifications.html) article
-	 * for more information about this feature.
-	 *
-	 * @since 4.5.0
-	 * @cfg {Number} [notification_duration=5000]
-	 * @member CKEDITOR.config
-	 */
-
-	/**
-	 * Event fired when the {@link CKEDITOR.plugins.notification#show} method is called, before the
-	 * notification is shown. If this event is canceled, the notification will not be shown.
-	 *
-	 * Using this event allows you to fully customize how a notification will be shown. It may be used to integrate
-	 * the CKEditor notification system with your web page notifications.
-	 *
-	 * @since 4.5.0
-	 * @event notificationShow
-	 * @member CKEDITOR.editor
-	 * @param data
-	 * @param {CKEDITOR.plugins.notification} data.notification Notification which will be shown.
-	 * @param {CKEDITOR.editor} editor The editor instance.
-	 */
-
-	/**
-	 * Event fired when the {@link CKEDITOR.plugins.notification#update} method is called, before the
-	 * notification is updated. If this event is canceled, the notification will not be shown even if the update was important,
-	 * but the object will be updated anyway. Note that canceling this event does not prevent updating {@link #element}
-	 * attributes, but if {@link #notificationShow} was canceled as well, this element is detached from the DOM.
-	 *
-	 * Using this event allows you to fully customize how a notification will be updated. It may be used to integrate
-	 * the CKEditor notification system with your web page notifications.
-	 *
-	 * @since 4.5.0
-	 * @event notificationUpdate
-	 * @member CKEDITOR.editor
-	 * @param data
-	 * @param {CKEDITOR.plugins.notification} data.notification Notification which will be updated.
-	 * Note that it contains the data that has not been updated yet.
-	 * @param {Object} data.options Update options, see {@link CKEDITOR.plugins.notification#update}.
-	 * @param {CKEDITOR.editor} editor The editor instance.
-	 */
-
-	/**
-	 * Event fired when the {@link CKEDITOR.plugins.notification#hide} method is called, before the
-	 * notification is hidden. If this event is canceled, the notification will not be hidden.
-	 *
-	 * Using this event allows you to fully customize how a notification will be hidden. It may be used to integrate
-	 * the CKEditor notification system with your web page notifications.
-	 *
-	 * @since 4.5.0
-	 * @event notificationHide
-	 * @member CKEDITOR.editor
-	 * @param data
-	 * @param {CKEDITOR.plugins.notification} data.notification Notification which will be hidden.
-	 * @param {CKEDITOR.editor} editor The editor instance.
-	 */
-
-} )();
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/images/handle.png b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/images/handle.png
deleted file mode 100644
index ba8cda5b..00000000
Binary files a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/images/handle.png and /dev/null differ
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/de.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/de.js
deleted file mode 100644
index 2c1a1d04..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-CKEDITOR.plugins.setLang( 'widget', 'de', {
-	'move': 'Zum Verschieben anwählen und ziehen',
-	'label': '%1 Steuerelement'
-} );
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/en.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/en.js
deleted file mode 100644
index fd02491a..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/lang/en.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-CKEDITOR.plugins.setLang( 'widget', 'en', {
-	'move': 'Click and drag to move',
-	'label': '%1 widget'
-} );
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/plugin.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/plugin.js
deleted file mode 100644
index 105cb503..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widget/plugin.js
+++ /dev/null
@@ -1,4371 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @fileOverview [Widget](https://ckeditor.com/cke4/addon/widget) plugin.
- */
-
-'use strict';
-
-( function() {
-	var DRAG_HANDLER_SIZE = 15;
-
-	CKEDITOR.plugins.add( 'widget', {
-		// jscs:disable maximumLineLength
-		lang: 'af,ar,az,bg,ca,cs,cy,da,de,de-ch,el,en,en-au,en-gb,eo,es,es-mx,et,eu,fa,fi,fr,gl,he,hr,hu,id,it,ja,km,ko,ku,lv,nb,nl,no,oc,pl,pt,pt-br,ro,ru,sk,sl,sq,sr,sr-latn,sv,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
-		// jscs:enable maximumLineLength
-		requires: 'lineutils,clipboard,widgetselection',
-		onLoad: function() {
-			// Widgets require querySelectorAll for proper work (#1319).
-			if ( CKEDITOR.document.$.querySelectorAll === undefined ) {
-				return;
-			}
-			CKEDITOR.addCss(
-				'.cke_widget_wrapper{' +
-					'position:relative;' +
-					'outline:none' +
-				'}' +
-				'.cke_widget_inline{' +
-					'display:inline-block' +
-				'}' +
-				'.cke_widget_wrapper:hover>.cke_widget_element{' +
-					'outline:2px solid #ffd25c;' +
-					'cursor:default' +
-				'}' +
-				'.cke_widget_wrapper:hover .cke_widget_editable{' +
-					'outline:2px solid #ffd25c' +
-				'}' +
-				'.cke_widget_wrapper.cke_widget_focused>.cke_widget_element,' +
-				// We need higher specificity than hover style.
-				'.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{' +
-					'outline:2px solid #47a4f5' +
-				'}' +
-				'.cke_widget_editable{' +
-					'cursor:text' +
-				'}' +
-				'.cke_widget_drag_handler_container{' +
-					'position:absolute;' +
-					'width:' + DRAG_HANDLER_SIZE + 'px;' +
-					'height:0;' +
-					// Initially drag handler should not be visible, until its position will be
-					// calculated (https://dev.ckeditor.com/ticket/11177).
-					// We need to hide unpositined handlers, so they don't extend
-					// widget's outline far to the left (https://dev.ckeditor.com/ticket/12024).
-					'display:none;' +
-					'opacity:0.75;' +
-					'transition:height 0s 0.2s;' + // Delay hiding drag handler.
-					// Prevent drag handler from being misplaced (https://dev.ckeditor.com/ticket/11198).
-					'line-height:0' +
-				'}' +
-				'.cke_widget_wrapper:hover>.cke_widget_drag_handler_container{' +
-					'height:' + DRAG_HANDLER_SIZE + 'px;' +
-					'transition:none' +
-				'}' +
-				'.cke_widget_drag_handler_container:hover{' +
-					'opacity:1' +
-				'}' +
-				'img.cke_widget_drag_handler{' +
-					'cursor:move;' +
-					'width:' + DRAG_HANDLER_SIZE + 'px;' +
-					'height:' + DRAG_HANDLER_SIZE + 'px;' +
-					'display:inline-block' +
-				'}' +
-				'.cke_widget_mask{' +
-					'position:absolute;' +
-					'top:0;' +
-					'left:0;' +
-					'width:100%;' +
-					'height:100%;' +
-					'display:block' +
-				'}' +
-				'.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{' +
-					'cursor:move !important' +
-				'}'
-			);
-
-			addCustomStyleHandler();
-		},
-
-		beforeInit: function( editor ) {
-			// Widgets require querySelectorAll for proper work (#1319).
-			if ( CKEDITOR.document.$.querySelectorAll === undefined ) {
-				return;
-			}
-			/**
-			 * An instance of widget repository. It contains all
-			 * {@link CKEDITOR.plugins.widget.repository#registered registered widget definitions} and
-			 * {@link CKEDITOR.plugins.widget.repository#instances initialized instances}.
-			 *
-			 *		editor.widgets.add( 'someName', {
-			 *			// Widget definition...
-			 *		} );
-			 *
-			 *		editor.widgets.registered.someName; // -> Widget definition
-			 *
-			 * @since 4.3
-			 * @readonly
-			 * @property {CKEDITOR.plugins.widget.repository} widgets
-			 * @member CKEDITOR.editor
-			 */
-			editor.widgets = new Repository( editor );
-		},
-
-		afterInit: function( editor ) {
-			// Widgets require querySelectorAll for proper work (#1319).
-			if ( CKEDITOR.document.$.querySelectorAll === undefined ) {
-				return;
-			}
-			addWidgetButtons( editor );
-			setupContextMenu( editor );
-		}
-	} );
-
-	/**
-	 * Widget repository. It keeps track of all {@link #registered registered widget definitions} and
-	 * {@link #instances initialized instances}. An instance of the repository is available under
-	 * the {@link CKEDITOR.editor#widgets} property.
-	 *
-	 * @class CKEDITOR.plugins.widget.repository
-	 * @mixins CKEDITOR.event
-	 * @constructor Creates a widget repository instance. Note that the widget plugin automatically
-	 * creates a repository instance which is available under the {@link CKEDITOR.editor#widgets} property.
-	 * @param {CKEDITOR.editor} editor The editor instance for which the repository will be created.
-	 */
-	function Repository( editor ) {
-		/**
-		 * The editor instance for which this repository was created.
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.editor} editor
-		 */
-		this.editor = editor;
-
-		/**
-		 * A hash of registered widget definitions (definition name => {@link CKEDITOR.plugins.widget.definition}).
-		 *
-		 * To register a definition use the {@link #add} method.
-		 *
-		 * @readonly
-		 */
-		this.registered = {};
-
-		/**
-		 * An object containing initialized widget instances (widget id => {@link CKEDITOR.plugins.widget}).
-		 *
-		 * @readonly
-		 */
-		this.instances = {};
-
-		/**
-		 * An array of selected widget instances.
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.plugins.widget[]} selected
-		 */
-		this.selected = [];
-
-		/**
-		 * The focused widget instance. See also {@link CKEDITOR.plugins.widget#event-focus}
-		 * and {@link CKEDITOR.plugins.widget#event-blur} events.
-		 *
-		 *		editor.on( 'selectionChange', function() {
-		 *			if ( editor.widgets.focused ) {
-		 *				// Do something when a widget is focused...
-		 *			}
-		 *		} );
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.plugins.widget} focused
-		 */
-		this.focused = null;
-
-		/**
-		 * The widget instance that contains the nested editable which is currently focused.
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.plugins.widget} widgetHoldingFocusedEditable
-		 */
-		this.widgetHoldingFocusedEditable = null;
-
-		this._ = {
-			nextId: 0,
-			upcasts: [],
-			upcastCallbacks: [],
-			filters: {}
-		};
-
-		setupWidgetsLifecycle( this );
-		setupSelectionObserver( this );
-		setupMouseObserver( this );
-		setupKeyboardObserver( this );
-		setupDragAndDrop( this );
-		setupNativeCutAndCopy( this );
-	}
-
-	Repository.prototype = {
-		/**
-		 * Minimum interval between selection checks.
-		 *
-		 * @private
-		 */
-		MIN_SELECTION_CHECK_INTERVAL: 500,
-
-		/**
-		 * Adds a widget definition to the repository. Fires the {@link CKEDITOR.editor#widgetDefinition} event
-		 * which allows to modify the widget definition which is going to be registered.
-		 *
-		 * @param {String} name The name of the widget definition.
-		 * @param {CKEDITOR.plugins.widget.definition} widgetDef Widget definition.
-		 * @returns {CKEDITOR.plugins.widget.definition}
-		 */
-		add: function( name, widgetDef ) {
-			// Create prototyped copy of original widget definition, so we won't modify it.
-			widgetDef = CKEDITOR.tools.prototypedCopy( widgetDef );
-			widgetDef.name = name;
-
-			widgetDef._ = widgetDef._ || {};
-
-			this.editor.fire( 'widgetDefinition', widgetDef );
-
-			if ( widgetDef.template )
-				widgetDef.template = new CKEDITOR.template( widgetDef.template );
-
-			addWidgetCommand( this.editor, widgetDef );
-			addWidgetProcessors( this, widgetDef );
-
-			this.registered[ name ] = widgetDef;
-
-			return widgetDef;
-		},
-
-		/**
-		 * Adds a callback for element upcasting. Each callback will be executed
-		 * for every element which is later tested by upcast methods. If a callback
-		 * returns `false`, the element will not be upcasted.
-		 *
-		 *		// Images with the "banner" class will not be upcasted (e.g. to the image widget).
-		 *		editor.widgets.addUpcastCallback( function( element ) {
-		 *			if ( element.name == 'img' && element.hasClass( 'banner' ) )
-		 *				return false;
-		 *		} );
-		 *
-		 * @param {Function} callback
-		 * @param {CKEDITOR.htmlParser.element} callback.element
-		 */
-		addUpcastCallback: function( callback ) {
-			this._.upcastCallbacks.push( callback );
-		},
-
-		/**
-		 * Checks the selection to update widget states (selection and focus).
-		 *
-		 * This method is triggered by the {@link #event-checkSelection} event.
-		 */
-		checkSelection: function() {
-			var sel = this.editor.getSelection(),
-				selectedElement = sel.getSelectedElement(),
-				updater = stateUpdater( this ),
-				widget;
-
-			// Widget is focused so commit and finish checking.
-			if ( selectedElement && ( widget = this.getByElement( selectedElement, true ) ) )
-				return updater.focus( widget ).select( widget ).commit();
-
-			var range = sel.getRanges()[ 0 ];
-
-			// No ranges or collapsed range mean that nothing is selected, so commit and finish checking.
-			if ( !range || range.collapsed )
-				return updater.commit();
-
-			// Range is not empty, so create walker checking for wrappers.
-			var walker = new CKEDITOR.dom.walker( range ),
-				wrapper;
-
-			walker.evaluator = Widget.isDomWidgetWrapper;
-
-			while ( ( wrapper = walker.next() ) )
-				updater.select( this.getByElement( wrapper ) );
-
-			updater.commit();
-		},
-
-		/**
-		 * Checks if all widget instances are still present in the DOM.
-		 * Destroys those instances that are not present.
-		 * Reinitializes widgets on widget wrappers for which widget instances
-		 * cannot be found. Takes nested widgets into account, too.
-		 *
-		 * This method triggers the {@link #event-checkWidgets} event whose listeners
-		 * can cancel the method's execution or modify its options.
-		 *
-		 * @param [options] The options object.
-		 * @param {Boolean} [options.initOnlyNew] Initializes widgets only on newly wrapped
-		 * widget elements (those which still have the `cke_widget_new` class). When this option is
-		 * set to `true`, widgets which were invalidated (e.g. by replacing with a cloned DOM structure)
-		 * will not be reinitialized. This makes the check faster.
-		 * @param {Boolean} [options.focusInited] If only one widget is initialized by
-		 * the method, it will be focused.
-		 */
-		checkWidgets: function( options ) {
-			this.fire( 'checkWidgets', CKEDITOR.tools.copy( options || {} ) );
-		},
-
-		/**
-		 * Removes the widget from the editor and moves the selection to the closest
-		 * editable position if the widget was focused before.
-		 *
-		 * @param {CKEDITOR.plugins.widget} widget The widget instance to be deleted.
-		 */
-		del: function( widget ) {
-			if ( this.focused === widget ) {
-				var editor = widget.editor,
-					range = editor.createRange(),
-					found;
-
-				// If haven't found place for caret on the default side,
-				// try to find it on the other side.
-				if ( !( found = range.moveToClosestEditablePosition( widget.wrapper, true ) ) )
-					found = range.moveToClosestEditablePosition( widget.wrapper, false );
-
-				if ( found )
-					editor.getSelection().selectRanges( [ range ] );
-			}
-
-			widget.wrapper.remove();
-			this.destroy( widget, true );
-		},
-
-		/**
-		 * Destroys the widget instance and all its nested widgets (widgets inside its nested editables).
-		 *
-		 * @param {CKEDITOR.plugins.widget} widget The widget instance to be destroyed.
-		 * @param {Boolean} [offline] Whether the widget is offline (detached from the DOM tree) &mdash;
-		 * in this case the DOM (attributes, classes, etc.) will not be cleaned up.
-		 */
-		destroy: function( widget, offline ) {
-			if ( this.widgetHoldingFocusedEditable === widget )
-				setFocusedEditable( this, widget, null, offline );
-
-			widget.destroy( offline );
-			delete this.instances[ widget.id ];
-			this.fire( 'instanceDestroyed', widget );
-		},
-
-		/**
-		 * Destroys all widget instances.
-		 *
-		 * @param {Boolean} [offline] Whether the widgets are offline (detached from the DOM tree) &mdash;
-		 * in this case the DOM (attributes, classes, etc.) will not be cleaned up.
-		 * @param {CKEDITOR.dom.element} [container] The container within widgets will be destroyed.
-		 * This option will be ignored if the `offline` flag was set to `true`, because in such case
-		 * it is not possible to find widgets within the passed block.
-		 */
-		destroyAll: function( offline, container ) {
-			var widget,
-				id,
-				instances = this.instances;
-
-			if ( container && !offline ) {
-				var wrappers = container.find( '.cke_widget_wrapper' ),
-					l = wrappers.count(),
-					i = 0;
-
-				// Length is constant, because this is not a live node list.
-				// Note: since querySelectorAll returns nodes in document order,
-				// outer widgets are always placed before their nested widgets and therefore
-				// are destroyed before them.
-				for ( ; i < l; ++i ) {
-					widget = this.getByElement( wrappers.getItem( i ), true );
-					// Widget might not be found, because it could be a nested widget,
-					// which would be destroyed when destroying its parent.
-					if ( widget )
-						this.destroy( widget );
-				}
-
-				return;
-			}
-
-			for ( id in instances ) {
-				widget = instances[ id ];
-				this.destroy( widget, offline );
-			}
-		},
-
-		/**
-		 * Finalizes a process of widget creation. This includes:
-		 *
-		 * * inserting widget element into editor,
-		 * * marking widget instance as ready (see {@link CKEDITOR.plugins.widget#event-ready}),
-		 * * focusing widget instance.
-		 *
-		 * This method is used by the default widget's command and is called
-		 * after widget's dialog (if set) is closed. It may also be used in a
-		 * customized process of widget creation and insertion.
-		 *
-		 *		widget.once( 'edit', function() {
-		 *			// Finalize creation only of not ready widgets.
-		 *			if ( widget.isReady() )
-		 *				return;
-		 *
-		 *			// Cancel edit event to prevent automatic widget insertion.
-		 *			evt.cancel();
-		 *
-		 *			CustomDialog.open( widget.data, function saveCallback( savedData ) {
-		 *				// Cache the container, because widget may be destroyed while saving data,
-		 *				// if this process will require some deep transformations.
-		 *				var container = widget.wrapper.getParent();
-		 *
-		 *				widget.setData( savedData );
-		 *
-		 *				// Widget will be retrieved from container and inserted into editor.
-		 *				editor.widgets.finalizeCreation( container );
-		 *			} );
-		 *		} );
-		 *
-		 * @param {CKEDITOR.dom.element/CKEDITOR.dom.documentFragment} container The element
-		 * or document fragment which contains widget wrapper. The container is used, so before
-		 * finalizing creation the widget can be freely transformed (even destroyed and reinitialized).
-		 */
-		finalizeCreation: function( container ) {
-			var wrapper = container.getFirst();
-			if ( wrapper && Widget.isDomWidgetWrapper( wrapper ) ) {
-				this.editor.insertElement( wrapper );
-
-				var widget = this.getByElement( wrapper );
-				// Fire postponed #ready event.
-				widget.ready = true;
-				widget.fire( 'ready' );
-				widget.focus();
-			}
-		},
-
-		/**
-		 * Finds a widget instance which contains a given element. The element will be the {@link CKEDITOR.plugins.widget#wrapper wrapper}
-		 * of the returned widget or a descendant of this {@link CKEDITOR.plugins.widget#wrapper wrapper}.
-		 *
-		 *		editor.widgets.getByElement( someWidget.wrapper ); // -> someWidget
-		 *		editor.widgets.getByElement( someWidget.parts.caption ); // -> someWidget
-		 *
-		 *		// Check wrapper only:
-		 *		editor.widgets.getByElement( someWidget.wrapper, true ); // -> someWidget
-		 *		editor.widgets.getByElement( someWidget.parts.caption, true ); // -> null
-		 *
-		 * @param {CKEDITOR.dom.element} element The element to be checked.
-		 * @param {Boolean} [checkWrapperOnly] If set to `true`, the method will not check wrappers' descendants.
-		 * @returns {CKEDITOR.plugins.widget} The widget instance or `null`.
-		 */
-		getByElement: ( function() {
-			var validWrapperElements = { div: 1, span: 1 };
-			function getWidgetId( element ) {
-				return element.is( validWrapperElements ) && element.data( 'cke-widget-id' );
-			}
-
-			return function( element, checkWrapperOnly ) {
-				if ( !element )
-					return null;
-
-				var id = getWidgetId( element );
-
-				// There's no need to check element parents if element is a wrapper.
-				if ( !checkWrapperOnly && !id ) {
-					var limit = this.editor.editable();
-
-					// Try to find a closest ascendant which is a widget wrapper.
-					do {
-						element = element.getParent();
-					} while ( element && !element.equals( limit ) && !( id = getWidgetId( element ) ) );
-				}
-
-				return this.instances[ id ] || null;
-			};
-		} )(),
-
-		/**
-		 * Initializes a widget on a given element if the widget has not been initialized on it yet.
-		 *
-		 * @param {CKEDITOR.dom.element} element The future widget element.
-		 * @param {String/CKEDITOR.plugins.widget.definition} [widgetDef] Name of a widget or a widget definition.
-		 * The widget definition should be previously registered by using the
-		 * {@link CKEDITOR.plugins.widget.repository#add} method.
-		 * @param [startupData] Widget startup data (has precedence over default one).
-		 * @returns {CKEDITOR.plugins.widget} The widget instance or `null` if a widget could not be initialized on
-		 * a given element.
-		 */
-		initOn: function( element, widgetDef, startupData ) {
-			if ( !widgetDef )
-				widgetDef = this.registered[ element.data( 'widget' ) ];
-			else if ( typeof widgetDef == 'string' )
-				widgetDef = this.registered[ widgetDef ];
-
-			if ( !widgetDef )
-				return null;
-
-			// Wrap element if still wasn't wrapped (was added during runtime by method that skips dataProcessor).
-			var wrapper = this.wrapElement( element, widgetDef.name );
-
-			if ( wrapper ) {
-				// Check if widget wrapper is new (widget hasn't been initialized on it yet).
-				// This class will be removed by widget constructor to avoid locking snapshot twice.
-				if ( wrapper.hasClass( 'cke_widget_new' ) ) {
-					var widget = new Widget( this, this._.nextId++, element, widgetDef, startupData );
-
-					// Widget could be destroyed when initializing it.
-					if ( widget.isInited() ) {
-						this.instances[ widget.id ] = widget;
-
-						return widget;
-					} else {
-						return null;
-					}
-				}
-
-				// Widget already has been initialized, so try to get widget by element.
-				// Note - it may happen that other instance will returned than the one created above,
-				// if for example widget was destroyed and reinitialized.
-				return this.getByElement( element );
-			}
-
-			// No wrapper means that there's no widget for this element.
-			return null;
-		},
-
-		/**
-		 * Initializes widgets on all elements which were wrapped by {@link #wrapElement} and
-		 * have not been initialized yet.
-		 *
-		 * @param {CKEDITOR.dom.element} [container=editor.editable()] The container which will be checked for not
-		 * initialized widgets. Defaults to editor's {@link CKEDITOR.editor#editable editable} element.
-		 * @returns {CKEDITOR.plugins.widget[]} Array of widget instances which have been initialized.
-		 * Note: Only first-level widgets are returned &mdash; without nested widgets.
-		 */
-		initOnAll: function( container ) {
-			var newWidgets = ( container || this.editor.editable() ).find( '.cke_widget_new' ),
-				newInstances = [],
-				instance;
-
-			for ( var i = newWidgets.count(); i--; ) {
-				instance = this.initOn( newWidgets.getItem( i ).getFirst( Widget.isDomWidgetElement ) );
-				if ( instance )
-					newInstances.push( instance );
-			}
-
-			return newInstances;
-		},
-
-		/**
-		 * Allows to listen to events on specific types of widgets, even if they are not created yet.
-		 *
-		 * Please note that this method inherits parameters from the {@link CKEDITOR.event#method-on} method with one
-		 * extra parameter at the beginning which is the widget name.
-		 *
-		 *		editor.widgets.onWidget( 'image', 'action', function( evt ) {
-		 *			// Event `action` occurs on `image` widget.
-		 *		} );
-		 *
-		 * @since 4.5
-		 * @param {String} widgetName
-		 * @param {String} eventName
-		 * @param {Function} listenerFunction
-		 * @param {Object} [scopeObj]
-		 * @param {Object} [listenerData]
-		 * @param {Number} [priority=10]
-		 */
-		onWidget: function( widgetName ) {
-			var args = Array.prototype.slice.call( arguments );
-
-			args.shift();
-
-			for ( var i in this.instances ) {
-				var instance = this.instances[ i ];
-
-				if ( instance.name == widgetName ) {
-					instance.on.apply( instance, args );
-				}
-			}
-
-			this.on( 'instanceCreated', function( evt ) {
-				var widget = evt.data;
-
-				if ( widget.name == widgetName ) {
-					widget.on.apply( widget, args );
-				}
-			} );
-		},
-
-		/**
-		 * Parses element classes string and returns an object
-		 * whose keys contain class names. Skips all `cke_*` classes.
-		 *
-		 * This method is used by the {@link CKEDITOR.plugins.widget#getClasses} method and
-		 * may be used when overriding that method.
-		 *
-		 * @since 4.4
-		 * @param {String} classes String (value of `class` attribute).
-		 * @returns {Object} Object containing classes or `null` if no classes found.
-		 */
-		parseElementClasses: function( classes ) {
-			if ( !classes )
-				return null;
-
-			classes = CKEDITOR.tools.trim( classes ).split( /\s+/ );
-
-			var cl,
-				obj = {},
-				hasClasses = 0;
-
-			while ( ( cl = classes.pop() ) ) {
-				if ( cl.indexOf( 'cke_' ) == -1 )
-					obj[ cl ] = hasClasses = 1;
-			}
-
-			return hasClasses ? obj : null;
-		},
-
-		/**
-		 * Wraps an element with a widget's non-editable container.
-		 *
-		 * If this method is called on an {@link CKEDITOR.htmlParser.element}, then it will
-		 * also take care of fixing the DOM after wrapping (the wrapper may not be allowed in element's parent).
-		 *
-		 * @param {CKEDITOR.dom.element/CKEDITOR.htmlParser.element} element The widget element to be wrapped.
-		 * @param {String} [widgetName] The name of the widget definition. Defaults to element's `data-widget`
-		 * attribute value.
-		 * @returns {CKEDITOR.dom.element/CKEDITOR.htmlParser.element} The wrapper element or `null` if
-		 * the widget definition of this name is not registered.
-		 */
-		wrapElement: function( element, widgetName ) {
-			var wrapper = null,
-				widgetDef,
-				isInline;
-
-			if ( element instanceof CKEDITOR.dom.element ) {
-				widgetName = widgetName || element.data( 'widget' );
-				widgetDef = this.registered[ widgetName ];
-
-				if ( !widgetDef )
-					return null;
-
-				// Do not wrap already wrapped element.
-				wrapper = element.getParent();
-				if ( wrapper && wrapper.type == CKEDITOR.NODE_ELEMENT && wrapper.data( 'cke-widget-wrapper' ) )
-					return wrapper;
-
-				// If attribute isn't already set (e.g. for pasted widget), set it.
-				if ( !element.hasAttribute( 'data-cke-widget-keep-attr' ) )
-					element.data( 'cke-widget-keep-attr', element.data( 'widget' ) ? 1 : 0 );
-
-				element.data( 'widget', widgetName );
-
-				isInline = isWidgetInline( widgetDef, element.getName() );
-
-				// Preserve initial and trailing space by replacing white space with &nbsp; (#605).
-				if ( isInline ) {
-					preserveSpaces( element );
-				}
-
-				wrapper = new CKEDITOR.dom.element( isInline ? 'span' : 'div' );
-				wrapper.setAttributes( getWrapperAttributes( isInline, widgetName ) );
-
-				wrapper.data( 'cke-display-name', widgetDef.pathName ? widgetDef.pathName : element.getName() );
-
-				// Replace element unless it is a detached one.
-				if ( element.getParent( true ) )
-					wrapper.replace( element );
-				element.appendTo( wrapper );
-			}
-			else if ( element instanceof CKEDITOR.htmlParser.element ) {
-				widgetName = widgetName || element.attributes[ 'data-widget' ];
-				widgetDef = this.registered[ widgetName ];
-
-				if ( !widgetDef )
-					return null;
-
-				wrapper = element.parent;
-				if ( wrapper && wrapper.type == CKEDITOR.NODE_ELEMENT && wrapper.attributes[ 'data-cke-widget-wrapper' ] )
-					return wrapper;
-
-				// If attribute isn't already set (e.g. for pasted widget), set it.
-				if ( !( 'data-cke-widget-keep-attr' in element.attributes ) )
-					element.attributes[ 'data-cke-widget-keep-attr' ] = element.attributes[ 'data-widget' ] ? 1 : 0;
-				if ( widgetName )
-					element.attributes[ 'data-widget' ] = widgetName;
-
-				isInline = isWidgetInline( widgetDef, element.name );
-
-				// Preserve initial and trailing space by replacing white space with &nbsp; (#605).
-				if ( isInline ) {
-					preserveSpaces( element );
-				}
-
-				wrapper = new CKEDITOR.htmlParser.element( isInline ? 'span' : 'div', getWrapperAttributes( isInline, widgetName ) );
-				wrapper.attributes[ 'data-cke-display-name' ] = widgetDef.pathName ? widgetDef.pathName : element.name;
-
-				var parent = element.parent,
-					index;
-
-				// Don't detach already detached element.
-				if ( parent ) {
-					index = element.getIndex();
-					element.remove();
-				}
-
-				wrapper.add( element );
-
-				// Insert wrapper fixing DOM (splitting parents if wrapper is not allowed inside them).
-				parent && insertElement( parent, index, wrapper );
-			}
-
-			return wrapper;
-		},
-
-		// Expose for tests.
-		_tests_createEditableFilter: createEditableFilter
-	};
-
-	CKEDITOR.event.implementOn( Repository.prototype );
-
-	/**
-	 * An event fired when a widget instance is created, but before it is fully initialized.
-	 *
-	 * @event instanceCreated
-	 * @param {CKEDITOR.plugins.widget} data The widget instance.
-	 */
-
-	/**
-	 * An event fired when a widget instance was destroyed.
-	 *
-	 * See also {@link CKEDITOR.plugins.widget#event-destroy}.
-	 *
-	 * @event instanceDestroyed
-	 * @param {CKEDITOR.plugins.widget} data The widget instance.
-	 */
-
-	/**
-	 * An event fired to trigger the selection check.
-	 *
-	 * See the {@link #method-checkSelection} method.
-	 *
-	 * @event checkSelection
-	 */
-
-	/**
-	 * An event fired by the the {@link #method-checkWidgets} method.
-	 *
-	 * It can be canceled in order to stop the {@link #method-checkWidgets}
-	 * method execution or the event listener can modify the method's options.
-	 *
-	 * @event checkWidgets
-	 * @param [data]
-	 * @param {Boolean} [data.initOnlyNew] Initialize widgets only on newly wrapped
-	 * widget elements (those which still have the `cke_widget_new` class). When this option is
-	 * set to `true`, widgets which were invalidated (e.g. by replacing with a cloned DOM structure)
-	 * will not be reinitialized. This makes the check faster.
-	 * @param {Boolean} [data.focusInited] If only one widget is initialized by
-	 * the method, it will be focused.
-	 */
-
-
-	/**
-	 * An instance of a widget. Together with {@link CKEDITOR.plugins.widget.repository} these
-	 * two classes constitute the core of the Widget System.
-	 *
-	 * Note that neither the repository nor the widget instances can be created by using their constructors.
-	 * A repository instance is automatically set up by the Widget plugin and is accessible under
-	 * {@link CKEDITOR.editor#widgets}, while widget instances are created and destroyed by the repository.
-	 *
-	 * To create a widget, first you need to {@link CKEDITOR.plugins.widget.repository#add register} its
-	 * {@link CKEDITOR.plugins.widget.definition definition}:
-	 *
-	 *		editor.widgets.add( 'simplebox', {
-	 *			upcast: function( element ) {
-	 *				// Defines which elements will become widgets.
-	 *				if ( element.hasClass( 'simplebox' ) )
-	 *					return true;
-	 *			},
-	 *			init: function() {
-	 *				// ...
-	 *			}
-	 *		} );
-	 *
-	 * Once the widget definition is registered, widgets will be automatically
-	 * created when loading data:
-	 *
-	 *		editor.setData( '<div class="simplebox">foo</div>', function() {
-	 *			console.log( editor.widgets.instances ); // -> An object containing one instance.
-	 *		} );
-	 *
-	 * It is also possible to create instances during runtime by using a command
-	 * (if a {@link CKEDITOR.plugins.widget.definition#template} property was defined):
-	 *
-	 *		// You can execute an automatically defined command to
-	 *		// insert a new simplebox widget or edit the one currently focused.
-	 *		editor.execCommand( 'simplebox' );
-	 *
-	 * Note: Since CKEditor 4.5 widget's `startupData` can be passed as the command argument:
-	 *
-	 *		editor.execCommand( 'simplebox', {
-	 *			startupData: {
-	 *				align: 'left'
-	 *			}
-	 *		} );
-	 *
-	 * A widget can also be created in a completely custom way:
-	 *
-	 *		var element = editor.document.createElement( 'div' );
-	 *		editor.insertElement( element );
-	 *		var widget = editor.widgets.initOn( element, 'simplebox' );
-	 *
-	 * @since 4.3
-	 * @class CKEDITOR.plugins.widget
-	 * @mixins CKEDITOR.event
-	 * @extends CKEDITOR.plugins.widget.definition
-	 * @constructor Creates an instance of the widget class. Do not use it directly, but instead initialize widgets
-	 * by using the {@link CKEDITOR.plugins.widget.repository#initOn} method or by the upcasting system.
-	 * @param {CKEDITOR.plugins.widget.repository} widgetsRepo
-	 * @param {Number} id Unique ID of this widget instance.
-	 * @param {CKEDITOR.dom.element} element The widget element.
-	 * @param {CKEDITOR.plugins.widget.definition} widgetDef Widget's registered definition.
-	 * @param [startupData] Initial widget data. This data object will overwrite the default data and
-	 * the data loaded from the DOM.
-	 */
-	function Widget( widgetsRepo, id, element, widgetDef, startupData ) {
-		var editor = widgetsRepo.editor;
-
-		// Extend this widget with widgetDef-specific methods and properties.
-		CKEDITOR.tools.extend( this, widgetDef, {
-			/**
-			 * The editor instance.
-			 *
-			 * @readonly
-			 * @property {CKEDITOR.editor}
-			 */
-			editor: editor,
-
-			/**
-			 * This widget's unique (per editor instance) ID.
-			 *
-			 * @readonly
-			 * @property {Number}
-			 */
-			id: id,
-
-			/**
-			 * Whether this widget is an inline widget (based on an inline element unless
-			 * forced otherwise by {@link CKEDITOR.plugins.widget.definition#inline}).
-			 *
-			 * **Note:** This option does not allow to turn a block element into an inline widget.
-			 * However, it makes it possible to turn an inline element into a block widget or to
-			 * force a correct type in case when automatic recognition fails.
-			 *
-			 * @readonly
-			 * @property {Boolean}
-			 */
-			inline: element.getParent().getName() == 'span',
-
-			/**
-			 * The widget element &mdash; the element on which the widget was initialized.
-			 *
-			 * @readonly
-			 * @property {CKEDITOR.dom.element} element
-			 */
-			element: element,
-
-			/**
-			 * Widget's data object.
-			 *
-			 * The data can only be set by using the {@link #setData} method.
-			 * Changes made to the data fire the {@link #event-data} event.
-			 *
-			 * @readonly
-			 */
-			data: CKEDITOR.tools.extend( {}, typeof widgetDef.defaults == 'function' ? widgetDef.defaults() : widgetDef.defaults ),
-
-			/**
-			 * Indicates if a widget is data-ready. Set to `true` when data from all sources
-			 * ({@link CKEDITOR.plugins.widget.definition#defaults}, set in the
-			 * {@link #init} method, loaded from the widget's element and startup data coming from the constructor)
-			 * are finally loaded. This is immediately followed by the first {@link #event-data}.
-			 *
-			 * @readonly
-			 */
-			dataReady: false,
-
-			/**
-			 * Whether a widget instance was initialized. This means that:
-			 *
-			 * * An instance was created,
-			 * * Its properties were set,
-			 * * The `init` method was executed.
-			 *
-			 * **Note**: The first {@link #event-data} event could not be fired yet which
-			 * means that the widget's DOM has not been set up yet. Wait for the {@link #event-ready}
-			 * event to be notified when a widget is fully initialized and ready.
-			 *
-			 * **Note**: Use the {@link #isInited} method to check whether a widget is initialized and
-			 * has not been destroyed.
-			 *
-			 * @readonly
-			 */
-			inited: false,
-
-			/**
-			 * Whether a widget instance is ready. This means that the widget is {@link #inited} and
-			 * that its DOM was finally set up.
-			 *
-			 * **Note:** Use the {@link #isReady} method to check whether a widget is ready and
-			 * has not been destroyed.
-			 *
-			 * @readonly
-			 */
-			ready: false,
-
-			// Revert what widgetDef could override (automatic #edit listener).
-			edit: Widget.prototype.edit,
-
-			/**
-			 * The nested editable element which is currently focused.
-			 *
-			 * @readonly
-			 * @property {CKEDITOR.plugins.widget.nestedEditable}
-			 */
-			focusedEditable: null,
-
-			/**
-			 * The widget definition from which this instance was created.
-			 *
-			 * @readonly
-			 * @property {CKEDITOR.plugins.widget.definition} definition
-			 */
-			definition: widgetDef,
-
-			/**
-			 * Link to the widget repository which created this instance.
-			 *
-			 * @readonly
-			 * @property {CKEDITOR.plugins.widget.repository} repository
-			 */
-			repository: widgetsRepo,
-
-			draggable: widgetDef.draggable !== false,
-
-			// WAAARNING: Overwrite widgetDef's priv object, because otherwise violent unicorn's gonna visit you.
-			_: {
-				downcastFn: ( widgetDef.downcast && typeof widgetDef.downcast == 'string' ) ?
-					widgetDef.downcasts[ widgetDef.downcast ] : widgetDef.downcast
-			}
-		}, true );
-
-		/**
-		 * An object of widget component elements.
-		 *
-		 * For every `partName => selector` pair in {@link CKEDITOR.plugins.widget.definition#parts},
-		 * one `partName => element` pair is added to this object during the widget initialization.
-		 *
-		 * @readonly
-		 * @property {Object} parts
-		 */
-
-		/**
-		 * The template which will be used to create a new widget element (when the widget's command is executed).
-		 * It will be populated with {@link #defaults default values}.
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.template} template
-		 */
-
-		/**
-		 * The widget wrapper &mdash; a non-editable `div` or `span` element (depending on {@link #inline})
-		 * which is a parent of the {@link #element} and widget compontents like the drag handler and the {@link #mask}.
-		 * It is the outermost widget element.
-		 *
-		 * @readonly
-		 * @property {CKEDITOR.dom.element} wrapper
-		 */
-
-		widgetsRepo.fire( 'instanceCreated', this );
-
-		setupWidget( this, widgetDef );
-
-		this.init && this.init();
-
-		// Finally mark widget as inited.
-		this.inited = true;
-
-		setupWidgetData( this, startupData );
-
-		// If at some point (e.g. in #data listener) widget hasn't been destroyed
-		// and widget is already attached to document then fire #ready.
-		if ( this.isInited() && editor.editable().contains( this.wrapper ) ) {
-			this.ready = true;
-			this.fire( 'ready' );
-		}
-	}
-
-	Widget.prototype = {
-		/**
-		 * Adds a class to the widget element. This method is used by
-		 * the {@link #applyStyle} method and should be overridden by widgets
-		 * which should handle classes differently (e.g. add them to other elements).
-		 *
-		 * Since 4.6.0 this method also adds a corresponding class prefixed with {@link #WRAPPER_CLASS_PREFIX}
-		 * to the widget wrapper element.
-		 *
-		 * **Note**: This method should not be used directly. Use the {@link #setData} method to
-		 * set the `classes` property. Read more in the {@link #setData} documentation.
-		 *
-		 * See also: {@link #removeClass}, {@link #hasClass}, {@link #getClasses}.
-		 *
-		 * @since 4.4
-		 * @param {String} className The class name to be added.
-		 */
-		addClass: function( className ) {
-			this.element.addClass( className );
-			this.wrapper.addClass( Widget.WRAPPER_CLASS_PREFIX + className );
-		},
-
-		/**
-		 * Applies the specified style to the widget. It is highly recommended to use the
-		 * {@link CKEDITOR.editor#applyStyle} or {@link CKEDITOR.style#apply} methods instead of
-		 * using this method directly, because unlike editor's and style's methods, this one
-		 * does not perform any checks.
-		 *
-		 * By default this method handles only classes defined in the style. It clones existing
-		 * classes which are stored in the {@link #property-data widget data}'s `classes` property,
-		 * adds new classes, and calls the {@link #setData} method if at least one new class was added.
-		 * Then, using the {@link #event-data} event listener widget applies modifications passing
-		 * new classes to the {@link #addClass} method.
-		 *
-		 * If you need to handle classes differently than in the default way, you can override the
-		 * {@link #addClass} and related methods. You can also handle other style properties than `classes`
-		 * by overriding this method.
-		 *
-		 * See also: {@link #checkStyleActive}, {@link #removeStyle}.
-		 *
-		 * @since 4.4
-		 * @param {CKEDITOR.style} style The custom widget style to be applied.
-		 */
-		applyStyle: function( style ) {
-			applyRemoveStyle( this, style, 1 );
-		},
-
-		/**
-		 * Checks if the specified style is applied to this widget. It is highly recommended to use the
-		 * {@link CKEDITOR.style#checkActive} method instead of using this method directly,
-		 * because unlike style's method, this one does not perform any checks.
-		 *
-		 * By default this method handles only classes defined in the style and passes
-		 * them to the {@link #hasClass} method. You can override these methods to handle classes
-		 * differently or to handle more of the style properties.
-		 *
-		 * See also: {@link #applyStyle}, {@link #removeStyle}.
-		 *
-		 * @since 4.4
-		 * @param {CKEDITOR.style} style The custom widget style to be checked.
-		 * @returns {Boolean} Whether the style is applied to this widget.
-		 */
-		checkStyleActive: function( style ) {
-			var classes = getStyleClasses( style ),
-				cl;
-
-			if ( !classes )
-				return false;
-
-			while ( ( cl = classes.pop() ) ) {
-				if ( !this.hasClass( cl ) )
-					return false;
-			}
-			return true;
-		},
-
-		/**
-		 * Destroys this widget instance.
-		 *
-		 * Use {@link CKEDITOR.plugins.widget.repository#destroy} when possible instead of this method.
-		 *
-		 * This method fires the {#event-destroy} event.
-		 *
-		 * @param {Boolean} [offline] Whether a widget is offline (detached from the DOM tree) &mdash;
-		 * in this case the DOM (attributes, classes, etc.) will not be cleaned up.
-		 */
-		destroy: function( offline ) {
-			this.fire( 'destroy' );
-
-			if ( this.editables ) {
-				for ( var name in this.editables )
-					this.destroyEditable( name, offline );
-			}
-
-			if ( !offline ) {
-				if ( this.element.data( 'cke-widget-keep-attr' ) == '0' )
-					this.element.removeAttribute( 'data-widget' );
-				this.element.removeAttributes( [ 'data-cke-widget-data', 'data-cke-widget-keep-attr' ] );
-				this.element.removeClass( 'cke_widget_element' );
-				this.element.replace( this.wrapper );
-			}
-
-			this.wrapper = null;
-		},
-
-		/**
-		 * Destroys a nested editable and all nested widgets.
-		 *
-		 * @param {String} editableName Nested editable name.
-		 * @param {Boolean} [offline] See {@link #method-destroy} method.
-		 */
-		destroyEditable: function( editableName, offline ) {
-			var editable = this.editables[ editableName ],
-				canDestroyFilter = true;
-
-			editable.removeListener( 'focus', onEditableFocus );
-			editable.removeListener( 'blur', onEditableBlur );
-			this.editor.focusManager.remove( editable );
-
-			// Destroy filter if it's no longer used by other editables (#1722).
-			if ( editable.filter ) {
-				for ( var widgetName in this.repository.instances ) {
-					var widget = this.repository.instances[ widgetName ];
-
-					if ( !widget.editables ) {
-						continue;
-					}
-
-					var widgetEditable = widget.editables[ editableName ];
-
-					if ( !widgetEditable || widgetEditable === editable ) {
-						continue;
-					}
-
-					if ( editable.filter === widgetEditable.filter ) {
-						canDestroyFilter = false;
-					}
-				}
-
-				if ( canDestroyFilter ) {
-					editable.filter.destroy();
-
-					var filters = this.repository._.filters[ this.name ];
-					if ( filters ) {
-						delete filters[ editableName ];
-					}
-				}
-			}
-
-			if ( !offline ) {
-				this.repository.destroyAll( false, editable );
-				editable.removeClass( 'cke_widget_editable' );
-				editable.removeClass( 'cke_widget_editable_focused' );
-				editable.removeAttributes( [ 'contenteditable', 'data-cke-widget-editable', 'data-cke-enter-mode' ] );
-			}
-
-			delete this.editables[ editableName ];
-		},
-
-		/**
-		 * Starts widget editing.
-		 *
-		 * This method fires the {@link CKEDITOR.plugins.widget#event-edit} event
-		 * which may be canceled in order to prevent it from opening a dialog window.
-		 *
-		 * The dialog window name is obtained from the event's data `dialog` property or
-		 * from {@link CKEDITOR.plugins.widget.definition#dialog}.
-		 *
-		 * @returns {Boolean} Returns `true` if a dialog window was opened.
-		 */
-		edit: function() {
-			var evtData = { dialog: this.dialog },
-				that = this;
-
-			// Edit event was blocked or there's no dialog to be automatically opened.
-			if ( this.fire( 'edit', evtData ) === false || !evtData.dialog )
-				return false;
-
-			this.editor.openDialog( evtData.dialog, function( dialog ) {
-				var showListener,
-					okListener;
-
-				// Allow to add a custom dialog handler.
-				if ( that.fire( 'dialog', dialog ) === false )
-					return;
-
-				showListener = dialog.on( 'show', function() {
-					dialog.setupContent( that );
-				} );
-
-				okListener = dialog.on( 'ok', function() {
-					// Commit dialog's fields, but prevent from
-					// firing data event for every field. Fire only one,
-					// bulk event at the end.
-					var dataChanged,
-						dataListener = that.on( 'data', function( evt ) {
-							dataChanged = 1;
-							evt.cancel();
-						}, null, null, 0 );
-
-					// Create snapshot preceeding snapshot with changed widget...
-					// TODO it should not be required, but it is and I found similar
-					// code in dialog#ok listener in dialog/plugin.js.
-					that.editor.fire( 'saveSnapshot' );
-					dialog.commitContent( that );
-
-					dataListener.removeListener();
-					if ( dataChanged ) {
-						that.fire( 'data', that.data );
-						that.editor.fire( 'saveSnapshot' );
-					}
-				} );
-
-				dialog.once( 'hide', function() {
-					showListener.removeListener();
-					okListener.removeListener();
-				} );
-			} );
-
-			return true;
-		},
-
-		/**
-		 * Returns widget element classes parsed to an object. This method
-		 * is used to populate the `classes` property of widget's {@link #property-data}.
-		 *
-		 * This method reuses {@link CKEDITOR.plugins.widget.repository#parseElementClasses}.
-		 * It should be overriden if a widget should handle classes differently (e.g. on other elements).
-		 *
-		 * See also: {@link #removeClass}, {@link #addClass}, {@link #hasClass}.
-		 *
-		 * @since 4.4
-		 * @returns {Object}
-		 */
-		getClasses: function() {
-			return this.repository.parseElementClasses( this.element.getAttribute( 'class' ) );
-		},
-
-		/**
-		 * Checks if the widget element has specified class. This method is used by
-		 * the {@link #checkStyleActive} method and should be overriden by widgets
-		 * which should handle classes differently (e.g. on other elements).
-		 *
-		 * See also: {@link #removeClass}, {@link #addClass}, {@link #getClasses}.
-		 *
-		 * @since 4.4
-		 * @param {String} className The class to be checked.
-		 * @param {Boolean} Whether a widget has specified class.
-		 */
-		hasClass: function( className ) {
-			return this.element.hasClass( className );
-		},
-
-		/**
-		 * Initializes a nested editable.
-		 *
-		 * **Note**: Only elements from {@link CKEDITOR.dtd#$editable} may become editables.
-		 *
-		 * @param {String} editableName The nested editable name.
-		 * @param {CKEDITOR.plugins.widget.nestedEditable.definition} definition The definition of the nested editable.
-		 * @returns {Boolean} Whether an editable was successfully initialized.
-		 */
-		initEditable: function( editableName, definition ) {
-			// Don't fetch just first element which matched selector but look for a correct one. (https://dev.ckeditor.com/ticket/13334)
-			var editable = this._findOneNotNested( definition.selector );
-
-			if ( editable && editable.is( CKEDITOR.dtd.$editable ) ) {
-				editable = new NestedEditable( this.editor, editable, {
-					filter: createEditableFilter.call( this.repository, this.name, editableName, definition )
-				} );
-				this.editables[ editableName ] = editable;
-
-				editable.setAttributes( {
-					contenteditable: 'true',
-					'data-cke-widget-editable': editableName,
-					'data-cke-enter-mode': editable.enterMode
-				} );
-
-				if ( editable.filter )
-					editable.data( 'cke-filter', editable.filter.id );
-
-				editable.addClass( 'cke_widget_editable' );
-				// This class may be left when d&ding widget which
-				// had focused editable. Clean this class here, not in
-				// cleanUpWidgetElement for performance and code size reasons.
-				editable.removeClass( 'cke_widget_editable_focused' );
-
-				if ( definition.pathName )
-					editable.data( 'cke-display-name', definition.pathName );
-
-				this.editor.focusManager.add( editable );
-				editable.on( 'focus', onEditableFocus, this );
-				CKEDITOR.env.ie && editable.on( 'blur', onEditableBlur, this );
-
-				// Finally, process editable's data. This data wasn't processed when loading
-				// editor's data, becuase they need to be processed separately, with its own filters and settings.
-				editable._.initialSetData = true;
-				editable.setData( editable.getHtml() );
-
-				return true;
-			}
-
-			return false;
-		},
-
-		/**
-		 * Looks inside wrapper element to find a node that
-		 * matches given selector and is not nested in other widget. (https://dev.ckeditor.com/ticket/13334)
-		 *
-		 * @since 4.5
-		 * @private
-		 * @param {String} selector Selector to match.
-		 * @returns {CKEDITOR.dom.element} Matched element or `null` if a node has not been found.
-		 */
-		_findOneNotNested: function( selector ) {
-			var matchedElements = this.wrapper.find( selector ),
-				match,
-				closestWrapper;
-
-			for ( var i = 0; i < matchedElements.count(); i++ ) {
-				match = matchedElements.getItem( i );
-				closestWrapper = match.getAscendant( Widget.isDomWidgetWrapper );
-
-				// The closest ascendant-wrapper of this match defines to which widget
-				// this match belongs. If the ascendant is this widget's wrapper
-				// it means that the match is not nested in other widget.
-				if ( this.wrapper.equals( closestWrapper ) ) {
-					return match;
-				}
-			}
-
-			return null;
-		},
-
-		/**
-		 * Checks if a widget has already been initialized and has not been destroyed yet.
-		 *
-		 * See {@link #inited} for more details.
-		 *
-		 * @returns {Boolean}
-		 */
-		isInited: function() {
-			return !!( this.wrapper && this.inited );
-		},
-
-		/**
-		 * Checks if a widget is ready and has not been destroyed yet.
-		 *
-		 * See {@link #property-ready} for more details.
-		 *
-		 * @returns {Boolean}
-		 */
-		isReady: function() {
-			return this.isInited() && this.ready;
-		},
-
-		/**
-		 * Focuses a widget by selecting it.
-		 */
-		focus: function() {
-			var sel = this.editor.getSelection();
-
-			// Fake the selection before focusing editor, to avoid unpreventable viewports scrolling
-			// on Webkit/Blink/IE which is done because there's no selection or selection was somewhere else than widget.
-			if ( sel ) {
-				var isDirty = this.editor.checkDirty();
-
-				sel.fake( this.wrapper );
-
-				!isDirty && this.editor.resetDirty();
-			}
-
-			// Always focus editor (not only when focusManger.hasFocus is false) (because of https://dev.ckeditor.com/ticket/10483).
-			this.editor.focus();
-		},
-
-		/**
-		 * Removes a class from the widget element. This method is used by
-		 * the {@link #removeStyle} method and should be overriden by widgets
-		 * which should handle classes differently (e.g. on other elements).
-		 *
-		 * **Note**: This method should not be used directly. Use the {@link #setData} method to
-		 * set the `classes` property. Read more in the {@link #setData} documentation.
-		 *
-		 * See also: {@link #hasClass}, {@link #addClass}.
-		 *
-		 * @since 4.4
-		 * @param {String} className The class to be removed.
-		 */
-		removeClass: function( className ) {
-			this.element.removeClass( className );
-			this.wrapper.removeClass( Widget.WRAPPER_CLASS_PREFIX + className );
-		},
-
-		/**
-		 * Removes the specified style from the widget. It is highly recommended to use the
-		 * {@link CKEDITOR.editor#removeStyle} or {@link CKEDITOR.style#remove} methods instead of
-		 * using this method directly, because unlike editor's and style's methods, this one
-		 * does not perform any checks.
-		 *
-		 * Read more about how applying/removing styles works in the {@link #applyStyle} method documentation.
-		 *
-		 * See also {@link #checkStyleActive}, {@link #applyStyle}, {@link #getClasses}.
-		 *
-		 * @since 4.4
-		 * @param {CKEDITOR.style} style The custom widget style to be removed.
-		 */
-		removeStyle: function( style ) {
-			applyRemoveStyle( this, style, 0 );
-		},
-
-		/**
-		 * Sets widget value(s) in the {@link #property-data} object.
-		 * If the given value(s) modifies current ones, the {@link #event-data} event is fired.
-		 *
-		 *		this.setData( 'align', 'left' );
-		 *		this.data.align; // -> 'left'
-		 *
-		 *		this.setData( { align: 'right', opened: false } );
-		 *		this.data.align; // -> 'right'
-		 *		this.data.opened; // -> false
-		 *
-		 * Set values are stored in {@link #element}'s attribute (`data-cke-widget-data`),
-		 * in a JSON string, therefore {@link #property-data} should contain
-		 * only serializable data.
-		 *
-		 * **Note:** A special data property, `classes`, exists. It contains an object with
-		 * classes which were returned by the {@link #getClasses} method during the widget initialization.
-		 * This property is then used by the {@link #applyStyle} and {@link #removeStyle} methods.
-		 * When it is changed (the reference to object must be changed!), the widget updates its classes by
-		 * using the {@link #addClass} and {@link #removeClass} methods.
-		 *
-		 *		// Adding a new class.
-		 *		var classes = CKEDITOR.tools.clone( widget.data.classes );
-		 *		classes.newClass = 1;
-		 *		widget.setData( 'classes', classes );
-		 *
-		 *		// Removing a class.
-		 *		var classes = CKEDITOR.tools.clone( widget.data.classes );
-		 *		delete classes.newClass;
-		 *		widget.setData( 'classes', classes );
-		 *
-		 * @param {String/Object} keyOrData
-		 * @param {Object} value
-		 * @chainable
-		 */
-		setData: function( key, value ) {
-			var data = this.data,
-				modified = 0;
-
-			if ( typeof key == 'string' ) {
-				if ( data[ key ] !== value ) {
-					data[ key ] = value;
-					modified = 1;
-				}
-			}
-			else {
-				var newData = key;
-
-				for ( key in newData ) {
-					if ( data[ key ] !== newData[ key ] ) {
-						modified = 1;
-						data[ key ] = newData[ key ];
-					}
-				}
-			}
-
-			// Block firing data event and overwriting data element before setupWidgetData is executed.
-			if ( modified && this.dataReady ) {
-				writeDataToElement( this );
-				this.fire( 'data', data );
-			}
-
-			return this;
-		},
-
-		/**
-		 * Changes the widget's focus state. This method is executed automatically after
-		 * a widget was focused by the {@link #method-focus} method or the selection was moved
-		 * out of the widget.
-		 *
-		 * This is a low-level method which is not integrated with e.g. the undo manager.
-		 * Use the {@link #method-focus} method instead.
-		 *
-		 * @param {Boolean} selected Whether to select or deselect this widget.
-		 * @chainable
-		 */
-		setFocused: function( focused ) {
-			this.wrapper[ focused ? 'addClass' : 'removeClass' ]( 'cke_widget_focused' );
-			this.fire( focused ? 'focus' : 'blur' );
-			return this;
-		},
-
-		/**
-		 * Changes the widget's select state. This method is executed automatically after
-		 * a widget was selected by the {@link #method-focus} method or the selection
-		 * was moved out of the widget.
-		 *
-		 * This is a low-level method which is not integrated with e.g. the undo manager.
-		 * Use the {@link #method-focus} method instead or simply change the selection.
-		 *
-		 * @param {Boolean} selected Whether to select or deselect this widget.
-		 * @chainable
-		 */
-		setSelected: function( selected ) {
-			this.wrapper[ selected ? 'addClass' : 'removeClass' ]( 'cke_widget_selected' );
-			this.fire(  selected ? 'select' : 'deselect' );
-			return this;
-		},
-
-		/**
-		 * Repositions drag handler according to the widget's element position. Should be called from events, like mouseover.
-		 */
-		updateDragHandlerPosition: function() {
-			var editor = this.editor,
-				domElement = this.element.$,
-				oldPos = this._.dragHandlerOffset,
-				newPos = {
-					x: domElement.offsetLeft,
-					y: domElement.offsetTop - DRAG_HANDLER_SIZE
-				};
-
-			if ( oldPos && newPos.x == oldPos.x && newPos.y == oldPos.y )
-				return;
-
-			// We need to make sure that dirty state is not changed (https://dev.ckeditor.com/ticket/11487).
-			var initialDirty = editor.checkDirty();
-
-			editor.fire( 'lockSnapshot' );
-			this.dragHandlerContainer.setStyles( {
-				top: newPos.y + 'px',
-				left: newPos.x + 'px',
-				display: 'block'
-			} );
-			editor.fire( 'unlockSnapshot' );
-			!initialDirty && editor.resetDirty();
-
-			this._.dragHandlerOffset = newPos;
-		}
-	};
-
-	CKEDITOR.event.implementOn( Widget.prototype );
-
-	/**
-	 * Gets the {@link #isDomNestedEditable nested editable}
-	 * (returned as a {@link CKEDITOR.dom.element}, not as a {@link CKEDITOR.plugins.widget.nestedEditable})
-	 * closest to the `node` or the `node` if it is a nested editable itself.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.element} guard Stop ancestor search on this node (usually editor's editable).
-	 * @param {CKEDITOR.dom.node} node Start the search from this node.
-	 * @returns {CKEDITOR.dom.element/null} Element or `null` if not found.
-	 */
-	Widget.getNestedEditable = function( guard, node ) {
-		if ( !node || node.equals( guard ) )
-			return null;
-
-		if ( Widget.isDomNestedEditable( node ) )
-			return node;
-
-		return Widget.getNestedEditable( guard, node.getParent() );
-	};
-
-	/**
-	 * Checks whether the `node` is a widget's drag handle element.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomDragHandler = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && node.hasAttribute( 'data-cke-widget-drag-handler' );
-	};
-
-	/**
-	 * Checks whether the `node` is a container of the widget's drag handle element.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomDragHandlerContainer = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && node.hasClass( 'cke_widget_drag_handler_container' );
-	};
-
-	/**
-	 * Checks whether the `node` is a {@link CKEDITOR.plugins.widget#editables nested editable}.
-	 * Note that this function only checks whether it is the right element, not whether
-	 * the passed `node` is an instance of {@link CKEDITOR.plugins.widget.nestedEditable}.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomNestedEditable = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && node.hasAttribute( 'data-cke-widget-editable' );
-	};
-
-	/**
-	 * Checks whether the `node` is a {@link CKEDITOR.plugins.widget#element widget element}.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomWidgetElement = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && node.hasAttribute( 'data-widget' );
-	};
-
-	/**
-	 * Checks whether the `node` is a {@link CKEDITOR.plugins.widget#wrapper widget wrapper}.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.dom.element} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomWidgetWrapper = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && node.hasAttribute( 'data-cke-widget-wrapper' );
-	};
-
-	/**
-	 * Checks whether the `node` is a DOM widget.
-	 *
-	 * @since 4.8.0
-	 * @static
-	 * @param {CKEDITOR.dom.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isDomWidget = function( node ) {
-		return node ? this.isDomWidgetWrapper( node ) || this.isDomWidgetElement( node ) : false;
-	};
-
-	/**
-	 * Checks whether the `node` is a {@link CKEDITOR.plugins.widget#element widget element}.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.htmlParser.node} node
-	 * @returns {Boolean}
-	 */
-	Widget.isParserWidgetElement = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && !!node.attributes[ 'data-widget' ];
-	};
-
-	/**
-	 * Checks whether the `node` is a {@link CKEDITOR.plugins.widget#wrapper widget wrapper}.
-	 *
-	 * @since 4.5
-	 * @static
-	 * @param {CKEDITOR.htmlParser.element} node
-	 * @returns {Boolean}
-	 */
-	Widget.isParserWidgetWrapper = function( node ) {
-		return node.type == CKEDITOR.NODE_ELEMENT && !!node.attributes[ 'data-cke-widget-wrapper' ];
-	};
-
-	/**
-	 * Prefix added to wrapper classes. Each class added to the widget element by the {@link #addClass}
-	 * method will also be added to the wrapper prefixed with it.
-	 *
-	 * @since 4.6.0
-	 * @static
-	 * @readonly
-	 * @property {String} [='cke_widget_wrapper_']
-	 */
-	Widget.WRAPPER_CLASS_PREFIX = 'cke_widget_wrapper_';
-
-	/**
-	 * An event fired when a widget is ready (fully initialized). This event is fired after:
-	 *
-	 * * {@link #init} is called,
-	 * * The first {@link #event-data} event is fired,
-	 * * A widget is attached to the document.
-	 *
-	 * Therefore, in case of widget creation with a command which opens a dialog window, this event
-	 * will be delayed after the dialog window is closed and the widget is finally inserted into the document.
-	 *
-	 * **Note**: If your widget does not use automatic dialog window binding (i.e. you open the dialog window manually)
-	 * or another situation in which the widget wrapper is not attached to document at the time when it is
-	 * initialized occurs, you need to take care of firing {@link #event-ready} yourself.
-	 *
-	 * See also {@link #property-ready} and {@link #property-inited} properties, and
-	 * {@link #isReady} and {@link #isInited} methods.
-	 *
-	 * @event ready
-	 */
-
-	/**
-	 * An event fired when a widget is about to be destroyed, but before it is
-	 * fully torn down.
-	 *
-	 * @event destroy
-	 */
-
-	/**
-	 * An event fired when a widget is focused.
-	 *
-	 * Widget can be focused by executing {@link #method-focus}.
-	 *
-	 * @event focus
-	 */
-
-	/**
-	 * An event fired when a widget is blurred.
-	 *
-	 * @event blur
-	 */
-
-	/**
-	 * An event fired when a widget is selected.
-	 *
-	 * @event select
-	 */
-
-	/**
-	 * An event fired when a widget is deselected.
-	 *
-	 * @event deselect
-	 */
-
-	/**
-	 * An event fired by the {@link #method-edit} method. It can be canceled
-	 * in order to stop the default action (opening a dialog window and/or
-	 * {@link CKEDITOR.plugins.widget.repository#finalizeCreation finalizing widget creation}).
-	 *
-	 * @event edit
-	 * @param data
-	 * @param {String} data.dialog Defaults to {@link CKEDITOR.plugins.widget.definition#dialog}
-	 * and can be changed or set by the listener.
-	 */
-
-	/**
-	 * An event fired when a dialog window for widget editing is opened.
-	 * This event can be canceled in order to handle the editing dialog in a custom manner.
-	 *
-	 * @event dialog
-	 * @param {CKEDITOR.dialog} data The opened dialog window instance.
-	 */
-
-	/**
-	 * An event fired when a key is pressed on a focused widget.
-	 * This event is forwarded from the {@link CKEDITOR.editor#key} event and
-	 * has the ability to block editor keystrokes if it is canceled.
-	 *
-	 * @event key
-	 * @param data
-	 * @param {Number} data.keyCode A number representing the key code (or combination).
-	 */
-
-	/**
-	 * An event fired when a widget is double clicked.
-	 *
-	 * **Note:** If a default editing action is executed on double click (i.e. a widget has a
-	 * {@link CKEDITOR.plugins.widget.definition#dialog dialog} defined and the {@link #event-doubleclick} event was not
-	 * canceled), this event will be automatically canceled, so a listener added with the default priority (10)
-	 * will not be executed. Use a listener with low priority (e.g. 5) to be sure that it will be executed.
-	 *
-	 *		widget.on( 'doubleclick', function( evt ) {
-	 *			console.log( 'widget#doubleclick' );
-	 *		}, null, null, 5 );
-	 *
-	 * If your widget handles double click in a special way (so the default editing action is not executed),
-	 * make sure you cancel this event, because otherwise it will be propagated to {@link CKEDITOR.editor#doubleclick}
-	 * and another feature may step in (e.g. a Link dialog window may be opened if your widget was inside a link).
-	 *
-	 * @event doubleclick
-	 * @param data
-	 * @param {CKEDITOR.dom.element} data.element The double-clicked element.
-	 */
-
-	/**
-	 * An event fired when the context menu is opened for a widget.
-	 *
-	 * @event contextMenu
-	 * @param data The object containing context menu options to be added
-	 * for this widget. See {@link CKEDITOR.plugins.contextMenu#addListener}.
-	 */
-
-	/**
-	 * An event fired when the widget data changed. See the {@link #setData} method and the {@link #property-data} property.
-	 *
-	 * @event data
-	 */
-
-
-
-	/**
-	 * The wrapper class for editable elements inside widgets.
-	 *
-	 * Do not use directly. Use {@link CKEDITOR.plugins.widget.definition#editables} or
-	 * {@link CKEDITOR.plugins.widget#initEditable}.
-	 *
-	 * @class CKEDITOR.plugins.widget.nestedEditable
-	 * @extends CKEDITOR.dom.element
-	 * @constructor
-	 * @param {CKEDITOR.editor} editor
-	 * @param {CKEDITOR.dom.element} element
-	 * @param config
-	 * @param {CKEDITOR.filter} [config.filter]
-	 */
-	function NestedEditable( editor, element, config ) {
-		// Call the base constructor.
-		CKEDITOR.dom.element.call( this, element.$ );
-		this.editor = editor;
-		this._ = {};
-		var filter = this.filter = config.filter;
-
-		// If blockless editable - always use BR mode.
-		if ( !CKEDITOR.dtd[ this.getName() ].p )
-			this.enterMode = this.shiftEnterMode = CKEDITOR.ENTER_BR;
-		else {
-			this.enterMode = filter ? filter.getAllowedEnterMode( editor.enterMode ) : editor.enterMode;
-			this.shiftEnterMode = filter ? filter.getAllowedEnterMode( editor.shiftEnterMode, true ) : editor.shiftEnterMode;
-		}
-	}
-
-	NestedEditable.prototype = CKEDITOR.tools.extend( CKEDITOR.tools.prototypedCopy( CKEDITOR.dom.element.prototype ), {
-		/**
-		 * Sets the editable data. The data will be passed through the {@link CKEDITOR.editor#dataProcessor}
-		 * and the {@link CKEDITOR.editor#filter}. This ensures that the data was filtered and prepared to be
-		 * edited like the {@link CKEDITOR.editor#method-setData editor data}.
-		 *
-		 * Before content is changed, all nested widgets are destroyed. Afterwards, after new content is loaded,
-		 * all nested widgets are initialized.
-		 *
-		 * @param {String} data
-		 */
-		setData: function( data ) {
-			// For performance reasons don't call destroyAll when initializing a nested editable,
-			// because there are no widgets inside.
-			if ( !this._.initialSetData ) {
-				// Destroy all nested widgets before setting data.
-				this.editor.widgets.destroyAll( false, this );
-			}
-			this._.initialSetData = false;
-
-			data = this.editor.dataProcessor.toHtml( data, {
-				context: this.getName(),
-				filter: this.filter,
-				enterMode: this.enterMode
-			} );
-			this.setHtml( data );
-
-			this.editor.widgets.initOnAll( this );
-		},
-
-		/**
-		 * Gets the editable data. Like {@link #setData}, this method will process and filter the data.
-		 *
-		 * @returns {String}
-		 */
-		getData: function() {
-			return this.editor.dataProcessor.toDataFormat( this.getHtml(), {
-				context: this.getName(),
-				filter: this.filter,
-				enterMode: this.enterMode
-			} );
-		}
-	} );
-
-	/**
-	 * The editor instance.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.editor} editor
-	 */
-
-	/**
-	 * The filter instance if allowed content rules were defined.
-	 *
-	 * @readonly
-	 * @property {CKEDITOR.filter} filter
-	 */
-
-	/**
-	 * The enter mode active in this editable.
-	 * It is determined from editable's name (whether it is a blockless editable),
-	 * its allowed content rules (if defined) and the default editor's mode.
-	 *
-	 * @readonly
-	 * @property {Number} enterMode
-	 */
-
-	/**
-	 * The shift enter move active in this editable.
-	 *
-	 * @readonly
-	 * @property {Number} shiftEnterMode
-	 */
-
-
-	//
-	// REPOSITORY helpers -----------------------------------------------------
-	//
-
-	function addWidgetButtons( editor ) {
-		var widgets = editor.widgets.registered,
-			widget,
-			widgetName,
-			widgetButton;
-
-		for ( widgetName in widgets ) {
-			widget = widgets[ widgetName ];
-
-			// Create button if defined.
-			widgetButton = widget.button;
-			if ( widgetButton && editor.ui.addButton ) {
-				editor.ui.addButton( CKEDITOR.tools.capitalize( widget.name, true ), {
-					label: widgetButton,
-					command: widget.name,
-					toolbar: 'insert,10'
-				} );
-			}
-		}
-	}
-
-	// Create a command creating and editing widget.
-	//
-	// @param editor
-	// @param {CKEDITOR.plugins.widget.definition} widgetDef
-	function addWidgetCommand( editor, widgetDef ) {
-		editor.addCommand( widgetDef.name, {
-			exec: function( editor, commandData ) {
-				var focused = editor.widgets.focused;
-				if ( focused && focused.name == widgetDef.name ) {
-					// If a widget of the same type is focused, start editing.
-					focused.edit();
-				} else if ( widgetDef.insert ) {
-					// ... use insert method is was defined.
-					widgetDef.insert( {
-						editor: editor,
-						commandData: commandData
-					} );
-				} else if ( widgetDef.template ) {
-					// ... or create a brand-new widget from template.
-					var defaults = typeof widgetDef.defaults == 'function' ? widgetDef.defaults() : widgetDef.defaults,
-						element = CKEDITOR.dom.element.createFromHtml( widgetDef.template.output( defaults ) ),
-						instance,
-						wrapper = editor.widgets.wrapElement( element, widgetDef.name ),
-						temp = new CKEDITOR.dom.documentFragment( wrapper.getDocument() );
-
-					// Append wrapper to a temporary document. This will unify the environment
-					// in which #data listeners work when creating and editing widget.
-					temp.append( wrapper );
-					instance = editor.widgets.initOn( element, widgetDef, commandData && commandData.startupData );
-
-					// Instance could be destroyed during initialization.
-					// In this case finalize creation if some new widget
-					// was left in temporary document fragment.
-					if ( !instance ) {
-						finalizeCreation();
-						return;
-					}
-
-					// Listen on edit to finalize widget insertion.
-					//
-					// * If dialog was set, then insert widget after dialog was successfully saved or destroy this
-					// temporary instance.
-					// * If dialog wasn't set and edit wasn't canceled, insert widget.
-					var editListener = instance.once( 'edit', function( evt ) {
-						if ( evt.data.dialog ) {
-							instance.once( 'dialog', function( evt ) {
-								var dialog = evt.data,
-									okListener,
-									cancelListener;
-
-								// Finalize creation AFTER (20) new data was set.
-								okListener = dialog.once( 'ok', finalizeCreation, null, null, 20 );
-
-								cancelListener = dialog.once( 'cancel', function( evt ) {
-									if ( !( evt.data && evt.data.hide === false ) ) {
-										editor.widgets.destroy( instance, true );
-									}
-								} );
-
-								dialog.once( 'hide', function() {
-									okListener.removeListener();
-									cancelListener.removeListener();
-								} );
-							} );
-						} else {
-							// Dialog hasn't been set, so insert widget now.
-							finalizeCreation();
-						}
-					}, null, null, 999 );
-
-					instance.edit();
-
-					// Remove listener in case someone canceled it before this
-					// listener was executed.
-					editListener.removeListener();
-				}
-
-				function finalizeCreation() {
-					editor.widgets.finalizeCreation( temp );
-				}
-			},
-
-			allowedContent: widgetDef.allowedContent,
-			requiredContent: widgetDef.requiredContent,
-			contentForms: widgetDef.contentForms,
-			contentTransformations: widgetDef.contentTransformations
-		} );
-	}
-
-	function addWidgetProcessors( widgetsRepo, widgetDef ) {
-		var upcast = widgetDef.upcast,
-			priority = widgetDef.upcastPriority || 10;
-
-		function multipleUpcastsHandler( element, data ) {
-			var upcasts = widgetDef.upcast.split( ',' ),
-				upcast,
-				i;
-
-			for ( i = 0; i < upcasts.length; i++ ) {
-				upcast = upcasts[ i ];
-
-				if ( upcast === element.name ) {
-					return widgetDef.upcasts[ upcast ].call( this, element, data );
-				}
-			}
-
-			return false;
-		}
-
-		if ( !upcast )
-			return;
-
-		// Multiple upcasts defined in string.
-		if ( typeof upcast == 'string' ) {
-			// This handler ensures that upcast method is fired only for appropriate element (#1094).
-			addUpcast( multipleUpcastsHandler, widgetDef, priority );
-		}
-		// Single rule which is automatically activated.
-		else {
-			addUpcast( upcast, widgetDef, priority );
-		}
-
-		function addUpcast( upcast, def, priority ) {
-			// Find index of the first higher (in terms of value) priority upcast.
-			var index = CKEDITOR.tools.getIndex( widgetsRepo._.upcasts, function( element ) {
-				return element[ 2 ] > priority;
-			} );
-			// Add at the end if it is the highest priority so far.
-			if ( index < 0 ) {
-				index = widgetsRepo._.upcasts.length;
-			}
-
-			widgetsRepo._.upcasts.splice( index, 0, [ CKEDITOR.tools.bind( upcast, def ), def.name, priority ] );
-		}
-	}
-
-	function blurWidget( widgetsRepo, widget ) {
-		widgetsRepo.focused = null;
-
-		if ( widget.isInited() ) {
-			var isDirty = widget.editor.checkDirty();
-
-			// Widget could be destroyed in the meantime - e.g. data could be set.
-			widgetsRepo.fire( 'widgetBlurred', { widget: widget } );
-			widget.setFocused( false );
-
-			!isDirty && widget.editor.resetDirty();
-		}
-	}
-
-	function checkWidgets( evt ) {
-		var options = evt.data;
-
-		if ( this.editor.mode != 'wysiwyg' )
-			return;
-
-		var editable = this.editor.editable(),
-			instances = this.instances,
-			newInstances, i, count, wrapper, notYetInitialized;
-
-		if ( !editable )
-			return;
-
-		// Remove widgets which have no corresponding elements in DOM.
-		for ( i in instances ) {
-			// https://dev.ckeditor.com/ticket/13410 Remove widgets that are ready. This prevents from destroying widgets that are during loading process.
-			if ( instances[ i ].isReady() && !editable.contains( instances[ i ].wrapper ) )
-				this.destroy( instances[ i ], true );
-		}
-
-		// Init on all (new) if initOnlyNew option was passed.
-		if ( options && options.initOnlyNew )
-			newInstances = this.initOnAll();
-		else {
-			var wrappers = editable.find( '.cke_widget_wrapper' );
-			newInstances = [];
-
-			// Create widgets on existing wrappers if they do not exists.
-			for ( i = 0, count = wrappers.count(); i < count; i++ ) {
-				wrapper = wrappers.getItem( i );
-				notYetInitialized = !this.getByElement( wrapper, true );
-
-				// Check if:
-				// * there's no instance for this widget
-				// * wrapper is not inside some temporary element like copybin (https://dev.ckeditor.com/ticket/11088)
-				// * it was a nested widget's wrapper which has been detached from DOM,
-				// when nested editable has been initialized (it overwrites its innerHTML
-				// and initializes nested widgets).
-				if ( notYetInitialized && !findParent( wrapper, isDomTemp ) && editable.contains( wrapper ) ) {
-					// Add cke_widget_new class because otherwise
-					// widget will not be created on such wrapper.
-					wrapper.addClass( 'cke_widget_new' );
-					newInstances.push( this.initOn( wrapper.getFirst( Widget.isDomWidgetElement ) ) );
-				}
-			}
-		}
-
-		// If only single widget was initialized and focusInited was passed, focus it.
-		if ( options && options.focusInited && newInstances.length == 1 )
-			newInstances[ 0 ].focus();
-	}
-
-	// Unwraps widget element and clean up element.
-	//
-	// This function is used to clean up pasted widgets.
-	// It should have similar result to widget#destroy plus
-	// some additional adjustments, specific for pasting.
-	//
-	// @param {CKEDITOR.htmlParser.element} el
-	function cleanUpWidgetElement( el ) {
-		var parent = el.parent;
-
-		if ( parent.type == CKEDITOR.NODE_ELEMENT && parent.attributes[ 'data-cke-widget-wrapper' ] ) {
-			parent.replaceWith( el );
-		}
-	}
-
-	// Preserves white spaces in widget element.
-	//
-	// This function is replacing white spaces with &nbsp;
-	// at the beginning of the first text node
-	// and at the end of the last text node.
-	//
-	// @param {CKEDITOR.htmlParser.element} el
-	function preserveSpaces( el ) {
-		if ( typeof el.attributes != 'undefined' && el.attributes[ 'data-widget' ] ) {
-			var firstTextNode = getFirstTextNode( el ),
-				lastTextNode = getLastTextNode( el ),
-				spacesReplaced = false;
-
-			// Check whether the value of the first text node contains white space at the beginning and replace it with &nbsp;.
-			if ( firstTextNode && firstTextNode.value && firstTextNode.value.match( /^\s/g ) ) {
-				firstTextNode.parent.attributes[ 'data-cke-white-space-first' ] = 1;
-				firstTextNode.value = firstTextNode.value.replace( /^\s/g, '&nbsp;' );
-				spacesReplaced = true;
-			}
-
-			// Check whether the value of the last text node contains white space at the end and replace it with &nbsp;.
-			if ( lastTextNode && lastTextNode.value && lastTextNode.value.match( /\s$/g ) ) {
-				lastTextNode.parent.attributes[ 'data-cke-white-space-last' ] = 1;
-				lastTextNode.value = lastTextNode.value.replace( /\s$/g, '&nbsp;' );
-				spacesReplaced = true;
-			}
-
-			if ( spacesReplaced ) {
-				el.attributes[ 'data-cke-widget-white-space' ] = 1;
-			}
-		}
-	}
-
-	// Returns first child text node of the given element.
-	//
-	// @param {CKEDITOR.htmlParser.element} el.
-	// @returns {CKEDITOR.htmlParser.text}
-	function getFirstTextNode( el ) {
-		return el.find( function( node ) {
-			return node.type === 3;
-		}, true ).shift();
-	}
-
-
-	// Returns last child text node of the given element.
-	//
-	// @param {CKEDITOR.htmlParser.element} el.
-	// @returns {CKEDITOR.htmlParser.text}
-	function getLastTextNode( el ) {
-		return el.find( function( node ) {
-			return node.type === 3;
-		}, true ).pop();
-	}
-
-	// Similar to cleanUpWidgetElement, but works on DOM and finds
-	// widget elements by its own.
-	//
-	// Unlike cleanUpWidgetElement it will wrap element back.
-	//
-	// @param {CKEDITOR.dom.element} container
-	function cleanUpAllWidgetElements( widgetsRepo, container ) {
-		var wrappers = container.find( '.cke_widget_wrapper' ),
-			wrapper, element,
-			i = 0,
-			l = wrappers.count();
-
-		for ( ; i < l; ++i ) {
-			wrapper = wrappers.getItem( i );
-			element = wrapper.getFirst( Widget.isDomWidgetElement );
-			// If wrapper contains widget element - unwrap it and wrap again.
-			if ( element.type == CKEDITOR.NODE_ELEMENT && element.data( 'widget' ) ) {
-				element.replace( wrapper );
-				widgetsRepo.wrapElement( element );
-			} else {
-				// Otherwise - something is wrong... clean this up.
-				wrapper.remove();
-			}
-		}
-	}
-
-	// Creates {@link CKEDITOR.filter} instance for given widget, editable and rules.
-	//
-	// Once filter for widget-editable pair is created it is cached, so the same instance
-	// will be returned when method is executed again.
-	//
-	// @param {String} widgetName
-	// @param {String} editableName
-	// @param {CKEDITOR.plugins.widget.nestedEditableDefinition} editableDefinition The nested editable definition.
-	// @returns {CKEDITOR.filter} Filter instance or `null` if rules are not defined.
-	// @context CKEDITOR.plugins.widget.repository
-	function createEditableFilter( widgetName, editableName, editableDefinition ) {
-		if ( !editableDefinition.allowedContent && !editableDefinition.disallowedContent )
-			return null;
-
-		var editables = this._.filters[ widgetName ];
-
-		if ( !editables )
-			this._.filters[ widgetName ] = editables = {};
-
-		var filter = editables[ editableName ];
-
-		if ( !filter ) {
-			filter = editableDefinition.allowedContent ? new CKEDITOR.filter( editableDefinition.allowedContent ) : this.editor.filter.clone();
-
-			editables[ editableName ] = filter;
-
-			if ( editableDefinition.disallowedContent ) {
-				filter.disallow( editableDefinition.disallowedContent );
-			}
-		}
-
-		return filter;
-	}
-
-	// Creates an iterator function which when executed on all
-	// elements in DOM tree will gather elements that should be wrapped
-	// and initialized as widgets.
-	function createUpcastIterator( widgetsRepo ) {
-		var toBeWrapped = [],
-			upcasts = widgetsRepo._.upcasts,
-			upcastCallbacks = widgetsRepo._.upcastCallbacks;
-
-		return {
-			toBeWrapped: toBeWrapped,
-
-			iterator: function( element ) {
-				var upcast, upcasted,
-					data,
-					i,
-					upcastsLength,
-					upcastCallbacksLength;
-
-				// Wrapper found - find widget element, add it to be
-				// cleaned up (unwrapped) and wrapped and stop iterating in this branch.
-				if ( 'data-cke-widget-wrapper' in element.attributes ) {
-					element = element.getFirst( Widget.isParserWidgetElement );
-
-					if ( element )
-						toBeWrapped.push( [ element ] );
-
-					// Do not iterate over descendants.
-					return false;
-				}
-				// Widget element found - add it to be cleaned up (just in case)
-				// and wrapped and stop iterating in this branch.
-				else if ( 'data-widget' in element.attributes ) {
-					toBeWrapped.push( [ element ] );
-
-					// Do not iterate over descendants.
-					return false;
-				}
-				else if ( ( upcastsLength = upcasts.length ) ) {
-					// Ignore elements with data-cke-widget-upcasted to avoid multiple upcasts (https://dev.ckeditor.com/ticket/11533).
-					// Do not iterate over descendants.
-					if ( element.attributes[ 'data-cke-widget-upcasted' ] )
-						return false;
-
-					// Check element with upcast callbacks first.
-					// If any of them return false abort upcasting.
-					for ( i = 0, upcastCallbacksLength = upcastCallbacks.length; i < upcastCallbacksLength; ++i ) {
-						if ( upcastCallbacks[ i ]( element ) === false )
-							return;
-						// Return nothing in order to continue iterating over ascendants.
-						// See https://dev.ckeditor.com/ticket/11186#comment:6
-					}
-
-					for ( i = 0; i < upcastsLength; ++i ) {
-						upcast = upcasts[ i ];
-						data = {};
-
-						if ( ( upcasted = upcast[ 0 ]( element, data ) ) ) {
-							// If upcast function returned element, upcast this one.
-							// It can be e.g. a new element wrapping the original one.
-							if ( upcasted instanceof CKEDITOR.htmlParser.element )
-								element = upcasted;
-
-							// Set initial data attr with data from upcast method.
-							element.attributes[ 'data-cke-widget-data' ] = encodeURIComponent( JSON.stringify( data ) );
-							element.attributes[ 'data-cke-widget-upcasted' ] = 1;
-
-							toBeWrapped.push( [ element, upcast[ 1 ] ] );
-
-							// Do not iterate over descendants.
-							return false;
-						}
-					}
-				}
-			}
-		};
-	}
-
-	// Finds a first parent that matches query.
-	//
-	// @param {CKEDITOR.dom.element} element
-	// @param {Function} query
-	function findParent( element, query ) {
-		var parent = element;
-
-		while ( ( parent = parent.getParent() ) ) {
-			if ( query( parent ) )
-				return true;
-		}
-		return false;
-	}
-
-	function getWrapperAttributes( inlineWidget, name ) {
-		return {
-			// tabindex="-1" means that it can receive focus by code.
-			tabindex: -1,
-			contenteditable: 'false',
-			'data-cke-widget-wrapper': 1,
-			'data-cke-filter': 'off',
-			// Class cke_widget_new marks widgets which haven't been initialized yet.
-			'class': 'cke_widget_wrapper cke_widget_new cke_widget_' +
-				( inlineWidget ? 'inline' : 'block' ) +
-				( name ? ' cke_widget_' + name : '' )
-		};
-	}
-
-	// Inserts element at given index.
-	// It will check DTD and split ancestor elements up to the first
-	// that can contain this element.
-	//
-	// @param {CKEDITOR.htmlParser.element} parent
-	// @param {Number} index
-	// @param {CKEDITOR.htmlParser.element} element
-	function insertElement( parent, index, element ) {
-		// Do not split doc fragment...
-		if ( parent.type == CKEDITOR.NODE_ELEMENT ) {
-			var parentAllows = CKEDITOR.dtd[ parent.name ];
-			// Parent element is known (included in DTD) and cannot contain
-			// this element.
-			if ( parentAllows && !parentAllows[ element.name ] ) {
-				var parent2 = parent.split( index ),
-					parentParent = parent.parent;
-
-				// Element will now be inserted at right parent's index.
-				index = parent2.getIndex();
-
-				// If left part of split is empty - remove it.
-				if ( !parent.children.length ) {
-					index -= 1;
-					parent.remove();
-				}
-
-				// If right part of split is empty - remove it.
-				if ( !parent2.children.length )
-					parent2.remove();
-
-				// Try inserting as grandpas' children.
-				return insertElement( parentParent, index, element );
-			}
-		}
-
-		// Finally we can add this element.
-		parent.add( element, index );
-	}
-
-	// Checks whether for the given widget definition and element widget should be created in inline or block mode.
-	//
-	// See also: {@link CKEDITOR.plugins.widget.definition#inline} and {@link CKEDITOR.plugins.widget#element}.
-	//
-	// @param {CKEDITOR.plugins.widget.definition} widgetDef The widget definition.
-	// @param {String} elementName The name of the widget element.
-	// @returns {Boolean}
-	function isWidgetInline( widgetDef, elementName ) {
-		return typeof widgetDef.inline == 'boolean' ? widgetDef.inline : !!CKEDITOR.dtd.$inline[ elementName ];
-	}
-
-	// @param {CKEDITOR.dom.element}
-	// @returns {Boolean}
-	function isDomTemp( element ) {
-		return element.hasAttribute( 'data-cke-temp' );
-	}
-
-	function onEditableKey( widget, keyCode ) {
-		var focusedEditable = widget.focusedEditable,
-			range;
-
-		// CTRL+A.
-		if ( keyCode == CKEDITOR.CTRL + 65 ) {
-			var bogus = focusedEditable.getBogus();
-
-			range = widget.editor.createRange();
-			range.selectNodeContents( focusedEditable );
-			// Exclude bogus if exists.
-			if ( bogus )
-				range.setEndAt( bogus, CKEDITOR.POSITION_BEFORE_START );
-
-			range.select();
-			// Cancel event - block default.
-			return false;
-		}
-		// DEL or BACKSPACE.
-		else if ( keyCode == 8 || keyCode == 46 ) {
-			var ranges = widget.editor.getSelection().getRanges();
-
-			range = ranges[ 0 ];
-
-			// Block del or backspace if at editable's boundary.
-			return !( ranges.length == 1 && range.collapsed &&
-				range.checkBoundaryOfElement( focusedEditable, CKEDITOR[ keyCode == 8 ? 'START' : 'END' ] ) );
-		}
-	}
-
-	function setFocusedEditable( widgetsRepo, widget, editableElement, offline ) {
-		var editor = widgetsRepo.editor;
-
-		editor.fire( 'lockSnapshot' );
-
-		if ( editableElement ) {
-			var editableName = editableElement.data( 'cke-widget-editable' ),
-				editableInstance = widget.editables[ editableName ];
-
-			widgetsRepo.widgetHoldingFocusedEditable = widget;
-			widget.focusedEditable = editableInstance;
-			editableElement.addClass( 'cke_widget_editable_focused' );
-
-			if ( editableInstance.filter )
-				editor.setActiveFilter( editableInstance.filter );
-			editor.setActiveEnterMode( editableInstance.enterMode, editableInstance.shiftEnterMode );
-		} else {
-			if ( !offline )
-				widget.focusedEditable.removeClass( 'cke_widget_editable_focused' );
-
-			widget.focusedEditable = null;
-			widgetsRepo.widgetHoldingFocusedEditable = null;
-			editor.setActiveFilter( null );
-			editor.setActiveEnterMode( null, null );
-		}
-
-		editor.fire( 'unlockSnapshot' );
-	}
-
-	function setupContextMenu( editor ) {
-		if ( !editor.contextMenu )
-			return;
-
-		editor.contextMenu.addListener( function( element ) {
-			var widget = editor.widgets.getByElement( element, true );
-
-			if ( widget )
-				return widget.fire( 'contextMenu', {} );
-		} );
-	}
-
-	// And now we've got two problems - original problem and RegExp.
-	// Some softeners:
-	// * FF tends to copy all blocks up to the copybin container.
-	// * IE tends to copy only the copybin, without its container.
-	// * We use spans on IE and blockless editors, but divs in other cases.
-	var pasteReplaceRegex = new RegExp(
-		'^' +
-		'(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?' +
-			'(?:<(?:div|span)(?: style="[^"]+")?>)?' +
-				'<span [^>]*data-cke-copybin-start="1"[^>]*>.?</span>([\\s\\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?</span>' +
-			'(?:</(?:div|span)>)?' +
-		'(?:</(?:div|span)>)?' +
-		'$',
-		// IE8 prefers uppercase when browsers stick to lowercase HTML (https://dev.ckeditor.com/ticket/13460).
-		'i'
-	);
-
-	function pasteReplaceFn( match, wrapperHtml ) {
-		// Avoid polluting pasted data with any whitspaces,
-		// what's going to break check whether only one widget was pasted.
-		return CKEDITOR.tools.trim( wrapperHtml );
-	}
-
-	function setupDragAndDrop( widgetsRepo ) {
-		var editor = widgetsRepo.editor,
-			lineutils = CKEDITOR.plugins.lineutils;
-
-		// These listeners handle inline and block widgets drag and drop.
-		// The only thing we need to do to make block widgets custom drag and drop functionality
-		// is to fire those events with the right properties (like the target which must be the drag handle).
-		editor.on( 'dragstart', function( evt ) {
-			var target = evt.data.target;
-
-			if ( Widget.isDomDragHandler( target ) ) {
-				var widget = widgetsRepo.getByElement( target );
-
-				evt.data.dataTransfer.setData( 'cke/widget-id', widget.id );
-
-				// IE needs focus.
-				editor.focus();
-
-				// and widget need to be focused on drag start (https://dev.ckeditor.com/ticket/12172#comment:10).
-				widget.focus();
-			}
-
-		} );
-
-		editor.on( 'drop', function( evt ) {
-			var dataTransfer = evt.data.dataTransfer,
-				id = dataTransfer.getData( 'cke/widget-id' ),
-				transferType = dataTransfer.getTransferType( editor ),
-				dragRange = editor.createRange(),
-				sourceWidget;
-
-			// Disable cross-editor drag & drop for widgets - https://dev.ckeditor.com/ticket/13599.
-			if ( id !== '' && transferType === CKEDITOR.DATA_TRANSFER_CROSS_EDITORS ) {
-				evt.cancel();
-				return;
-			}
-
-			if ( id === '' || transferType != CKEDITOR.DATA_TRANSFER_INTERNAL ) {
-				return;
-			}
-
-			sourceWidget = widgetsRepo.instances[ id ];
-			if ( !sourceWidget ) {
-				return;
-			}
-
-			dragRange.setStartBefore( sourceWidget.wrapper );
-			dragRange.setEndAfter( sourceWidget.wrapper );
-			evt.data.dragRange = dragRange;
-
-			// [IE8-9] Reset state of the clipboard#fixSplitNodesAfterDrop fix because by setting evt.data.dragRange
-			// (see above) after drop happened we do not need it. That fix is needed only if dragRange was created
-			// before drop (before text node was split).
-			delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount;
-			delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount;
-
-			evt.data.dataTransfer.setData( 'text/html', editor.editable().getHtmlFromRange( dragRange ).getHtml() );
-			editor.widgets.destroy( sourceWidget, true );
-		} );
-
-		editor.on( 'contentDom', function() {
-			var editable = editor.editable();
-
-			// Register Lineutils's utilities as properties of repo.
-			CKEDITOR.tools.extend( widgetsRepo, {
-				finder: new lineutils.finder( editor, {
-					lookups: {
-						// Element is block but not list item and not in nested editable.
-						'default': function( el ) {
-							if ( el.is( CKEDITOR.dtd.$listItem ) )
-								return;
-
-							if ( !el.is( CKEDITOR.dtd.$block ) )
-								return;
-
-							// Allow drop line inside, but never before or after nested editable (https://dev.ckeditor.com/ticket/12006).
-							if ( Widget.isDomNestedEditable( el ) )
-								return;
-
-							// Do not allow droping inside the widget being dragged (https://dev.ckeditor.com/ticket/13397).
-							if ( widgetsRepo._.draggedWidget.wrapper.contains( el ) ) {
-								return;
-							}
-
-							// If element is nested editable, make sure widget can be dropped there (https://dev.ckeditor.com/ticket/12006).
-							var nestedEditable = Widget.getNestedEditable( editable, el );
-							if ( nestedEditable ) {
-								var draggedWidget = widgetsRepo._.draggedWidget;
-
-								// Don't let the widget to be dropped into its own nested editable.
-								if ( widgetsRepo.getByElement( nestedEditable ) == draggedWidget )
-									return;
-
-								var filter = CKEDITOR.filter.instances[ nestedEditable.data( 'cke-filter' ) ],
-									draggedRequiredContent = draggedWidget.requiredContent;
-
-								// There will be no relation if the filter of nested editable does not allow
-								// requiredContent of dragged widget.
-								if ( filter && draggedRequiredContent && !filter.check( draggedRequiredContent ) )
-									return;
-							}
-
-							return CKEDITOR.LINEUTILS_BEFORE | CKEDITOR.LINEUTILS_AFTER;
-						}
-					}
-				} ),
-				locator: new lineutils.locator( editor ),
-				liner: new lineutils.liner( editor, {
-					lineStyle: {
-						cursor: 'move !important',
-						'border-top-color': '#666'
-					},
-					tipLeftStyle: {
-						'border-left-color': '#666'
-					},
-					tipRightStyle: {
-						'border-right-color': '#666'
-					}
-				} )
-			}, true );
-		} );
-	}
-
-	// Setup mouse observer which will trigger:
-	// * widget focus on widget click,
-	// * widget#doubleclick forwarded from editor#doubleclick.
-	function setupMouseObserver( widgetsRepo ) {
-		var editor = widgetsRepo.editor;
-
-		editor.on( 'contentDom', function() {
-			var editable = editor.editable(),
-				evtRoot = editable.isInline() ? editable : editor.document,
-				widget,
-				mouseDownOnDragHandler;
-
-			editable.attachListener( evtRoot, 'mousedown', function( evt ) {
-				var target = evt.data.getTarget();
-
-				// Clicking scrollbar in Chrome will invoke event with target object of document type (#663).
-				// In IE8 the target object will be empty (https://dev.ckeditor.com/ticket/10887).
-				// We need to check if target is a proper element.
-				widget = ( target instanceof CKEDITOR.dom.element ) ? widgetsRepo.getByElement( target ) : null;
-
-				mouseDownOnDragHandler = 0; // Reset.
-
-				// Widget was clicked, but not editable nested in it.
-				if ( widget ) {
-					// Ignore mousedown on drag and drop handler if the widget is inline.
-					// Block widgets are handled by Lineutils.
-					if ( widget.inline && target.type == CKEDITOR.NODE_ELEMENT && target.hasAttribute( 'data-cke-widget-drag-handler' ) ) {
-						mouseDownOnDragHandler = 1;
-
-						// When drag handler is pressed we have to clear current selection if it wasn't already on this widget.
-						// Otherwise, the selection may be in a fillingChar, which prevents dragging a widget. (https://dev.ckeditor.com/ticket/13284, see comment 8 and 9.)
-						if ( widgetsRepo.focused != widget )
-							editor.getSelection().removeAllRanges();
-
-						return;
-					}
-
-					if ( !Widget.getNestedEditable( widget.wrapper, target ) ) {
-						evt.data.preventDefault();
-						if ( !CKEDITOR.env.ie )
-							widget.focus();
-					} else {
-						// Reset widget so mouseup listener is not confused.
-						widget = null;
-					}
-				}
-			} );
-
-			// Focus widget on mouseup if mousedown was fired on drag handler.
-			// Note: mouseup won't be fired at all if widget was dragged and dropped, so
-			// this code will be executed only when drag handler was clicked.
-			editable.attachListener( evtRoot, 'mouseup', function() {
-				// Check if widget is not destroyed (if widget is destroyed the wrapper will be null).
-				if ( mouseDownOnDragHandler && widget && widget.wrapper ) {
-					mouseDownOnDragHandler = 0;
-					widget.focus();
-				}
-			} );
-
-			// On IE it is not enough to block mousedown. If widget wrapper (element with
-			// contenteditable=false attribute) is clicked directly (it is a target),
-			// then after mouseup/click IE will select that element.
-			// It is not possible to prevent that default action,
-			// so we force fake selection after everything happened.
-			if ( CKEDITOR.env.ie ) {
-				editable.attachListener( evtRoot, 'mouseup', function() {
-					setTimeout( function() {
-						// Check if widget is not destroyed (if widget is destroyed the wrapper will be null) and
-						// in editable contains widget (it could be dragged and removed).
-						if ( widget && widget.wrapper && editable.contains( widget.wrapper ) ) {
-							widget.focus();
-							widget = null;
-						}
-					} );
-				} );
-			}
-		} );
-
-		editor.on( 'doubleclick', function( evt ) {
-			var widget = widgetsRepo.getByElement( evt.data.element );
-
-			// Not in widget or in nested editable.
-			if ( !widget || Widget.getNestedEditable( widget.wrapper, evt.data.element ) )
-				return;
-
-			return widget.fire( 'doubleclick', { element: evt.data.element } );
-		}, null, null, 1 );
-	}
-
-	// Setup editor#key observer which will forward it
-	// to focused widget.
-	function setupKeyboardObserver( widgetsRepo ) {
-		var editor = widgetsRepo.editor;
-
-		editor.on( 'key', function( evt ) {
-			var focused = widgetsRepo.focused,
-				widgetHoldingFocusedEditable = widgetsRepo.widgetHoldingFocusedEditable,
-				ret;
-
-			if ( focused )
-				ret = focused.fire( 'key', { keyCode: evt.data.keyCode } );
-			else if ( widgetHoldingFocusedEditable )
-				ret = onEditableKey( widgetHoldingFocusedEditable, evt.data.keyCode );
-
-			return ret;
-		}, null, null, 1 );
-	}
-
-	// Setup copybin on native copy and cut events in order to handle copy and cut commands
-	// if user accepted security alert on IEs.
-	// Note: when copying or cutting using keystroke, copySingleWidget will be first executed
-	// by the keydown listener. Conflict between two calls will be resolved by copy_bin existence check.
-	function setupNativeCutAndCopy( widgetsRepo ) {
-		var editor = widgetsRepo.editor;
-
-		editor.on( 'contentDom', function() {
-			var editable = editor.editable();
-
-			editable.attachListener( editable, 'copy', eventListener );
-			editable.attachListener( editable, 'cut', eventListener );
-		} );
-
-		function eventListener( evt ) {
-			if ( widgetsRepo.focused )
-				copySingleWidget( widgetsRepo.focused, evt.name == 'cut' );
-		}
-	}
-
-	// Setup selection observer which will trigger:
-	// * widget select & focus on selection change,
-	// * nested editable focus (related properites and classes) on selection change,
-	// * deselecting and blurring all widgets on data,
-	// * blurring widget on editor blur.
-	function setupSelectionObserver( widgetsRepo ) {
-		var editor = widgetsRepo.editor;
-
-		editor.on( 'selectionCheck', function() {
-			widgetsRepo.fire( 'checkSelection' );
-		} );
-
-		widgetsRepo.on( 'checkSelection', widgetsRepo.checkSelection, widgetsRepo );
-
-		editor.on( 'selectionChange', function( evt ) {
-			var nestedEditable = Widget.getNestedEditable( editor.editable(), evt.data.selection.getStartElement() ),
-				newWidget = nestedEditable && widgetsRepo.getByElement( nestedEditable ),
-				oldWidget = widgetsRepo.widgetHoldingFocusedEditable;
-
-			if ( oldWidget ) {
-				if ( oldWidget !== newWidget || !oldWidget.focusedEditable.equals( nestedEditable ) ) {
-					setFocusedEditable( widgetsRepo, oldWidget, null );
-
-					if ( newWidget && nestedEditable )
-						setFocusedEditable( widgetsRepo, newWidget, nestedEditable );
-				}
-			}
-			// It may happen that there's no widget even if editable was found -
-			// e.g. if selection was automatically set in editable although widget wasn't initialized yet.
-			else if ( newWidget && nestedEditable ) {
-				setFocusedEditable( widgetsRepo, newWidget, nestedEditable );
-			}
-		} );
-
-		// Invalidate old widgets early - immediately on dataReady.
-		editor.on( 'dataReady', function() {
-			// Deselect and blur all widgets.
-			stateUpdater( widgetsRepo ).commit();
-		} );
-
-		editor.on( 'blur', function() {
-			var widget;
-
-			if ( ( widget = widgetsRepo.focused ) )
-				blurWidget( widgetsRepo, widget );
-
-			if ( ( widget = widgetsRepo.widgetHoldingFocusedEditable ) )
-				setFocusedEditable( widgetsRepo, widget, null );
-		} );
-	}
-
-	// Set up actions like:
-	// * processing in toHtml/toDataFormat,
-	// * pasting handling,
-	// * insertion handling,
-	// * editable reload handling (setData, mode switch, undo/redo),
-	// * DOM invalidation handling,
-	// * widgets checks.
-	function setupWidgetsLifecycle( widgetsRepo ) {
-		setupWidgetsLifecycleStart( widgetsRepo );
-		setupWidgetsLifecycleEnd( widgetsRepo );
-
-		widgetsRepo.on( 'checkWidgets', checkWidgets );
-		widgetsRepo.editor.on( 'contentDomInvalidated', widgetsRepo.checkWidgets, widgetsRepo );
-	}
-
-	function setupWidgetsLifecycleEnd( widgetsRepo ) {
-		var editor = widgetsRepo.editor,
-			downcastingSessions = {};
-
-		// Listen before htmlDP#htmlFilter is applied to cache all widgets, because we'll
-		// loose data-cke-* attributes.
-		editor.on( 'toDataFormat', function( evt ) {
-			// To avoid conflicts between htmlDP#toDF calls done at the same time
-			// (e.g. nestedEditable#getData called during downcasting some widget)
-			// mark every toDataFormat event chain with the downcasting session id.
-			var id = CKEDITOR.tools.getNextNumber(),
-				toBeDowncasted = [];
-			evt.data.downcastingSessionId = id;
-			downcastingSessions[ id ] = toBeDowncasted;
-
-			evt.data.dataValue.forEach( function( element ) {
-				var attrs = element.attributes,
-					widget, widgetElement;
-
-				// Reset initial and trailing space by replacing &nbsp; with white space (#605).
-				if ( 'data-cke-widget-white-space' in attrs ) {
-					var firstTextNode = getFirstTextNode( element ),
-						lastTextNode = getLastTextNode( element );
-
-					// Check whether the value of the text node contains &nbsp; at the beginning and replace it with white space.
-					if ( firstTextNode.parent.attributes[ 'data-cke-white-space-first' ] ) {
-						firstTextNode.value = firstTextNode.value.replace( /^&nbsp;/g, ' ' );
-					}
-
-					// Check whether the value of the text node contains &nbsp; at the end and replace it with white space.
-					if ( lastTextNode.parent.attributes[ 'data-cke-white-space-last' ] ) {
-						lastTextNode.value = lastTextNode.value.replace( /&nbsp;$/g, ' ' );
-					}
-				}
-
-				// Wrapper.
-				// Perform first part of downcasting (cleanup) and cache widgets,
-				// because after applying DP's filter all data-cke-* attributes will be gone.
-				if ( 'data-cke-widget-id' in attrs ) {
-					widget = widgetsRepo.instances[ attrs[ 'data-cke-widget-id' ] ];
-					if ( widget ) {
-						widgetElement = element.getFirst( Widget.isParserWidgetElement );
-						toBeDowncasted.push( {
-							wrapper: element,
-							element: widgetElement,
-							widget: widget,
-							editables: {}
-						} );
-
-						// If widget did not have data-cke-widget attribute before upcasting remove it.
-						if ( widgetElement.attributes[ 'data-cke-widget-keep-attr' ] != '1' )
-							delete widgetElement.attributes[ 'data-widget' ];
-					}
-				}
-				// Nested editable.
-				else if ( 'data-cke-widget-editable' in attrs ) {
-					// Save the reference to this nested editable in the closest widget to be downcasted.
-					// Nested editables are downcasted in the successive toDataFormat to create an opportunity
-					// for dataFilter's "excludeNestedEditable" option to do its job (that option relies on
-					// contenteditable="true" attribute) (https://dev.ckeditor.com/ticket/11372).
-					toBeDowncasted[ toBeDowncasted.length - 1 ].editables[ attrs[ 'data-cke-widget-editable' ] ] = element;
-
-					// Don't check children - there won't be next wrapper or nested editable which we
-					// should process in this session.
-					return false;
-				}
-			}, CKEDITOR.NODE_ELEMENT, true );
-		}, null, null, 8 );
-
-		// Listen after dataProcessor.htmlFilter and ACF were applied
-		// so wrappers securing widgets' contents are removed after all filtering was done.
-		editor.on( 'toDataFormat', function( evt ) {
-			// Ignore some unmarked sessions.
-			if ( !evt.data.downcastingSessionId )
-				return;
-
-			var toBeDowncasted = downcastingSessions[ evt.data.downcastingSessionId ],
-				toBe, widget, widgetElement, retElement, editableElement, e;
-
-			while ( ( toBe = toBeDowncasted.shift() ) ) {
-				widget = toBe.widget;
-				widgetElement = toBe.element;
-				retElement = widget._.downcastFn && widget._.downcastFn.call( widget, widgetElement );
-
-				// Replace nested editables' content with their output data.
-				for ( e in toBe.editables ) {
-					editableElement = toBe.editables[ e ];
-
-					delete editableElement.attributes.contenteditable;
-					editableElement.setHtml( widget.editables[ e ].getData() );
-				}
-
-				// Returned element always defaults to widgetElement.
-				if ( !retElement )
-					retElement = widgetElement;
-
-				toBe.wrapper.replaceWith( retElement );
-			}
-		}, null, null, 13 );
-
-
-		editor.on( 'contentDomUnload', function() {
-			widgetsRepo.destroyAll( true );
-		} );
-	}
-
-	function setupWidgetsLifecycleStart( widgetsRepo ) {
-		var editor = widgetsRepo.editor,
-			processedWidgetOnly,
-			snapshotLoaded;
-
-		// Listen after ACF (so data are filtered),
-		// but before dataProcessor.dataFilter was applied (so we can secure widgets' internals).
-		editor.on( 'toHtml', function( evt ) {
-			var upcastIterator = createUpcastIterator( widgetsRepo ),
-				toBeWrapped;
-
-			evt.data.dataValue.forEach( upcastIterator.iterator, CKEDITOR.NODE_ELEMENT, true );
-
-			// Clean up and wrap all queued elements.
-			while ( ( toBeWrapped = upcastIterator.toBeWrapped.pop() ) ) {
-				cleanUpWidgetElement( toBeWrapped[ 0 ] );
-				widgetsRepo.wrapElement( toBeWrapped[ 0 ], toBeWrapped[ 1 ] );
-			}
-
-			// Used to determine whether only widget was pasted.
-			if ( evt.data.protectedWhitespaces ) {
-				// Whitespaces are protected by wrapping content with spans. Take the middle node only.
-				processedWidgetOnly = evt.data.dataValue.children.length == 3 &&
-					Widget.isParserWidgetWrapper( evt.data.dataValue.children[ 1 ] );
-			} else {
-				processedWidgetOnly = evt.data.dataValue.children.length == 1 &&
-					Widget.isParserWidgetWrapper( evt.data.dataValue.children[ 0 ] );
-			}
-		}, null, null, 8 );
-
-		editor.on( 'dataReady', function() {
-			// Clean up all widgets loaded from snapshot.
-			if ( snapshotLoaded )
-				cleanUpAllWidgetElements( widgetsRepo, editor.editable() );
-			snapshotLoaded = 0;
-
-			// Some widgets were destroyed on contentDomUnload,
-			// some on loadSnapshot, but that does not include
-			// e.g. setHtml on inline editor or widgets removed just
-			// before setting data.
-			widgetsRepo.destroyAll( true );
-			widgetsRepo.initOnAll();
-		} );
-
-		// Set flag so dataReady will know that additional
-		// cleanup is needed, because snapshot containing widgets was loaded.
-		editor.on( 'loadSnapshot', function( evt ) {
-			// Primitive but sufficient check which will prevent from executing
-			// heavier cleanUpAllWidgetElements if not needed.
-			if ( ( /data-cke-widget/ ).test( evt.data ) )
-				snapshotLoaded = 1;
-
-			widgetsRepo.destroyAll( true );
-		}, null, null, 9 );
-
-		// Handle pasted single widget.
-		editor.on( 'paste', function( evt ) {
-			var data = evt.data;
-
-			data.dataValue = data.dataValue.replace( pasteReplaceRegex, pasteReplaceFn );
-
-			// If drag'n'drop kind of paste into nested editable (data.range), selection is set AFTER
-			// data is pasted, which means editor has no chance to change activeFilter's context.
-			// As a result, pasted data is filtered with default editor's filter instead of NE's and
-			// funny things get inserted. Changing the filter by analysis of the paste range below (https://dev.ckeditor.com/ticket/13186).
-			if ( data.range ) {
-				// Check if pasting into nested editable.
-				var nestedEditable = Widget.getNestedEditable( editor.editable(), data.range.startContainer );
-
-				if ( nestedEditable ) {
-					// Retrieve the filter from NE's data and set it active before editor.insertHtml is done
-					// in clipboard plugin.
-					var filter = CKEDITOR.filter.instances[ nestedEditable.data( 'cke-filter' ) ];
-
-					if ( filter ) {
-						editor.setActiveFilter( filter );
-					}
-				}
-			}
-		} );
-
-		// Listen with high priority to check widgets after data was inserted.
-		editor.on( 'afterInsertHtml', function( evt ) {
-			if ( evt.data.intoRange ) {
-				widgetsRepo.checkWidgets( { initOnlyNew: true } );
-			} else {
-				editor.fire( 'lockSnapshot' );
-				// Init only new for performance reason.
-				// Focus inited if only widget was processed.
-				widgetsRepo.checkWidgets( { initOnlyNew: true, focusInited: processedWidgetOnly } );
-
-				editor.fire( 'unlockSnapshot' );
-			}
-		} );
-	}
-
-	// Helper for coordinating which widgets should be
-	// selected/deselected and which one should be focused/blurred.
-	function stateUpdater( widgetsRepo ) {
-		var currentlySelected = widgetsRepo.selected,
-			toBeSelected = [],
-			toBeDeselected = currentlySelected.slice( 0 ),
-			focused = null;
-
-		return {
-			select: function( widget ) {
-				if ( CKEDITOR.tools.indexOf( currentlySelected, widget ) < 0 )
-					toBeSelected.push( widget );
-
-				var index = CKEDITOR.tools.indexOf( toBeDeselected, widget );
-				if ( index >= 0 )
-					toBeDeselected.splice( index, 1 );
-
-				return this;
-			},
-
-			focus: function( widget ) {
-				focused = widget;
-				return this;
-			},
-
-			commit: function() {
-				var focusedChanged = widgetsRepo.focused !== focused,
-					widget, isDirty;
-
-				widgetsRepo.editor.fire( 'lockSnapshot' );
-
-				if ( focusedChanged && ( widget = widgetsRepo.focused ) )
-					blurWidget( widgetsRepo, widget );
-
-				while ( ( widget = toBeDeselected.pop() ) ) {
-					currentlySelected.splice( CKEDITOR.tools.indexOf( currentlySelected, widget ), 1 );
-					// Widget could be destroyed in the meantime - e.g. data could be set.
-					if ( widget.isInited() ) {
-						isDirty = widget.editor.checkDirty();
-
-						widget.setSelected( false );
-
-						!isDirty && widget.editor.resetDirty();
-					}
-				}
-
-				if ( focusedChanged && focused ) {
-					isDirty = widgetsRepo.editor.checkDirty();
-
-					widgetsRepo.focused = focused;
-					widgetsRepo.fire( 'widgetFocused', { widget: focused } );
-					focused.setFocused( true );
-
-					!isDirty && widgetsRepo.editor.resetDirty();
-				}
-
-				while ( ( widget = toBeSelected.pop() ) ) {
-					currentlySelected.push( widget );
-					widget.setSelected( true );
-				}
-
-				widgetsRepo.editor.fire( 'unlockSnapshot' );
-			}
-		};
-	}
-
-
-	//
-	// WIDGET helpers ---------------------------------------------------------
-	//
-
-	// LEFT, RIGHT, UP, DOWN, DEL, BACKSPACE - unblock default fake sel handlers.
-	var keystrokesNotBlockedByWidget = { 37: 1, 38: 1, 39: 1, 40: 1, 8: 1, 46: 1 };
-
-	// Do not block SHIFT + F10 which opens context menu (#1901).
-	keystrokesNotBlockedByWidget[ CKEDITOR.SHIFT + 121 ] = 1;
-
-	// Applies or removes style's classes from widget.
-	// @param {CKEDITOR.style} style Custom widget style.
-	// @param {Boolean} apply Whether to apply or remove style.
-	function applyRemoveStyle( widget, style, apply ) {
-		var changed = 0,
-			classes = getStyleClasses( style ),
-			updatedClasses = widget.data.classes || {},
-			cl;
-
-		// Ee... Something is wrong with this style.
-		if ( !classes )
-			return;
-
-		// Clone, because we need to break reference.
-		updatedClasses = CKEDITOR.tools.clone( updatedClasses );
-
-		while ( ( cl = classes.pop() ) ) {
-			if ( apply ) {
-				if ( !updatedClasses[ cl ] )
-					changed = updatedClasses[ cl ] = 1;
-			} else {
-				if ( updatedClasses[ cl ] ) {
-					delete updatedClasses[ cl ];
-					changed = 1;
-				}
-			}
-		}
-		if ( changed )
-			widget.setData( 'classes', updatedClasses );
-	}
-
-	function cancel( evt ) {
-		evt.cancel();
-	}
-
-	function copySingleWidget( widget, isCut ) {
-		var editor = widget.editor,
-			doc = editor.document,
-			isEdge16 = CKEDITOR.env.edge && CKEDITOR.env.version >= 16;
-
-		// We're still handling previous copy/cut.
-		// When keystroke is used to copy/cut this will also prevent
-		// conflict with copySingleWidget called again for native copy/cut event.
-		if ( doc.getById( 'cke_copybin' ) )
-			return;
-
-		// [IE] Use span for copybin and its container to avoid bug with expanding
-		// editable height by absolutely positioned element.
-		// For Edge 16+ always use div, as span causes scrolling to the end of the document
-		// on widget cut (also for blockless editor) (#1160).
-		// Edge 16+ workaround could be safetly removed after #1169 is fixed.
-		var copybinName = ( ( editor.blockless || CKEDITOR.env.ie ) && !isEdge16 ) ? 'span' : 'div',
-			copybin = doc.createElement( copybinName ),
-			copybinContainer = doc.createElement( copybinName ),
-			// IE8 always jumps to the end of document.
-			needsScrollHack = CKEDITOR.env.ie && CKEDITOR.env.version < 9;
-
-		copybinContainer.setAttributes( {
-			id: 'cke_copybin',
-			'data-cke-temp': '1'
-		} );
-
-		// Position copybin element outside current viewport.
-		copybin.setStyles( {
-			position: 'absolute',
-			width: '1px',
-			height: '1px',
-			overflow: 'hidden'
-		} );
-
-		copybin.setStyle( editor.config.contentsLangDirection == 'ltr' ? 'left' : 'right', '-5000px' );
-
-		var range = editor.createRange();
-		range.setStartBefore( widget.wrapper );
-		range.setEndAfter( widget.wrapper );
-
-		copybin.setHtml(
-			'<span data-cke-copybin-start="1">\u200b</span>' +
-			editor.editable().getHtmlFromRange( range ).getHtml() +
-			'<span data-cke-copybin-end="1">\u200b</span>' );
-
-		// Save snapshot with the current state.
-		editor.fire( 'saveSnapshot' );
-
-		// Ignore copybin.
-		editor.fire( 'lockSnapshot' );
-
-		copybinContainer.append( copybin );
-		editor.editable().append( copybinContainer );
-
-		var listener1 = editor.on( 'selectionChange', cancel, null, null, 0 ),
-			listener2 = widget.repository.on( 'checkSelection', cancel, null, null, 0 );
-
-		if ( needsScrollHack ) {
-			var docElement = doc.getDocumentElement().$,
-				scrollTop = docElement.scrollTop;
-		}
-
-		// Once the clone of the widget is inside of copybin, select
-		// the entire contents. This selection will be copied by the
-		// native browser's clipboard system.
-		range = editor.createRange();
-		range.selectNodeContents( copybin );
-		range.select();
-
-		if ( needsScrollHack )
-			docElement.scrollTop = scrollTop;
-
-		setTimeout( function() {
-			// [IE] Focus widget before removing copybin to avoid scroll jump.
-			if ( !isCut )
-				widget.focus();
-
-			copybinContainer.remove();
-
-			listener1.removeListener();
-			listener2.removeListener();
-
-			editor.fire( 'unlockSnapshot' );
-
-			// Prevent cutting in read-only editor (#1570).
-			if ( isCut && !editor.readOnly ) {
-				widget.repository.del( widget );
-				editor.fire( 'saveSnapshot' );
-			}
-		}, 100 ); // Use 100ms, so Chrome (@Mac) will be able to grab the content.
-	}
-
-	// Extracts classes array from style instance.
-	function getStyleClasses( style ) {
-		var attrs = style.getDefinition().attributes,
-			classes = attrs && attrs[ 'class' ];
-
-		return classes ? classes.split( /\s+/ ) : null;
-	}
-
-	// [IE] Force keeping focus because IE sometimes forgets to fire focus on main editable
-	// when blurring nested editable.
-	// @context widget
-	function onEditableBlur() {
-		var active = CKEDITOR.document.getActive(),
-			editor = this.editor,
-			editable = editor.editable();
-
-		// If focus stays within editor override blur and set currentActive because it should be
-		// automatically changed to editable on editable#focus but it is not fired.
-		if ( ( editable.isInline() ? editable : editor.document.getWindow().getFrame() ).equals( active ) )
-			editor.focusManager.focus( editable );
-	}
-
-	// Force selectionChange when editable was focused.
-	// Similar to hack in selection.js#~620.
-	// @context widget
-	function onEditableFocus() {
-		// Gecko does not support 'DOMFocusIn' event on which we unlock selection
-		// in selection.js to prevent selection locking when entering nested editables.
-		if ( CKEDITOR.env.gecko )
-			this.editor.unlockSelection();
-
-		// We don't need to force selectionCheck on Webkit, because on Webkit
-		// we do that on DOMFocusIn in selection.js.
-		if ( !CKEDITOR.env.webkit ) {
-			this.editor.forceNextSelectionCheck();
-			this.editor.selectionChange( 1 );
-		}
-	}
-
-	// Setup listener on widget#data which will update (remove/add) classes
-	// by comparing newly set classes with the old ones.
-	function setupDataClassesListener( widget ) {
-		// Note: previousClasses and newClasses may be null!
-		// Tip: for ( cl in null ) is correct.
-		var previousClasses = null;
-
-		widget.on( 'data', function() {
-			var newClasses = this.data.classes,
-				cl;
-
-			// When setting new classes one need to remember
-			// that he must break reference.
-			if ( previousClasses == newClasses )
-				return;
-
-			for ( cl in previousClasses ) {
-				// Avoid removing and adding classes again.
-				if ( !( newClasses && newClasses[ cl ] ) )
-					this.removeClass( cl );
-			}
-			for ( cl in newClasses )
-				this.addClass( cl );
-
-			previousClasses = newClasses;
-		} );
-	}
-
-	// Add a listener to data event that will set/change widget's label (https://dev.ckeditor.com/ticket/14539).
-	function setupA11yListener( widget ) {
-		// Note, the function gets executed in a context of widget instance.
-		function getLabelDefault() {
-			return this.editor.lang.widget.label.replace( /%1/, this.pathName || this.element.getName() );
-		}
-
-		// Setting a listener on data is enough, there's no need to perform it on widget initialization, as
-		// setupWidgetData fires this event anyway.
-		widget.on( 'data', function() {
-			// In some cases widget might get destroyed in an earlier data listener. For instance, image2 plugin, does
-			// so when changing its internal state.
-			if ( !widget.wrapper ) {
-				return;
-			}
-
-			var label = this.getLabel ? this.getLabel() : getLabelDefault.call( this );
-
-			widget.wrapper.setAttribute( 'role', 'region' );
-			widget.wrapper.setAttribute( 'aria-label', label );
-		}, null, null, 9999 );
-	}
-
-	function setupDragHandler( widget ) {
-		if ( !widget.draggable )
-			return;
-
-		var editor = widget.editor,
-			// Use getLast to find wrapper's direct descendant (https://dev.ckeditor.com/ticket/12022).
-			container = widget.wrapper.getLast( Widget.isDomDragHandlerContainer ),
-			img;
-
-		// Reuse drag handler if already exists (https://dev.ckeditor.com/ticket/11281).
-		if ( container )
-			img = container.findOne( 'img' );
-		else {
-			container = new CKEDITOR.dom.element( 'span', editor.document );
-			container.setAttributes( {
-				'class': 'cke_reset cke_widget_drag_handler_container',
-				// Split background and background-image for IE8 which will break on rgba().
-				style: 'background:rgba(220,220,220,0.5);background-image:url(' + editor.plugins.widget.path + 'images/handle.png)'
-			} );
-
-			img = new CKEDITOR.dom.element( 'img', editor.document );
-			img.setAttributes( {
-				'class': 'cke_reset cke_widget_drag_handler',
-				'data-cke-widget-drag-handler': '1',
-				src: CKEDITOR.tools.transparentImageData,
-				width: DRAG_HANDLER_SIZE,
-				title: editor.lang.widget.move,
-				height: DRAG_HANDLER_SIZE,
-				role: 'presentation'
-			} );
-			widget.inline && img.setAttribute( 'draggable', 'true' );
-
-			container.append( img );
-			widget.wrapper.append( container );
-		}
-
-		// Preventing page reload when dropped content on widget wrapper (https://dev.ckeditor.com/ticket/13015).
-		// Widget is not editable so by default drop on it isn't allowed what means that
-		// browser handles it (there's no editable#drop event). If there's no drop event we cannot block
-		// the drop, so page is reloaded. This listener enables drop on widget wrappers.
-		widget.wrapper.on( 'dragover', function( evt ) {
-			evt.data.preventDefault();
-		} );
-
-		widget.wrapper.on( 'mouseenter', widget.updateDragHandlerPosition, widget );
-		setTimeout( function() {
-			widget.on( 'data', widget.updateDragHandlerPosition, widget );
-		}, 50 );
-
-		if ( !widget.inline ) {
-			img.on( 'mousedown', onBlockWidgetDrag, widget );
-
-			// On IE8 'dragstart' is propagated to editable, so editor#dragstart is fired twice on block widgets.
-			if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-				img.on( 'dragstart', function( evt ) {
-					evt.data.preventDefault( true );
-				} );
-			}
-		}
-
-		widget.dragHandlerContainer = container;
-	}
-
-	function onBlockWidgetDrag( evt ) {
-		// Allow to drag widget only with left mouse button (#711).
-		if ( CKEDITOR.tools.getMouseButton( evt ) !== CKEDITOR.MOUSE_BUTTON_LEFT ) {
-			return;
-		}
-
-		var finder = this.repository.finder,
-			locator = this.repository.locator,
-			liner = this.repository.liner,
-			editor = this.editor,
-			editable = editor.editable(),
-			listeners = [],
-			sorted = [],
-			locations,
-			y;
-
-		// Mark dragged widget for repository#finder.
-		this.repository._.draggedWidget = this;
-
-		// Harvest all possible relations and display some closest.
-		var relations = finder.greedySearch(),
-
-			buffer = CKEDITOR.tools.eventsBuffer( 50, function() {
-				locations = locator.locate( relations );
-
-				// There's only a single line displayed for D&D.
-				sorted = locator.sort( y, 1 );
-
-				if ( sorted.length ) {
-					liner.prepare( relations, locations );
-					liner.placeLine( sorted[ 0 ] );
-					liner.cleanup();
-				}
-			} );
-
-		// Let's have the "dragging cursor" over entire editable.
-		editable.addClass( 'cke_widget_dragging' );
-
-		// Cache mouse position so it is re-used in events buffer.
-		listeners.push( editable.on( 'mousemove', function( evt ) {
-			y = evt.data.$.clientY;
-			buffer.input();
-		} ) );
-
-		// Fire drag start as it happens during the native D&D.
-		editor.fire( 'dragstart', { target: evt.sender } );
-
-
-		function onMouseUp() {
-			var l;
-
-			buffer.reset();
-
-			// Stop observing events.
-			while ( ( l = listeners.pop() ) )
-				l.removeListener();
-
-			onBlockWidgetDrop.call( this, sorted, evt.sender );
-		}
-
-		// Mouseup means "drop". This is when the widget is being detached
-		// from DOM and placed at range determined by the line (location).
-		listeners.push( editor.document.once( 'mouseup', onMouseUp, this ) );
-
-		// Prevent calling 'onBlockWidgetDrop' twice in the inline editor.
-		// `removeListener` does not work if it is called at the same time event is fired.
-		if ( !editable.isInline() ) {
-			// Mouseup may occur when user hovers the line, which belongs to
-			// the outer document. This is, of course, a valid listener too.
-			listeners.push( CKEDITOR.document.once( 'mouseup', onMouseUp, this ) );
-		}
-	}
-
-	function onBlockWidgetDrop( sorted, dragTarget ) {
-		var finder = this.repository.finder,
-			liner = this.repository.liner,
-			editor = this.editor,
-			editable = this.editor.editable();
-
-		if ( !CKEDITOR.tools.isEmpty( liner.visible ) ) {
-			// Retrieve range for the closest location.
-			var dropRange = finder.getRange( sorted[ 0 ] );
-
-			// Focus widget (it could lost focus after mousedown+mouseup)
-			// and save this state as the one where we want to be taken back when undoing.
-			this.focus();
-
-			// Drag range will be set in the drop listener.
-			editor.fire( 'drop', {
-				dropRange: dropRange,
-				target: dropRange.startContainer
-			} );
-		}
-
-		// Clean-up custom cursor for editable.
-		editable.removeClass( 'cke_widget_dragging' );
-
-		// Clean-up all remaining lines.
-		liner.hideVisible();
-
-		// Clean-up drag & drop.
-		editor.fire( 'dragend', { target: dragTarget } );
-	}
-
-	function setupEditables( widget ) {
-		var editableName,
-			editableDef,
-			definedEditables = widget.editables;
-
-		widget.editables = {};
-
-		if ( !widget.editables )
-			return;
-
-		for ( editableName in definedEditables ) {
-			editableDef = definedEditables[ editableName ];
-			widget.initEditable( editableName, typeof editableDef == 'string' ? { selector: editableDef } : editableDef );
-		}
-	}
-
-	function setupMask( widget ) {
-		if ( !widget.mask )
-			return;
-
-		// Reuse mask if already exists (https://dev.ckeditor.com/ticket/11281).
-		var img = widget.wrapper.findOne( '.cke_widget_mask' );
-
-		if ( !img ) {
-			img = new CKEDITOR.dom.element( 'img', widget.editor.document );
-			img.setAttributes( {
-				src: CKEDITOR.tools.transparentImageData,
-				'class': 'cke_reset cke_widget_mask'
-			} );
-			widget.wrapper.append( img );
-		}
-
-		widget.mask = img;
-	}
-
-	// Replace parts object containing:
-	// partName => selector pairs
-	// with:
-	// partName => element pairs
-	function setupParts( widget ) {
-		if ( widget.parts ) {
-			var parts = {},
-				el, partName;
-
-			for ( partName in widget.parts ) {
-				el = widget.wrapper.findOne( widget.parts[ partName ] );
-				parts[ partName ] = el;
-			}
-			widget.parts = parts;
-		}
-	}
-
-	function setupWidget( widget, widgetDef ) {
-		setupWrapper( widget );
-		setupParts( widget );
-		setupEditables( widget );
-		setupMask( widget );
-		setupDragHandler( widget );
-		setupDataClassesListener( widget );
-		setupA11yListener( widget );
-
-		// https://dev.ckeditor.com/ticket/11145: [IE8] Non-editable content of widget is draggable.
-		if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-			widget.wrapper.on( 'dragstart', function( evt ) {
-				var target = evt.data.getTarget();
-
-				// Allow text dragging inside nested editables or dragging inline widget's drag handler.
-				if ( !Widget.getNestedEditable( widget, target ) && !( widget.inline && Widget.isDomDragHandler( target ) ) )
-					evt.data.preventDefault();
-			} );
-		}
-
-		widget.wrapper.removeClass( 'cke_widget_new' );
-		widget.element.addClass( 'cke_widget_element' );
-
-		widget.on( 'key', function( evt ) {
-			var keyCode = evt.data.keyCode;
-
-			// ENTER.
-			if ( keyCode == 13 ) {
-				widget.edit();
-			// CTRL+C or CTRL+X.
-			} else if ( keyCode == CKEDITOR.CTRL + 67 || keyCode == CKEDITOR.CTRL + 88 ) {
-				copySingleWidget( widget, keyCode == CKEDITOR.CTRL + 88 );
-				return; // Do not preventDefault.
-			// Pass chosen keystrokes to other plugins or default fake sel handlers.
-			// Pass all CTRL/ALT keystrokes.
-			} else if ( keyCode in keystrokesNotBlockedByWidget ||
-				( CKEDITOR.CTRL & keyCode ) ||
-				( CKEDITOR.ALT & keyCode ) ) {
-				return;
-			}
-
-			return false;
-		}, null, null, 999 );
-		// Listen with high priority so it's possible
-		// to overwrite this callback.
-
-		widget.on( 'doubleclick', function( evt ) {
-			if ( widget.edit() ) {
-				// We have to cancel event if edit method opens a dialog, otherwise
-				// link plugin may open extra dialog (https://dev.ckeditor.com/ticket/12140).
-				evt.cancel();
-			}
-		} );
-
-		if ( widgetDef.data )
-			widget.on( 'data', widgetDef.data );
-
-		if ( widgetDef.edit )
-			widget.on( 'edit', widgetDef.edit );
-	}
-
-	function setupWidgetData( widget, startupData ) {
-		var widgetDataAttr = widget.element.data( 'cke-widget-data' );
-
-		if ( widgetDataAttr )
-			widget.setData( JSON.parse( decodeURIComponent( widgetDataAttr ) ) );
-		if ( startupData )
-			widget.setData( startupData );
-
-		// Populate classes if they are not preset.
-		if ( !widget.data.classes )
-			widget.setData( 'classes', widget.getClasses() );
-
-		// Unblock data and...
-		widget.dataReady = true;
-
-		// Write data to element because this was blocked when data wasn't ready.
-		writeDataToElement( widget );
-
-		// Fire data event first time, because this was blocked when data wasn't ready.
-		widget.fire( 'data', widget.data );
-	}
-
-	function setupWrapper( widget ) {
-		// Retrieve widget wrapper. Assign an id to it.
-		var wrapper = widget.wrapper = widget.element.getParent();
-		wrapper.setAttribute( 'data-cke-widget-id', widget.id );
-	}
-
-	function writeDataToElement( widget ) {
-		widget.element.data( 'cke-widget-data', encodeURIComponent( JSON.stringify( widget.data ) ) );
-	}
-
-	//
-	// WIDGET STYLE HANDLER ---------------------------------------------------
-	//
-
-	function addCustomStyleHandler() {
-		// Styles categorized by group. It is used to prevent applying styles for the same group being used together.
-		var styleGroups = {};
-
-		/**
-		 * The class representing a widget style. It is an {@link CKEDITOR#STYLE_OBJECT object} like
-		 * the styles handler for widgets.
-		 *
-		 * **Note:** This custom style handler does not support all methods of the {@link CKEDITOR.style} class.
-		 * Not supported methods: {@link #applyToRange}, {@link #removeFromRange}, {@link #applyToObject}.
-		 *
-		 * @since 4.4
-		 * @class CKEDITOR.style.customHandlers.widget
-		 * @extends CKEDITOR.style
-		 */
-		CKEDITOR.style.addCustomHandler( {
-			type: 'widget',
-
-			setup: function( styleDefinition ) {
-				/**
-				 * The name of widget to which this style can be applied.
-				 * It is extracted from style definition's `widget` property.
-				 *
-				 * @property {String} widget
-				 */
-				this.widget = styleDefinition.widget;
-
-				/**
-				 * An array of groups that this style belongs to.
-				 * Styles assigned to the same group cannot be combined.
-				 *
-				 * @since 4.6.2
-				 * @property {Array} group
-				 */
-				this.group = typeof styleDefinition.group == 'string' ? [ styleDefinition.group ] : styleDefinition.group;
-
-				// Store style categorized by its group.
-				// It is used to prevent enabling two styles from same group.
-				if ( this.group ) {
-					saveStyleGroup( this );
-				}
-			},
-
-			apply: function( editor ) {
-				var widget;
-
-				// Before CKEditor 4.4 wasn't a required argument, so we need to
-				// handle a case when it wasn't provided.
-				if ( !( editor instanceof CKEDITOR.editor ) )
-					return;
-
-				// Theoretically we could bypass checkApplicable, get widget from
-				// widgets.focused and check its name, what would be faster, but then
-				// this custom style would work differently than the default style
-				// which checks if it's applicable before applying or removing itself.
-				if ( this.checkApplicable( editor.elementPath(), editor ) ) {
-					widget = editor.widgets.focused;
-
-					// Remove other styles from the same group.
-					if ( this.group ) {
-						this.removeStylesFromSameGroup( editor );
-					}
-
-					widget.applyStyle( this );
-				}
-			},
-
-			remove: function( editor ) {
-				// Before CKEditor 4.4 wasn't a required argument, so we need to
-				// handle a case when it wasn't provided.
-				if ( !( editor instanceof CKEDITOR.editor ) )
-					return;
-
-				if ( this.checkApplicable( editor.elementPath(), editor ) )
-					editor.widgets.focused.removeStyle( this );
-			},
-
-			/**
-			 * Removes all styles that belong to the same group as this style. This method will neither add nor remove
-			 * the current style.
-			 * Returns `true` if any style was removed, otherwise returns `false`.
-			 *
-			 * @since 4.6.2
-			 * @param {CKEDITOR.editor} editor
-			 * @returns {Boolean}
-			 */
-			removeStylesFromSameGroup: function( editor ) {
-				var stylesFromSameGroup,
-					path,
-					removed = false;
-
-				// Before CKEditor 4.4 wasn't a required argument, so we need to
-				// handle a case when it wasn't provided.
-				if ( !( editor instanceof CKEDITOR.editor ) )
-					return false;
-
-				path = editor.elementPath();
-				if ( this.checkApplicable( path, editor ) ) {
-					// Iterate over each group.
-					for ( var i = 0, l = this.group.length; i < l; i++ ) {
-						stylesFromSameGroup = styleGroups[ this.widget ][ this.group[ i ] ];
-						// Iterate over each style from group.
-						for ( var j = 0; j < stylesFromSameGroup.length; j++ ) {
-							if ( stylesFromSameGroup[ j ] !== this && stylesFromSameGroup[ j ].checkActive( path, editor ) ) {
-								editor.widgets.focused.removeStyle( stylesFromSameGroup[ j ] );
-								removed = true;
-							}
-						}
-					}
-				}
-
-				return removed;
-			},
-
-			checkActive: function( elementPath, editor ) {
-				return this.checkElementMatch( elementPath.lastElement, 0, editor );
-			},
-
-			checkApplicable: function( elementPath, editor ) {
-				// Before CKEditor 4.4 wasn't a required argument, so we need to
-				// handle a case when it wasn't provided.
-				if ( !( editor instanceof CKEDITOR.editor ) )
-					return false;
-
-				return this.checkElement( elementPath.lastElement );
-			},
-
-			checkElementMatch: checkElementMatch,
-
-			checkElementRemovable: checkElementMatch,
-
-			/**
-			 * Checks if an element is a {@link CKEDITOR.plugins.widget#wrapper wrapper} of a
-			 * widget whose name matches the {@link #widget widget name} specified in the style definition.
-			 *
-			 * @param {CKEDITOR.dom.element} element
-			 * @returns {Boolean}
-			 */
-			checkElement: function( element ) {
-				if ( !Widget.isDomWidgetWrapper( element ) )
-					return false;
-
-				var widgetElement = element.getFirst( Widget.isDomWidgetElement );
-				return widgetElement && widgetElement.data( 'widget' ) == this.widget;
-			},
-
-			buildPreview: function( label ) {
-				return label || this._.definition.name;
-			},
-
-			/**
-			 * Returns allowed content rules which should be registered for this style.
-			 * Uses widget's {@link CKEDITOR.plugins.widget.definition#styleableElements} to make a rule
-			 * allowing classes on specified elements or use widget's
-			 * {@link CKEDITOR.plugins.widget.definition#styleToAllowedContentRules} method to transform a style
-			 * into allowed content rules.
-			 *
-			 * @param {CKEDITOR.editor} The editor instance.
-			 * @returns {CKEDITOR.filter.allowedContentRules}
-			 */
-			toAllowedContentRules: function( editor ) {
-				if ( !editor )
-					return null;
-
-				if ( !editor.widgets )
-					return null;
-
-				var widgetDef = editor.widgets.registered[ this.widget ],
-					classes,
-					rule = {};
-
-				if ( !widgetDef )
-					return null;
-
-				if ( widgetDef.styleableElements ) {
-					classes = this.getClassesArray();
-					if ( !classes )
-						return null;
-
-					rule[ widgetDef.styleableElements ] = {
-						classes: classes,
-						propertiesOnly: true
-					};
-					return rule;
-				}
-				if ( widgetDef.styleToAllowedContentRules )
-					return widgetDef.styleToAllowedContentRules( this );
-				return null;
-			},
-
-			/**
-			 * Returns classes defined in the style in form of an array.
-			 *
-			 * @returns {String[]}
-			 */
-			getClassesArray: function() {
-				var classes = this._.definition.attributes && this._.definition.attributes[ 'class' ];
-
-				return classes ? CKEDITOR.tools.trim( classes ).split( /\s+/ ) : null;
-			},
-
-			/**
-			 * Not implemented.
-			 *
-			 * @method applyToRange
-			 */
-			applyToRange: notImplemented,
-
-			/**
-			 * Not implemented.
-			 *
-			 * @method removeFromRange
-			 */
-			removeFromRange: notImplemented,
-
-			/**
-			 * Not implemented.
-			 *
-			 * @method applyToObject
-			 */
-			applyToObject: notImplemented
-		} );
-
-		function notImplemented() {}
-
-		// @context style
-		function checkElementMatch( element, fullMatch, editor ) {
-			// Before CKEditor 4.4 wasn't a required argument, so we need to
-			// handle a case when it wasn't provided.
-			if ( !editor )
-				return false;
-
-			if ( !this.checkElement( element ) )
-				return false;
-
-			var widget = editor.widgets.getByElement( element, true );
-			return widget && widget.checkStyleActive( this );
-		}
-
-		// Save and categorize style by its group.
-		function saveStyleGroup( style ) {
-			var widgetName = style.widget,
-				groupName, group;
-
-			if ( !styleGroups[ widgetName ] ) {
-				styleGroups[ widgetName ] = {};
-			}
-
-			for ( var i = 0, l = style.group.length; i < l; i++ ) {
-				groupName = style.group[ i ];
-				if ( !styleGroups[ widgetName ][ groupName ] ) {
-					styleGroups[ widgetName ][ groupName ] = [];
-				}
-
-				group = styleGroups[ widgetName ][ groupName ];
-
-				// Don't push the style if it's already stored (#589).
-				if ( !find( group, getCompareFn( style ) ) ) {
-					group.push( style );
-				}
-			}
-
-			// Copied `CKEDITOR.tools.array` from major branch.
-			function find( array, fn, thisArg ) {
-				var length = array.length,
-					i = 0;
-
-				while ( i < length ) {
-					if ( fn.call( thisArg, array[ i ], i, array ) ) {
-						return array[ i ];
-					}
-					i++;
-				}
-
-				return undefined;
-			}
-
-			function getCompareFn( left ) {
-				return function( right ) {
-					return deepCompare( left.getDefinition(), right.getDefinition() );
-				};
-
-				function deepCompare( left, right ) {
-					var leftKeys = CKEDITOR.tools.objectKeys( left ),
-						rightKeys = CKEDITOR.tools.objectKeys( right );
-
-					if ( leftKeys.length !== rightKeys.length ) {
-						return false;
-					}
-
-					for ( var key in left ) {
-						var areSameObjects = typeof left[ key ] === 'object' && typeof right[ key ] === 'object' && deepCompare( left[ key ], right[ key ] );
-
-						if ( !areSameObjects && left[ key ] !== right[ key ] ) {
-							return false;
-						}
-					}
-
-					return true;
-				}
-			}
-		}
-
-	}
-
-	//
-	// EXPOSE PUBLIC API ------------------------------------------------------
-	//
-
-	CKEDITOR.plugins.widget = Widget;
-	Widget.repository = Repository;
-	Widget.nestedEditable = NestedEditable;
-} )();
-
-/**
- * An event fired when a widget definition is registered by the {@link CKEDITOR.plugins.widget.repository#add} method.
- * It is possible to modify the definition being registered.
- *
- * @event widgetDefinition
- * @member CKEDITOR.editor
- * @param {CKEDITOR.plugins.widget.definition} data Widget definition.
- */
-
-/**
- * This is an abstract class that describes the definition of a widget.
- * It is a type of {@link CKEDITOR.plugins.widget.repository#add} method's second argument.
- *
- * Widget instances inherit from registered widget definitions, although not in a prototypal way.
- * They are simply extended with corresponding widget definitions. Note that not all properties of
- * the widget definition become properties of a widget. Some, like {@link #data} or {@link #edit}, become
- * widget's events listeners.
- *
- * @class CKEDITOR.plugins.widget.definition
- * @abstract
- * @mixins CKEDITOR.feature
- */
-
-/**
- * Widget definition name. It is automatically set when the definition is
- * {@link CKEDITOR.plugins.widget.repository#add registered}.
- *
- * @property {String} name
- */
-
-/**
- * The method executed while initializing a widget, after a widget instance
- * is created, but before it is ready. It is executed before the first
- * {@link CKEDITOR.plugins.widget#event-data} is fired so it is common to
- * use the `init` method to populate widget data with information loaded from
- * the DOM, like for exmaple:
- *
- *		init: function() {
- *			this.setData( 'width', this.element.getStyle( 'width' ) );
- *
- *			if ( this.parts.caption.getStyle( 'display' ) != 'none' )
- *				this.setData( 'showCaption', true );
- *		}
- *
- * @property {Function} init
- */
-
-/**
- * The function to be used to upcast an element to this widget or a
- * comma-separated list of upcast methods from the {@link #upcasts} object.
- *
- * The upcast function **is not** executed in the widget context (because the widget
- * does not exist yet), however, it is executed in the
- * {@link CKEDITOR.plugins.widget#definition widget's definition} context.
- * Two arguments are passed to the upcast function:
- *
- * * `element` ({@link CKEDITOR.htmlParser.element}) &ndash; The element to be checked.
- * * `data` (`Object`) &ndash; The object which can be extended with data which will then be passed to the widget.
- *
- * An element will be upcasted if a function returned `true` or an instance of
- * a {@link CKEDITOR.htmlParser.element} if upcasting meant DOM structure changes
- * (in this case the widget will be initialized on the returned element).
- *
- * @property {String/Function} upcast
- */
-
-/**
- * The object containing functions which can be used to upcast this widget.
- * Only those pointed by the {@link #upcast} property will be used.
- *
- * In most cases it is appropriate to use {@link #upcast} directly,
- * because majority of widgets need just one method.
- * However, in some cases the widget author may want to expose more than one variant
- * and then this property may be used.
- *
- *		upcasts: {
- *			// This function may upcast only figure elements.
- *			figure: function() {
- *				// ...
- *			},
- *			// This function may upcast only image elements.
- *			image: function() {
- *				// ...
- *			},
- *			// More variants...
- *		}
- *
- *		// Then, widget user may choose which upcast methods will be enabled.
- *		editor.on( 'widgetDefinition', function( evt ) {
- *			if ( evt.data.name == 'image' )
- * 				evt.data.upcast = 'figure,image'; // Use both methods.
- *		} );
- *
- * @property {Object} upcasts
- */
-
-/**
- * The {@link #upcast} method(s) priority. The upcast with a lower priority number will be called before
- * the one with a higher number. The default priority is `10`.
- *
- * @since 4.5
- * @property {Number} [upcastPriority=10]
- */
-
-/**
- * The function to be used to downcast this widget or
- * a name of the downcast option from the {@link #downcasts} object.
- *
- * The downcast function will be executed in the {@link CKEDITOR.plugins.widget} context
- * and with `widgetElement` ({@link CKEDITOR.htmlParser.element}) argument which is
- * the widget's main element.
- *
- * The function may return an instance of the {@link CKEDITOR.htmlParser.node} class if the widget
- * needs to be downcasted to a different node than the widget's main element.
- *
- * @property {String/Function} downcast
- */
-
-/**
- * The object containing functions which can be used to downcast this widget.
- * Only the one pointed by the {@link #downcast} property will be used.
- *
- * In most cases it is appropriate to use {@link #downcast} directly,
- * because majority of widgets have just one variant of downcasting (or none at all).
- * However, in some cases the widget author may want to expose more than one variant
- * and then this property may be used.
- *
- *		downcasts: {
- *			// This downcast may transform the widget into the figure element.
- *			figure: function() {
- *				// ...
- *			},
- *			// This downcast may transform the widget into the image element with data-* attributes.
- *			image: function() {
- *				// ...
- *			}
- *		}
- *
- *		// Then, the widget user may choose one of the downcast options when setting up his editor.
- *		editor.on( 'widgetDefinition', function( evt ) {
- *			if ( evt.data.name == 'image' )
- * 				evt.data.downcast = 'figure';
- *		} );
- *
- * @property downcasts
- */
-
-/**
- * If set, it will be added as the {@link CKEDITOR.plugins.widget#event-edit} event listener.
- * This means that it will be executed when a widget is being edited.
- * See the {@link CKEDITOR.plugins.widget#method-edit} method.
- *
- * @property {Function} edit
- */
-
-/**
- * If set, it will be added as the {@link CKEDITOR.plugins.widget#event-data} event listener.
- * This means that it will be executed every time the {@link CKEDITOR.plugins.widget#property-data widget data} changes.
- *
- * @property {Function} data
- */
-
-/**
- * The method to be executed when the widget's command is executed in order to insert a new widget
- * (widget of this type is not focused). If not defined, then the default action will be
- * performed which means that:
- *
- * * An instance of the widget will be created in a detached {@link CKEDITOR.dom.documentFragment document fragment},
- * * The {@link CKEDITOR.plugins.widget#method-edit} method will be called to trigger widget editing,
- * * The widget element will be inserted into DOM.
- *
- * @property {Function} insert
- * @param {Object} options Options object added in **4.11.0**.
- * @param {CKEDITOR.editor} options.editor The editor where the widget is going to be inserted to.
- * @param {Object} [options.commandData] Command data passed to the invoking command, if any.
- */
-
-/**
- * The name of a dialog window which will be opened on {@link CKEDITOR.plugins.widget#method-edit}.
- * If not defined, then the {@link CKEDITOR.plugins.widget#method-edit} method will not perform any action and
- * widget's command will insert a new widget without opening a dialog window first.
- *
- * @property {String} dialog
- */
-
-/**
- * The template which will be used to create a new widget element (when the widget's command is executed).
- * This string is populated with {@link #defaults default values} by using the {@link CKEDITOR.template} format.
- * Therefore it has to be a valid {@link CKEDITOR.template} argument.
- *
- * @property {String} template
- */
-
-/**
- * The data object which will be used to populate the data of a newly created widget.
- * See {@link CKEDITOR.plugins.widget#property-data}.
- *
- *		defaults: {
- *			showCaption: true,
- *			align: 'none'
- *		}
- *
- * @property defaults
- */
-
-/**
- * An object containing definitions of widget components (part name => CSS selector).
- *
- *		parts: {
- *			image: 'img',
- *			caption: 'div.caption'
- *		}
- *
- * @property parts
- */
-
-/**
- * An object containing definitions of nested editables (editable name => {@link CKEDITOR.plugins.widget.nestedEditable.definition}).
- * Note that editables *have to* be defined in the same order as they are in DOM / {@link CKEDITOR.plugins.widget.definition#template template}.
- * Otherwise errors will occur when nesting widgets inside each other.
- *
- *		editables: {
- *			header: 'h1',
- *			content: {
- *				selector: 'div.content',
- *				allowedContent: 'p strong em; a[!href]'
- *			}
- *		}
- *
- * @property editables
- */
-
-/**
- * The function used to obtain an accessibility label for the widget. It might be used to make
- * the widget labels as precise as possible, since it has access to the widget instance.
- *
- * If not specified, the default implementation will use the {@link #pathName} or the main
- * {@link CKEDITOR.plugins.widget#element element} tag name.
- *
- * @property {Function} getLabel
- */
-
-/**
- * The widget name displayed in the elements path.
- *
- * @property {String} pathName
- */
-
-/**
- * If set to `true`, the widget's element will be covered with a transparent mask.
- * This will prevent its content from being clickable, which matters in case
- * of special elements like embedded Flash or iframes that generate a separate "context".
- *
- * @property {Boolean} mask
- */
-
-/**
- * If set to `true/false`, it will force the widget to be either an inline or a block widget.
- * If not set, the widget type will be determined from the widget element.
- *
- * Widget type influences whether a block (`div`) or an inline (`span`) element is used
- * for the wrapper.
- *
- * @property {Boolean} inline
- */
-
-/**
- * The label for the widget toolbar button.
- *
- *		editor.widgets.add( 'simplebox', {
- *			button: 'Create a simple box'
- *		} );
- *
- *		editor.widgets.add( 'simplebox', {
- *			button: editor.lang.simplebox.title
- *		} );
- *
- * @property {String} button
- */
-
-/**
- * Whether widget should be draggable. Defaults to `true`.
- * If set to `false` drag handler will not be displayed when hovering widget.
- *
- * @property {Boolean} draggable
- */
-
-/**
- * Names of element(s) (separated by spaces) for which the {@link CKEDITOR.filter} should allow classes
- * defined in the widget styles. For example if your widget is upcasted from a simple `<div>`
- * element, then in order to make it styleable you can set:
- *
- *		editor.widgets.add( 'customWidget', {
- *			upcast: function( element ) {
- *				return element.name == 'div';
- *			},
- *
- *			// ...
- *
- *			styleableElements: 'div'
- *		} );
- *
- * Then, when the following style is defined:
- *
- *		{
- *			name: 'Thick border', type: 'widget', widget: 'customWidget',
- *			attributes: { 'class': 'thickBorder' }
- *		}
- *
- * a rule allowing the `thickBorder` class for `div` elements will be registered in the {@link CKEDITOR.filter}.
- *
- * If you need to have more freedom when transforming widget style to allowed content rules,
- * you can use the {@link #styleToAllowedContentRules} callback.
- *
- * @since 4.4
- * @property {String} styleableElements
- */
-
-/**
- * Function transforming custom widget's {@link CKEDITOR.style} instance into
- * {@link CKEDITOR.filter.allowedContentRules}. It may be used when a static
- * {@link #styleableElements} property is not enough to inform the {@link CKEDITOR.filter}
- * what HTML features should be enabled when allowing the given style.
- *
- * In most cases, when style's classes just have to be added to element name(s) used by
- * the widget element, it is recommended to use simpler {@link #styleableElements} property.
- *
- * In order to get parsed classes from the style definition you can use
- * {@link CKEDITOR.style.customHandlers.widget#getClassesArray}.
- *
- * For example, if you want to use the [object format of allowed content rules](#!/guide/dev_allowed_content_rules-section-object-format),
- * to specify `match` validator, your implementation could look like this:
- *
- *		editor.widgets.add( 'customWidget', {
- *			// ...
- *
- *			styleToAllowedContentRules: funciton( style ) {
- *				// Retrieve classes defined in the style.
- *				var classes = style.getClassesArray();
- *
- *				// Do something crazy - for example return allowed content rules in object format,
- *				// with custom match property and propertiesOnly flag.
- *				return {
- *					h1: {
- *						match: isWidgetElement,
- *						propertiesOnly: true,
- *						classes: classes
- *					}
- *				};
- *			}
- *		} );
- *
- * @since 4.4
- * @property {Function} styleToAllowedContentRules
- * @param {CKEDITOR.style.customHandlers.widget} style The style to be transformed.
- * @returns {CKEDITOR.filter.allowedContentRules}
- */
-
-/**
- * This is an abstract class that describes the definition of a widget's nested editable.
- * It is a type of values in the {@link CKEDITOR.plugins.widget.definition#editables} object.
- *
- * In the simplest case the definition is a string which is a CSS selector used to
- * find an element that will become a nested editable inside the widget. Note that
- * the widget element can be a nested editable, too.
- *
- * In the more advanced case a definition is an object with a required `selector` property.
- *
- *		editables: {
- *			header: 'h1',
- *			content: {
- *				selector: 'div.content',
- *				allowedContent: 'p strong em; a[!href]'
- *			}
- *		}
- *
- * @class CKEDITOR.plugins.widget.nestedEditable.definition
- * @abstract
- */
-
-/**
- * The CSS selector used to find an element which will become a nested editable.
- *
- * @property {String} selector
- */
-
-/**
- * The {@glink guide/dev_advanced_content_filter Advanced Content Filter} rules
- * which will be used to limit the content allowed in this nested editable.
- * This option is similar to {@link CKEDITOR.config#allowedContent} and one can
- * use it to limit the editor features available in the nested editable.
- *
- * If no `allowedContent` is specified, the editable will use the editor default
- * {@link CKEDITOR.editor#filter}.
- *
- * @property {CKEDITOR.filter.allowedContentRules} allowedContent
- */
-
-/**
- * The {@glink guide/dev_advanced_content_filter Advanced Content Filter} rules
- * which will be used to blacklist elements within this nested editable.
- * This option is similar to {@link CKEDITOR.config#disallowedContent}.
- *
- * Note that `disallowedContent` work on top of the definition's {@link #allowedContent}.
- *
- * @since 4.7.3
- * @property {CKEDITOR.filter.disallowedContentRules} disallowedContent
- */
-
-/**
- * Nested editable name displayed in the elements path.
- *
- * @property {String} pathName
- */
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widgetselection/plugin.js b/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widgetselection/plugin.js
deleted file mode 100644
index a082b45e..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/ckeditor/widgetselection/plugin.js
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @fileOverview A plugin created to handle ticket https://dev.ckeditor.com/ticket/11064. While the issue is caused by native WebKit/Blink behaviour,
- * this plugin can be easily detached or modified when the issue is fixed in the browsers without changing the core.
- * When Ctrl/Cmd + A is pressed to select all content it does not work due to a bug in
- * Webkit/Blink if a non-editable element is at the beginning or the end of the content.
- */
-
-( function() {
-	'use strict';
-
-	CKEDITOR.plugins.add( 'widgetselection', {
-
-		init: function( editor ) {
-			if ( CKEDITOR.env.webkit ) {
-				var widgetselection = CKEDITOR.plugins.widgetselection;
-
-				editor.on( 'contentDom', function( evt ) {
-
-					var editor = evt.editor,
-						editable = editor.editable();
-
-					editable.attachListener( editable, 'keydown', function( evt ) {
-						// Ctrl/Cmd + A
-						if ( evt.data.getKeystroke() == CKEDITOR.CTRL + 65 ) {
-							// Defer the call so the selection is already changed by the pressed keys.
-							CKEDITOR.tools.setTimeout( function() {
-								// Manage filler elements on keydown. If there is no need
-								// to add fillers, we need to check and clean previously used once.
-								if ( !widgetselection.addFillers( editable ) ) {
-									widgetselection.removeFillers( editable );
-								}
-							}, 0 );
-						}
-					}, null, null, -1 );
-
-					// Check and clean previously used fillers.
-					editor.on( 'selectionCheck', function( evt ) {
-						widgetselection.removeFillers( evt.editor.editable() );
-					} );
-
-					// Remove fillers on paste before data gets inserted into editor.
-					editor.on( 'paste', function( evt ) {
-						evt.data.dataValue = widgetselection.cleanPasteData( evt.data.dataValue );
-					} );
-
-					if ( 'selectall' in editor.plugins ) {
-						widgetselection.addSelectAllIntegration( editor );
-					}
-				} );
-			}
-		}
-	} );
-
-	/**
-	 * A set of helper methods for the Widget Selection plugin.
-	 *
-	 * @property widgetselection
-	 * @member CKEDITOR.plugins
-	 * @since 4.6.1
-	 */
-	CKEDITOR.plugins.widgetselection = {
-
-		/**
-		 * The start filler element reference.
-		 *
-		 * @property {CKEDITOR.dom.element}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		startFiller: null,
-
-		/**
-		 * The end filler element reference.
-		 *
-		 * @property {CKEDITOR.dom.element}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		endFiller: null,
-
-		/**
-		 * An attribute which identifies the filler element.
-		 *
-		 * @property {String}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		fillerAttribute: 'data-cke-filler-webkit',
-
-		/**
-		 * The default content of the filler element. Note: The filler needs to have `visible` content.
-		 * Unprintable elements or empty content do not help as a workaround.
-		 *
-		 * @property {String}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		fillerContent: '&nbsp;',
-
-		/**
-		 * Tag name which is used to create fillers.
-		 *
-		 * @property {String}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		fillerTagName: 'div',
-
-		/**
-		 * Adds a filler before or after a non-editable element at the beginning or the end of the `editable`.
-		 *
-		 * @param {CKEDITOR.editable} editable
-		 * @returns {Boolean}
-		 * @member CKEDITOR.plugins.widgetselection
-		 */
-		addFillers: function( editable ) {
-			var editor = editable.editor;
-
-			// Whole content should be selected, if not fix the selection manually.
-			if ( !this.isWholeContentSelected( editable ) && editable.getChildCount() > 0 ) {
-
-				var firstChild = editable.getFirst( filterTempElements ),
-					lastChild = editable.getLast( filterTempElements );
-
-				// Check if first element is editable. If not prepend with filler.
-				if ( firstChild && firstChild.type == CKEDITOR.NODE_ELEMENT && !firstChild.isEditable() ) {
-					this.startFiller = this.createFiller();
-					editable.append( this.startFiller, 1 );
-				}
-
-				// Check if last element is editable. If not append filler.
-				if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && !lastChild.isEditable() ) {
-					this.endFiller = this.createFiller( true );
-					editable.append( this.endFiller, 0 );
-				}
-
-				// Reselect whole content after any filler was added.
-				if ( this.hasFiller( editable ) ) {
-					var rangeAll = editor.createRange();
-					rangeAll.selectNodeContents( editable );
-					rangeAll.select();
-					return true;
-				}
-			}
-			return false;
-		},
-
-		/**
-		 * Removes filler elements or updates their references.
-		 *
-		 * It will **not remove** filler elements if the whole content is selected, as it would break the
-		 * selection.
-		 *
-		 * @param {CKEDITOR.editable} editable
-		 * @member CKEDITOR.plugins.widgetselection
-		 */
-		removeFillers: function( editable ) {
-			// If startFiller or endFiller exists and not entire content is selected it means the selection
-			// just changed from selected all. We need to remove fillers and set proper selection/content.
-			if ( this.hasFiller( editable ) && !this.isWholeContentSelected( editable ) ) {
-
-				var startFillerContent = editable.findOne( this.fillerTagName + '[' + this.fillerAttribute + '=start]' ),
-					endFillerContent = editable.findOne( this.fillerTagName + '[' + this.fillerAttribute + '=end]' );
-
-				if ( this.startFiller && startFillerContent && this.startFiller.equals( startFillerContent ) ) {
-					this.removeFiller( this.startFiller, editable );
-				} else {
-					// The start filler is still present but it is a different element than previous one. It means the
-					// undo recreating entirely selected content was performed. We need to update filler reference.
-					this.startFiller = startFillerContent;
-				}
-
-				if ( this.endFiller && endFillerContent && this.endFiller.equals( endFillerContent ) ) {
-					this.removeFiller( this.endFiller, editable );
-				} else {
-					// Same as with start filler.
-					this.endFiller = endFillerContent;
-				}
-			}
-		},
-
-		/**
-		 * Removes fillers from the paste data.
-		 *
-		 * @param {String} data
-		 * @returns {String}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		cleanPasteData: function( data ) {
-			if ( data && data.length ) {
-				data = data
-					.replace( this.createFillerRegex(), '' )
-					.replace( this.createFillerRegex( true ), '' );
-			}
-			return data;
-		},
-
-		/**
-		 * Checks if the entire content of the given editable is selected.
-		 *
-		 * @param {CKEDITOR.editable} editable
-		 * @returns {Boolean}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		isWholeContentSelected: function( editable ) {
-
-			var range = editable.editor.getSelection().getRanges()[ 0 ];
-			if ( range ) {
-
-				if ( range && range.collapsed ) {
-					return false;
-
-				} else {
-					var rangeClone = range.clone();
-					rangeClone.enlarge( CKEDITOR.ENLARGE_ELEMENT );
-
-					return !!( rangeClone && editable && rangeClone.startContainer && rangeClone.endContainer &&
-						rangeClone.startOffset === 0 && rangeClone.endOffset === editable.getChildCount() &&
-						rangeClone.startContainer.equals( editable ) && rangeClone.endContainer.equals( editable ) );
-				}
-			}
-			return false;
-		},
-
-		/**
-		 *	Checks if there is any filler element in the given editable.
-		 *
-		 * @param {CKEDITOR.editable} editable
-		 * @returns {Boolean}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		hasFiller: function( editable ) {
-			return editable.find( this.fillerTagName + '[' + this.fillerAttribute + ']' ).count() > 0;
-		},
-
-		/**
-		 * Creates a filler element.
-		 *
-		 * @param {Boolean} [onEnd] If filler will be placed on end or beginning of the content.
-		 * @returns {CKEDITOR.dom.element}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		createFiller: function( onEnd ) {
-			var filler = new CKEDITOR.dom.element( this.fillerTagName );
-			filler.setHtml( this.fillerContent );
-			filler.setAttribute( this.fillerAttribute, onEnd ? 'end' : 'start' );
-			filler.setAttribute( 'data-cke-temp', 1 );
-			filler.setStyles( {
-				display: 'block',
-				width: 0,
-				height: 0,
-				padding: 0,
-				border: 0,
-				margin: 0,
-				position: 'absolute',
-				top: 0,
-				left: '-9999px',
-				opacity: 0,
-				overflow: 'hidden'
-			} );
-
-			return filler;
-		},
-
-		/**
-		 * Removes the specific filler element from the given editable. If the filler contains any content (typed or pasted),
-		 * it replaces the current editable content. If not, the caret is placed before the first or after the last editable
-		 * element (depends if the filler was at the beginning or the end).
-		 *
-		 * @param {CKEDITOR.dom.element} filler
-		 * @param {CKEDITOR.editable} editable
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		removeFiller: function( filler, editable ) {
-			if ( filler ) {
-				var editor = editable.editor,
-					currentRange = editable.editor.getSelection().getRanges()[ 0 ],
-					currentPath = currentRange.startPath(),
-					range = editor.createRange(),
-					insertedHtml,
-					fillerOnStart,
-					manuallyHandleCaret;
-
-				if ( currentPath.contains( filler ) ) {
-					insertedHtml = filler.getHtml();
-					manuallyHandleCaret = true;
-				}
-
-				fillerOnStart = filler.getAttribute( this.fillerAttribute ) == 'start';
-				filler.remove();
-				filler = null;
-
-				if ( insertedHtml && insertedHtml.length > 0 && insertedHtml != this.fillerContent ) {
-					editable.insertHtmlIntoRange( insertedHtml, editor.getSelection().getRanges()[ 0 ] );
-					range.setStartAt( editable.getChild( editable.getChildCount() - 1 ), CKEDITOR.POSITION_BEFORE_END );
-					editor.getSelection().selectRanges( [ range ] );
-
-				} else if ( manuallyHandleCaret ) {
-					if ( fillerOnStart ) {
-						range.setStartAt( editable.getFirst().getNext(), CKEDITOR.POSITION_AFTER_START );
-					} else {
-						range.setEndAt( editable.getLast().getPrevious(), CKEDITOR.POSITION_BEFORE_END );
-					}
-					editable.editor.getSelection().selectRanges( [ range ] );
-				}
-			}
-		},
-
-		/**
-		 * Creates a regular expression which will match the filler HTML in the text.
-		 *
-		 * @param {Boolean} [onEnd] Whether a regular expression should be created for the filler at the beginning or
-		 * the end of the content.
-		 * @returns {RegExp}
-		 * @member CKEDITOR.plugins.widgetselection
-		 * @private
-		 */
-		createFillerRegex: function( onEnd ) {
-			var matcher = this.createFiller( onEnd ).getOuterHtml()
-				.replace( /style="[^"]*"/gi, 'style="[^"]*"' )
-				.replace( />[^<]*</gi, '>[^<]*<' );
-
-			return new RegExp( ( !onEnd ? '^' : '' ) + matcher + ( onEnd ? '$' : '' ) );
-		},
-
-		/**
-		 * Adds an integration for the [Select All](https://ckeditor.com/cke4/addon/selectall) plugin to the given `editor`.
-		 *
-		 * @private
-		 * @param {CKEDITOR.editor} editor
-		 * @member CKEDITOR.plugins.widgetselection
-		 */
-		addSelectAllIntegration: function( editor ) {
-			var widgetselection = this;
-
-			editor.editable().attachListener( editor, 'beforeCommandExec', function( evt ) {
-				var editable = editor.editable();
-
-				if ( evt.data.name == 'selectAll' && editable ) {
-					widgetselection.addFillers( editable );
-				}
-			}, null, null, 9999 );
-		}
-	};
-
-
-	function filterTempElements( el ) {
-		return el.getName && !el.hasAttribute( 'data-cke-temp' );
-	}
-
-} )();
diff --git a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formMailEditor.js b/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formMailEditor.js
deleted file mode 100644
index ececf9b9..00000000
--- a/src/FormBuilderBundle/Resources/public/js/extjs/extensions/formMailEditor.js
+++ /dev/null
@@ -1,342 +0,0 @@
-pimcore.registerNS('Formbuilder.extjs.extensions.formMailEditor');
-Formbuilder.extjs.extensions.formMailEditor = Class.create({
-
-    formId: null,
-    specificLocale: null,
-    callbacks: null,
-    fields: {},
-    selectionWindow: null,
-    detailWindow: null,
-    editPanel: null,
-    selectionId: null,
-    ckEditors: {},
-    additionalParameter: {},
-
-    forceClose: false,
-    configuration: null,
-    editorData: null,
-    mailType: null,
-
-    initialize: function (formId, identifier, additionalParameter, specificLocale, callbacks) {
-
-        this.formId = formId;
-        this.specificLocale = specificLocale ? specificLocale : null;
-        this.callbacks = callbacks;
-        this.additionalParameter = additionalParameter ? additionalParameter : {};
-
-        this.ckEditors = {};
-        this.mailType = null;
-        this.forceClose = false;
-        this.selectionId = 'form_mail_selection_' + Ext.id();
-
-        this.mailType = identifier;
-        this.loadMailEditor();
-    },
-
-    checkClose: function (win) {
-
-        if (this.forceClose === true) {
-            win.closeMe = true;
-            return true;
-        }
-
-        if (win.closeMe) {
-            win.closeMe = false;
-            return true;
-        }
-
-        Ext.Msg.show({
-            title: t('form_builder.mail_editor.close_confirmation_title'),
-            msg: t('form_builder.mail_editor.close_confirmation_message'),
-            buttons: Ext.Msg.YESNO,
-            callback: function (btn) {
-                if (btn === 'yes') {
-                    win.closeMe = true;
-                    win.close();
-                }
-            }
-        });
-
-        return false;
-    },
-
-    onClose: function (editorId) {
-        if (this.ckEditors[editorId]) {
-            this.ckEditors[editorId]['editor'].destroy();
-            delete this.ckEditors[editorId];
-        }
-    },
-
-    loadMailEditor: function () {
-
-        if (this.detailWindow !== null) {
-            return this.detailWindow;
-        }
-
-        this.detailWindow = new Ext.Window({
-            width: 1200,
-            height: 768,
-            iconCls: 'pimcore_icon_mail_editor',
-            layout: 'fit',
-            closeAction: 'destroy',
-            plain: true,
-            autoScroll: true,
-            preventRefocus: true,
-            cls: 'formbuilder-mail-editor',
-            modal: true,
-            listeners: {
-                beforeClose: this.checkClose.bind(this)
-            },
-            buttons: [
-                {
-                    text: t('form_builder.output_workflow.apply_and_close'),
-                    iconCls: 'form_builder_output_workflow_apply_data',
-                    handler: this.saveEditorDataAndClose.bind(this)
-                },
-                {
-                    text: t('cancel'),
-                    iconCls: 'pimcore_icon_cancel',
-                    handler: function () {
-                        this.detailWindow.close();
-                    }.bind(this)
-                }
-            ]
-        });
-
-        this.detailWindow.show();
-
-        this.loadEditorData();
-
-    },
-
-    createPanel: function () {
-
-        var rightHtml = '' +
-            '<div class="mail-editor-selection" id="' + this.selectionId + '"></div>';
-
-        this.editPanel = new Ext.Panel({
-            closable: false,
-            bodyStyle: 'position:relative;',
-            border: false,
-            layout: 'hbox',
-            autoScroll: false
-        });
-
-        this.leftPanel = new Ext.Panel({
-            closable: false,
-            border: false,
-            title: 'Editor' + ' (' + t('form_builder.mail_editor.mail_type_slug') + ': ' + t('form_builder.mail_editor.mail_type_' + this.mailType) + ')',
-            layout: 'fit',
-            flex: 3,
-            align: 'stretch',
-            autoScroll: false
-        });
-
-        this.rightPanel = new Ext.Panel({
-            closable: false,
-            html: rightHtml,
-            border: false,
-            flex: 1,
-            height: 645,
-            align: 'stretch',
-            title: 'Fields',
-            autoScroll: true
-        });
-
-        this.initCkEditorPlugins();
-        this.initializeLocalizedEditor();
-
-        this.rightPanel.on('afterrender', this.initSelectionFields.bind(this));
-
-        this.editPanel.add([this.leftPanel, this.rightPanel]);
-        this.detailWindow.add(this.editPanel);
-    },
-
-    initializeLocalizedEditor: function () {
-
-        var tabs = [],
-            editorField,
-            locales,
-            pimcoreLocales = Ext.isArray(pimcore.settings.websiteLanguages) ? pimcore.settings.websiteLanguages : [];
-
-        if (this.specificLocale === null) {
-            locales = Ext.Array.merge(['default'], pimcoreLocales)
-        } else {
-            locales = [this.specificLocale]
-        }
-
-        Ext.each(locales, function (locale) {
-
-            var editorId = 'form_mail_editor_' + Ext.id(),
-                oldHtml = '<div class="mail-editor" id="' + editorId + '"></div>';
-
-            tabs.push({
-                title: locale === 'default' ? t('default') : pimcore.available_languages[locale],
-                iconCls: locale === 'default' ? 'pimcore_icon_white_flag' : 'pimcore_icon_language_' + locale.toLowerCase(),
-                layout: 'anchor',
-                height: 560,
-                listeners: {
-                    afterrender: this.initCkEditor.bind(this, editorId, locale.toLowerCase()),
-                    beforedestroy: this.onClose.bind(this, editorId),
-                },
-                html: oldHtml
-            });
-        }.bind(this));
-
-        editorField = new Ext.form.FieldSet({
-            cls: 'form_builder_mail_editor_localized_field',
-            layout: 'anchor',
-            hideLabel: false,
-            items: [{
-                xtype: 'tabpanel',
-                activeTab: 0,
-                layout: 'anchor',
-                width: '100%',
-                defaults: {
-                    autoHeight: true,
-                },
-                items: tabs
-            }]
-        });
-
-        this.leftPanel.add(editorField);
-
-    },
-
-    initSelectionFields: function () {
-
-        var selectionField;
-
-        selectionField = Ext.get(this.selectionId);
-        selectionField.createChild('<span><strong>Attention! </strong>This mail editor does not respect any special mail template language (like inky)!<br><br></span>');
-
-        Ext.Array.each(this.configuration.widgetGroups, function (groupData) {
-            var group;
-            selectionField.createChild('<h4>' + groupData.label + '</h4>');
-            group = selectionField.createChild('<ul class="group"></ul>');
-            Ext.Array.each(groupData.elements, function (element) {
-                var subTypeTag = element.subType !== null ? '<span class="tag">[' + element.subType + ']</span>' : '';
-                group.createChild('<li draggable="true" data-type="' + element.type + '" data-sub-type="' + element.subType + '">' + subTypeTag + '' + element.label + '</li>');
-            }.bind(this));
-
-        }.bind(this));
-
-    },
-
-    initCkEditor: function (editorId, locale) {
-
-        var editorConfig, ckEditor;
-
-        if (this.ckEditors.hasOwnProperty(editorId)) {
-            return;
-        }
-
-        editorConfig = {
-            height: 490,
-            language: pimcore.settings['language'],
-            resize_enabled: false,
-            entities: false,
-            entities_greek: false,
-            entities_latin: false,
-            baseFloatZIndex: 40000,
-            enterMode: CKEDITOR.ENTER_BR,
-            tabSpaces: 0,
-            _formMailEditorWidgetFields: this.getWidgetFieldsAsList(),
-            _formMailEditorConfiguration: this.configuration.widgetConfiguration,
-            extraPlugins: 'formmaileditor,sourcedialog',
-            toolbar: [
-                ['Sourcedialog'],
-            ]
-        };
-
-        ckEditor = CKEDITOR.appendTo(editorId, editorConfig);
-
-        if (this.editorData !== null && typeof this.editorData === 'object' && this.editorData.hasOwnProperty(locale)) {
-            ckEditor.setData(this.editorData[locale]);
-        }
-
-        ckEditor.on('instanceReady', function (ev) {
-            var $el = CKEDITOR.document.getById(this.selectionId);
-
-            $el.on('dragstart', function (evt) {
-                var target, dataTransfer;
-                target = evt.data.getTarget().getAscendant('li', true);
-                CKEDITOR.plugins.clipboard.initDragDataTransfer(evt);
-                dataTransfer = evt.data.dataTransfer;
-                dataTransfer.setData('mail_editor_widget', {type: target.data('type'), subType: target.data('sub-type')});
-                dataTransfer.setData('text/html', target.getText());
-            }.bind(this));
-
-        }.bind(this));
-
-        this.ckEditors[editorId] = {'editor': ckEditor, 'locale': locale};
-    },
-
-    loadEditorData: function () {
-
-        var loadSuccess = function (data) {
-            this.editorData = this.callbacks.loadData();
-            this.configuration = data.configuration;
-            this.detailWindow.setLoading(false);
-            this.createPanel();
-        }.bind(this);
-
-        this.detailWindow.setLoading(true);
-
-        Ext.Ajax.request({
-            url: '/admin/formbuilder/mail-editor/load',
-            params: {
-                id: this.formId,
-                mailType: this.mailType,
-                additionalParameter: this.additionalParameter
-            },
-            success: function (resp) {
-                var data = Ext.decode(resp.responseText);
-                loadSuccess(data);
-            }.bind(this)
-        });
-    },
-
-    saveEditorDataAndClose: function () {
-        this.saveEditorData(null, null, function () {
-            this.forceClose = true;
-            this.detailWindow.close();
-        }.bind(this));
-    },
-
-    saveEditorData: function (el, ev, callback) {
-
-        var data = {};
-
-        Ext.Object.each(this.ckEditors, function (index, editorData) {
-            data[editorData['locale']] = editorData['editor'].getData();
-        });
-
-        this.callbacks.saveData(data);
-
-        if (typeof callback === 'function') {
-            callback();
-        }
-    },
-
-    initCkEditorPlugins: function () {
-        Ext.Array.each(['widget', 'widgetselection', 'lineutils', 'formmaileditor', 'notification'], function (pluginName) {
-            if (CKEDITOR.plugins.get(pluginName) === null) {
-                CKEDITOR.plugins.addExternal(pluginName, '/bundles/formbuilder/js/extjs/ckeditor/' + pluginName + '/', 'plugin.js');
-            }
-        });
-    },
-
-    getWidgetFieldsAsList: function () {
-
-        var widgetFields = [];
-
-        Ext.Array.each(this.configuration.widgetGroups, function (groupData) {
-            Ext.Array.each(groupData.elements, function (element) {
-                widgetFields.push(element);
-            });
-        });
-
-        return widgetFields;
-    },
-});
\ No newline at end of file
diff --git a/src/FormBuilderBundle/FormBuilderEvents.php b/src/FormBuilderEvents.php
similarity index 100%
rename from src/FormBuilderBundle/FormBuilderEvents.php
rename to src/FormBuilderEvents.php
diff --git a/src/MailEditor/AttributeBag.php b/src/MailEditor/AttributeBag.php
new file mode 100644
index 00000000..9d4300ed
--- /dev/null
+++ b/src/MailEditor/AttributeBag.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor;
+
+class AttributeBag implements \IteratorAggregate, \Countable
+{
+    protected array $parameters;
+
+    public function __construct(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
+
+    public function all(): array
+    {
+        return $this->parameters;
+    }
+
+    public function keys(): array
+    {
+        return array_keys($this->parameters);
+    }
+
+    public function replace(array $parameters = []): void
+    {
+        $this->parameters = $parameters;
+    }
+
+    public function add(array $parameters = []): void
+    {
+        $this->parameters = array_replace($this->parameters, $parameters);
+    }
+
+    public function get(string $key, mixed $default = null): mixed
+    {
+        return \array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default;
+    }
+
+    public function set(string $key, mixed $value): void
+    {
+        $this->parameters[$key] = $value;
+    }
+
+    public function has(string $key): bool
+    {
+        return \array_key_exists($key, $this->parameters);
+    }
+
+    public function remove(string $key): void
+    {
+        unset($this->parameters[$key]);
+    }
+
+    public function getIterator(): \ArrayIterator
+    {
+        return new \ArrayIterator($this->parameters);
+    }
+
+    public function count(): int
+    {
+        return \count($this->parameters);
+    }
+}
diff --git a/src/MailEditor/Parser/PlaceholderParser.php b/src/MailEditor/Parser/PlaceholderParser.php
new file mode 100644
index 00000000..92c85b0b
--- /dev/null
+++ b/src/MailEditor/Parser/PlaceholderParser.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor\Parser;
+
+use FormBuilderBundle\MailEditor\Parser\TemplateParser\TemplateParserInterface;
+use FormBuilderBundle\Registry\MailEditorWidgetRegistry;
+use FormBuilderBundle\MailEditor\AttributeBag;
+use Symfony\Component\Form\FormInterface;
+
+class PlaceholderParser implements PlaceholderParserInterface
+{
+    protected FormInterface $form;
+    protected array $outputData;
+    protected string $layoutType;
+
+    public function __construct(
+        protected MailEditorWidgetRegistry $mailEditorWidgetRegistry,
+        protected iterable $templateParser,
+        protected array $validHtmlTags,
+        protected array $validTextTags,
+    ) {
+    }
+
+    public function replacePlaceholderWithOutputData(string $layout, FormInterface $form, array $outputData, string $layoutType): string
+    {
+        $this->form = $form;
+        $this->outputData = $outputData;
+        $this->layoutType = $layoutType;
+
+        // first, parse all container blocks
+        $layout = preg_replace_callback($this->getPlaceholderRegex('fb-container-field'), [$this, 'parseContainerTag'], $layout);
+
+        $layout = preg_replace_callback($this->getPlaceholderRegex('fb-field'), [$this, 'parseFieldTag'], $layout);
+
+        return $this->parseLayoutTemplate($layout, $layoutType);
+    }
+
+    protected function parseContainerTag(array $tag): ?string
+    {
+        $type = $tag[1];
+
+        $attributes = $this->parseAttributes($type, $tag[0]);
+        $containerTemplate = $this->parseContainerTemplate($type, $tag[0]);
+
+        $tagType = $attributes->get('type');
+        $tagSubType = $attributes->get('sub_type');
+
+        if ($tagType === null || !$this->mailEditorWidgetRegistry->has($tagType)) {
+            return null;
+        }
+
+        $outputData = null;
+        if ($tagSubType !== null && isset($this->outputData[$tagSubType])) {
+            $outputData = $this->outputData[$tagSubType];
+            $attributes->set('output_data', $outputData);
+        }
+
+        // no container data found. remove template.
+        if ($outputData === null) {
+            return '';
+        }
+
+        $widget = $this->mailEditorWidgetRegistry->get($tagType);
+
+        $response = '';
+        foreach ($outputData['fields'] as $containerBlock) {
+            $response .= $widget->getValueForOutput($attributes, $this->layoutType);
+            $response .= preg_replace_callback(
+                $this->getPlaceholderRegex('fb-field'),
+                function (array $tag) use ($containerBlock) {
+                    return $this->parseFieldTag($tag, $containerBlock);
+                },
+                $containerTemplate
+            );
+        }
+
+        return $response;
+    }
+
+    protected function parseLayoutTemplate(string $layout, string $layoutType): string
+    {
+        $allowedTags = $layoutType === 'html' ? $this->validHtmlTags : $this->validTextTags;
+
+        $layout = strip_tags($layout, $allowedTags);
+
+        /** @var TemplateParserInterface $templateParser */
+        foreach ($this->templateParser as $templateParser) {
+            if ($templateParser->supports($layoutType, $layout)) {
+                return $templateParser->parse($layout);
+            }
+        }
+
+        return $layout;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    protected function parseFieldTag(array $tag, ?array $containerData = null): ?string
+    {
+        $type = $tag[1];
+        $attributes = $this->parseAttributes($type, $tag[0]);
+
+        $tagType = $attributes->get('type');
+        $tagSubType = $attributes->get('sub_type');
+
+        if ($tagType === null || !$this->mailEditorWidgetRegistry->has($tagType)) {
+            return null;
+        }
+
+        $widget = $this->mailEditorWidgetRegistry->get($tagType);
+
+        if ($tagSubType !== null) {
+            if ($containerData !== null) {
+                $containerOutputDataIndex = array_search($tagSubType, array_column($containerData, 'name'), true);
+                if ($containerOutputDataIndex !== false) {
+                    $attributes->set('output_data', $containerData[$containerOutputDataIndex]);
+                }
+            } elseif (isset($this->outputData[$tagSubType])) {
+                $attributes->set('output_data', $this->outputData[$tagSubType]);
+            }
+        }
+
+        $attributes->set('form', $this->form);
+
+        return $widget->getValueForOutput($attributes, $this->layoutType);
+    }
+
+    protected function parseAttributes(string $type, string $text): AttributeBag
+    {
+        libxml_use_internal_errors(true);
+        $doc = new \DOMDocument();
+        $doc->loadHTML($text);
+
+        $xpath = new \DOMXPath($doc);
+        $nodes = $xpath->query(sprintf('//%s/@*', $type));
+
+        $attributes = [];
+        foreach ($nodes as $node) {
+
+            $value = $node->nodeValue;
+            if ($value === 'true' || $value === 'false') {
+                $value = $value === 'true';
+            }
+
+            $attributes[str_replace('data-', '', $node->nodeName)] = $value;
+        }
+
+        return new AttributeBag($attributes);
+    }
+
+    protected function parseContainerTemplate(string $type, string $text): string
+    {
+        preg_match('/<fb-container-field[^>]*>(.*)<\/fb-container-field>/', $text, $matches);
+
+        return $matches[1];
+    }
+
+    protected function getPlaceholderRegex(string $type): string
+    {
+        $typeRegex = str_replace('-', '\-', $type);
+
+        return sprintf('/<(%s)(.*?)<\/(%s)>/', $typeRegex, $typeRegex);
+    }
+}
diff --git a/src/FormBuilderBundle/MailEditor/Parser/PlaceholderParserInterface.php b/src/MailEditor/Parser/PlaceholderParserInterface.php
similarity index 73%
rename from src/FormBuilderBundle/MailEditor/Parser/PlaceholderParserInterface.php
rename to src/MailEditor/Parser/PlaceholderParserInterface.php
index 964ae84a..d99ce326 100644
--- a/src/FormBuilderBundle/MailEditor/Parser/PlaceholderParserInterface.php
+++ b/src/MailEditor/Parser/PlaceholderParserInterface.php
@@ -6,5 +6,5 @@
 
 interface PlaceholderParserInterface
 {
-    public function replacePlaceholderWithOutputData(string $layout, FormInterface $form, array $outputData): string;
+    public function replacePlaceholderWithOutputData(string $layout, FormInterface $form, array $outputData, string $layoutType): string;
 }
diff --git a/src/MailEditor/Parser/TemplateParser/InkyParser.php b/src/MailEditor/Parser/TemplateParser/InkyParser.php
new file mode 100644
index 00000000..c7c97db1
--- /dev/null
+++ b/src/MailEditor/Parser/TemplateParser/InkyParser.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor\Parser\TemplateParser;
+
+class InkyParser implements TemplateParserInterface
+{
+    public function __construct(
+        protected bool $useEmailizr,
+        protected array $replaces
+    ) {
+    }
+
+    public function supports(string $layoutType, string $layout): bool
+    {
+        return $layoutType === 'html' && $this->useEmailizr === true;
+    }
+
+    public function parse(string $template): string
+    {
+        return str_replace(array_keys($this->replaces), array_values($this->replaces), $template);
+    }
+}
diff --git a/src/MailEditor/Parser/TemplateParser/PlainTextParser.php b/src/MailEditor/Parser/TemplateParser/PlainTextParser.php
new file mode 100644
index 00000000..6804cbef
--- /dev/null
+++ b/src/MailEditor/Parser/TemplateParser/PlainTextParser.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor\Parser\TemplateParser;
+
+class PlainTextParser implements TemplateParserInterface
+{
+    public function supports(string $layoutType, string $layout): bool
+    {
+        return $layoutType === 'text';
+    }
+
+    public function parse(string $template): string
+    {
+        return str_replace(['<br />', '<br>'], "\n", $template);
+    }
+}
diff --git a/src/MailEditor/Parser/TemplateParser/TemplateParserInterface.php b/src/MailEditor/Parser/TemplateParser/TemplateParserInterface.php
new file mode 100644
index 00000000..c36aeef0
--- /dev/null
+++ b/src/MailEditor/Parser/TemplateParser/TemplateParserInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor\Parser\TemplateParser;
+
+interface TemplateParserInterface
+{
+    public function supports(string $layoutType, string $layout): bool;
+
+    public function parse(string $template): string;
+}
diff --git a/src/MailEditor/TemplateGenerator.php b/src/MailEditor/TemplateGenerator.php
new file mode 100644
index 00000000..9e551706
--- /dev/null
+++ b/src/MailEditor/TemplateGenerator.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor;
+
+class TemplateGenerator
+{
+    protected bool $tableStarted = false;
+
+    public function generateWidgetFieldTemplate(array $fields): string
+    {
+        $template = '';
+
+        foreach ($fields as $field) {
+
+            $fieldType = $field['field_type'] ?? null;
+            if ($fieldType === 'submit') {
+                continue;
+            }
+
+            if (in_array($field['configIdentifier'], ['fb_field_container_fieldset', 'fb_field_container_repeater'], true)) {
+                $template .= $this->closeTable();
+                $template .= $this->generateContainerFieldTemplate($field);
+            } else {
+                $template .= $this->openTable();
+                $template .= $this->generateFieldTemplate($field);
+            }
+        }
+
+        $template .= $this->closeTable();
+
+        return $template;
+    }
+
+    private function generateFieldTemplate($field): string
+    {
+        return sprintf('
+            <tr>
+                <td><fb-field data-render_type="L" data-type="%1$s" data-sub_type="%2$s">%3$s</fb-field></td>
+                <td><fb-field data-render_type="V" data-type="%1$s" data-sub_type="%2$s">%3$s</fb-field></td>
+            </tr>', $field['type'], $field['subType'], $field['label']);
+    }
+
+    private function generateContainerFieldTemplate($field): string
+    {
+        $containerFields = [];
+        foreach ($field['children'] as $containerField) {
+            $containerFields[] = $this->generateFieldTemplate($containerField);
+        }
+
+        $tableData = sprintf('<table><tbody>%s</tbody></table>', implode('', $containerFields));
+
+        return sprintf('<fb-container-field data-type="%s" data-sub_type="%s">%s</fb-container-field>', $field['type'], $field['subType'], $tableData);
+
+    }
+
+    private function closeTable(): string
+    {
+        $template = '';
+        if ($this->tableStarted === true) {
+            $this->tableStarted = false;
+            $template .= '</tbody></table>';
+        }
+
+        return $template;
+    }
+
+    private function openTable(): string
+    {
+        $template = '';
+
+        if ($this->tableStarted === false) {
+            $this->tableStarted = true;
+            $template .= '<table><tbody>';
+        }
+
+        return $template;
+    }
+
+}
diff --git a/src/FormBuilderBundle/MailEditor/Widget/DateWidget.php b/src/MailEditor/Widget/DateWidget.php
similarity index 77%
rename from src/FormBuilderBundle/MailEditor/Widget/DateWidget.php
rename to src/MailEditor/Widget/DateWidget.php
index 69d1761a..93081019 100644
--- a/src/FormBuilderBundle/MailEditor/Widget/DateWidget.php
+++ b/src/MailEditor/Widget/DateWidget.php
@@ -2,6 +2,8 @@
 
 namespace FormBuilderBundle\MailEditor\Widget;
 
+use FormBuilderBundle\MailEditor\AttributeBag;
+
 class DateWidget implements MailEditorWidgetInterface
 {
     public function getWidgetGroupName(): string
@@ -25,9 +27,9 @@ public function getWidgetConfig(): array
         ];
     }
 
-    public function getValueForOutput(array $config): string
+    public function getValueForOutput(AttributeBag $attributeBag, string $layoutType): string
     {
-        $format = $config['format'] ?? 'm/d/y H:i:s';
+        $format = $attributeBag->get('format', 'm/d/y H:i:s');
 
         return date($format);
     }
diff --git a/src/MailEditor/Widget/FormFieldWidget.php b/src/MailEditor/Widget/FormFieldWidget.php
new file mode 100644
index 00000000..cb732ce9
--- /dev/null
+++ b/src/MailEditor/Widget/FormFieldWidget.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace FormBuilderBundle\MailEditor\Widget;
+
+use FormBuilderBundle\Form\FormValuesOutputApplierInterface;
+use FormBuilderBundle\MailEditor\AttributeBag;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class FormFieldWidget implements MailEditorWidgetInterface, MailEditorFieldDataWidgetInterface
+{
+    private const RENDER_TYPE_LABEL = 'L';
+
+    public function __construct(protected TranslatorInterface $translator)
+    {
+    }
+
+    public function getWidgetGroupName(): string
+    {
+        return 'form_builder.mail_editor.widget_provider.form_fields';
+    }
+
+    public function getSubTypeByField(array $field): string
+    {
+        return $field['name'];
+    }
+
+    public function getWidgetIdentifierByField(string $widgetType, array $field): string
+    {
+        $type = $field['type'] === 'container' ? sprintf('%s_%s', $field['type'], $field['sub_type']) : $field['type'];
+
+        return sprintf('%s_%s', $widgetType, $type);
+    }
+
+    public function getWidgetLabelByField(array $field): string
+    {
+        return $field['display_name'];
+    }
+
+    public function getWidgetConfigByField(array $field): array
+    {
+        $fieldType = $field['type'] ?? null;
+        $subType = $field['sub_type'] ?? null;
+
+        $configData = [];
+
+        if ($fieldType === 'container' && $subType === 'repeater') {
+            $configData['block_label'] = [
+                'type'         => 'input',
+                'defaultValue' => '',
+                'label'        => 'form_builder.mail_editor.widget_provider.form_fields.repeater_block_label'
+            ];
+        }
+
+        return $configData;
+    }
+
+    public function getValueForOutput(AttributeBag $attributeBag, string $layoutType): string
+    {
+        $renderType = $attributeBag->get('render_type');
+
+        $outputData = $attributeBag->get('output_data', []);
+        $fieldType = $outputData['field_type'] ?? null;
+
+        if (!is_array($outputData)) {
+            return '';
+        }
+
+        if ($fieldType === FormValuesOutputApplierInterface::FIELD_TYPE_CONTAINER) {
+            return $this->buildContainerHead($layoutType, $outputData, $attributeBag);
+        }
+
+        return $this->parseSimpleField($outputData, $renderType, $layoutType);
+    }
+
+    protected function parseSimpleField(array $outputData, string $renderType, string $layoutType): string
+    {
+        $fieldValue = '';
+        $label = $outputData['label'] ?? null;
+
+        if ($renderType === self::RENDER_TYPE_LABEL) {
+            return !empty($label)
+                ? $this->buildFieldLabel($layoutType, $label)
+                : '';
+        }
+
+        $fieldValue .= $this->parseFieldValue($outputData['value']);
+
+        return $fieldValue;
+    }
+
+    protected function parseFieldValue(array|string $fieldValue): string
+    {
+        if (is_array($fieldValue)) {
+            return implode(', ', $fieldValue);
+        }
+
+        return nl2br($fieldValue);
+    }
+
+    protected function buildContainerHead(string $layoutType, array $outputData, AttributeBag $attributeBag): string
+    {
+        if ($outputData['type'] !== 'repeater') {
+            return '';
+        }
+
+        if ($attributeBag->get('block_label') === null) {
+            return '';
+        }
+
+        $blockLabel = $this->translator->trans($attributeBag->get('block_label'));
+
+        if ($layoutType === 'html') {
+            return sprintf('
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td class="block-label"><strong>%s</strong></td>
+                            </tr>
+                        </tbody>
+                    </table>',
+                $blockLabel
+            );
+        }
+
+        return sprintf('%s<br>', $blockLabel);
+    }
+
+    protected function buildFieldLabel(string $layoutType, string $label): string
+    {
+        if ($layoutType === 'html') {
+            return $label;
+        }
+
+        return sprintf('%s: ', $label);
+    }
+
+    public function getWidgetLabel(): string
+    {
+        throw new \RuntimeException('"getWidgetLabel" is not allowed within implemented MailEditorFieldDataWidgetInterface');
+    }
+
+    public function getWidgetConfig(): array
+    {
+        throw new \RuntimeException('"getWidgetConfig" is not allowed within implemented MailEditorFieldDataWidgetInterface');
+    }
+}
diff --git a/src/FormBuilderBundle/MailEditor/Widget/MailEditorFieldDataWidgetInterface.php b/src/MailEditor/Widget/MailEditorFieldDataWidgetInterface.php
similarity index 100%
rename from src/FormBuilderBundle/MailEditor/Widget/MailEditorFieldDataWidgetInterface.php
rename to src/MailEditor/Widget/MailEditorFieldDataWidgetInterface.php
diff --git a/src/FormBuilderBundle/MailEditor/Widget/MailEditorWidgetInterface.php b/src/MailEditor/Widget/MailEditorWidgetInterface.php
similarity index 62%
rename from src/FormBuilderBundle/MailEditor/Widget/MailEditorWidgetInterface.php
rename to src/MailEditor/Widget/MailEditorWidgetInterface.php
index 769521fa..8e276ce5 100644
--- a/src/FormBuilderBundle/MailEditor/Widget/MailEditorWidgetInterface.php
+++ b/src/MailEditor/Widget/MailEditorWidgetInterface.php
@@ -2,6 +2,8 @@
 
 namespace FormBuilderBundle\MailEditor\Widget;
 
+use FormBuilderBundle\MailEditor\AttributeBag;
+
 interface MailEditorWidgetInterface
 {
     public function getWidgetGroupName(): string;
@@ -10,5 +12,5 @@ public function getWidgetLabel(): string;
 
     public function getWidgetConfig(): array;
 
-    public function getValueForOutput(array $config): string;
+    public function getValueForOutput(AttributeBag $attributeBag, string $layoutType): string;
 }
diff --git a/src/FormBuilderBundle/Manager/FormDefinitionManager.php b/src/Manager/FormDefinitionManager.php
similarity index 91%
rename from src/FormBuilderBundle/Manager/FormDefinitionManager.php
rename to src/Manager/FormDefinitionManager.php
index 643f1f6f..9ca06426 100644
--- a/src/FormBuilderBundle/Manager/FormDefinitionManager.php
+++ b/src/Manager/FormDefinitionManager.php
@@ -8,26 +8,17 @@
 use FormBuilderBundle\Model\FormFieldContainerDefinitionInterface;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 use FormBuilderBundle\Repository\FormDefinitionRepositoryInterface;
-use Pimcore\Bundle\AdminBundle\Security\User\TokenStorageUserResolver;
 use Pimcore\Model\User;
+use Pimcore\Security\User\TokenStorageUserResolver;
 
 class FormDefinitionManager
 {
-    protected FormDefinitionFactoryInterface $formDefinitionFactory;
-    protected FormDefinitionRepositoryInterface $formDefinitionRepository;
-    protected TokenStorageUserResolver $storageUserResolver;
-    protected EntityManagerInterface $entityManager;
-
     public function __construct(
-        FormDefinitionFactoryInterface $formDefinitionFactory,
-        FormDefinitionRepositoryInterface $formDefinitionRepository,
-        TokenStorageUserResolver $storageUserResolver,
-        EntityManagerInterface $entityManager
+        protected FormDefinitionFactoryInterface $formDefinitionFactory,
+        protected FormDefinitionRepositoryInterface $formDefinitionRepository,
+        protected TokenStorageUserResolver $storageUserResolver,
+        protected EntityManagerInterface $entityManager
     ) {
-        $this->formDefinitionFactory = $formDefinitionFactory;
-        $this->formDefinitionRepository = $formDefinitionRepository;
-        $this->storageUserResolver = $storageUserResolver;
-        $this->entityManager = $entityManager;
     }
 
     public function getById(int $id): ?FormDefinitionInterface
diff --git a/src/FormBuilderBundle/Manager/OutputWorkflowManager.php b/src/Manager/OutputWorkflowManager.php
similarity index 80%
rename from src/FormBuilderBundle/Manager/OutputWorkflowManager.php
rename to src/Manager/OutputWorkflowManager.php
index 506e3521..561af161 100644
--- a/src/FormBuilderBundle/Manager/OutputWorkflowManager.php
+++ b/src/Manager/OutputWorkflowManager.php
@@ -9,18 +9,11 @@
 
 class OutputWorkflowManager
 {
-    protected OutputWorkflowFactoryInterface $outputWorkflowFactory;
-    protected OutputWorkflowRepositoryInterface $outputWorkflowRepository;
-    protected EntityManagerInterface $entityManager;
-
     public function __construct(
-        OutputWorkflowFactoryInterface $outputWorkflowFactory,
-        OutputWorkflowRepositoryInterface $outputWorkflowRepository,
-        EntityManagerInterface $entityManager
+        protected OutputWorkflowFactoryInterface $outputWorkflowFactory,
+        protected OutputWorkflowRepositoryInterface $outputWorkflowRepository,
+        protected EntityManagerInterface $entityManager
     ) {
-        $this->outputWorkflowFactory = $outputWorkflowFactory;
-        $this->outputWorkflowRepository = $outputWorkflowRepository;
-        $this->entityManager = $entityManager;
     }
 
     public function getById(int $id): ?OutputWorkflowInterface
diff --git a/src/FormBuilderBundle/Manager/PresetManager.php b/src/Manager/PresetManager.php
similarity index 93%
rename from src/FormBuilderBundle/Manager/PresetManager.php
rename to src/Manager/PresetManager.php
index 6818279f..60db321f 100644
--- a/src/FormBuilderBundle/Manager/PresetManager.php
+++ b/src/Manager/PresetManager.php
@@ -9,11 +9,8 @@
 
 class PresetManager
 {
-    protected Configuration $configuration;
-
-    public function __construct(Configuration $configuration)
+    public function __construct(protected Configuration $configuration)
     {
-        $this->configuration = $configuration;
     }
 
     public function getAll(Document\PageSnippet $document): array
diff --git a/src/FormBuilderBundle/Manager/TemplateManager.php b/src/Manager/TemplateManager.php
similarity index 92%
rename from src/FormBuilderBundle/Manager/TemplateManager.php
rename to src/Manager/TemplateManager.php
index 25e855ef..4b1e4f59 100644
--- a/src/FormBuilderBundle/Manager/TemplateManager.php
+++ b/src/Manager/TemplateManager.php
@@ -6,11 +6,8 @@
 
 class TemplateManager
 {
-    protected Configuration $configuration;
-
-    public function __construct(Configuration $configuration)
+    public function __construct(protected Configuration $configuration)
     {
-        $this->configuration = $configuration;
     }
 
     public function getFieldTemplates(): array
diff --git a/src/Migrations/Version20230830183642.php b/src/Migrations/Version20230830183642.php
new file mode 100644
index 00000000..0684600a
--- /dev/null
+++ b/src/Migrations/Version20230830183642.php
@@ -0,0 +1,192 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FormBuilderBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use Doctrine\ORM\EntityRepository;
+use FormBuilderBundle\Model\OutputWorkflowChannel;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+final class Version20230830183642 extends AbstractMigration implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function doesSqlMigrations(): bool
+    {
+        return false;
+    }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // migrate mailLayoutData
+        $em = $this->container->get('doctrine.orm.entity_manager');
+
+        /** @var EntityRepository $repository */
+        $repository = $em->getRepository(OutputWorkflowChannel::class);
+
+        /** @var OutputWorkflowChannel $channel */
+        foreach ($repository->findAll() as $channel) {
+
+            if ($channel->getType() !== 'email') {
+                continue;
+            }
+
+            $this->write(sprintf('Migrate object output channel %d', $channel->getId()));
+
+            $migratedLayout = $this->migrateMailLayout($channel->getConfiguration());
+
+            if ($migratedLayout === null) {
+                continue;
+            }
+
+            $channel->setConfiguration($migratedLayout);
+            $em->persist($channel);
+        }
+
+        $em->flush();
+    }
+
+    public function down(Schema $schema): void
+    {
+        // do nothing
+    }
+
+    private function migrateMailLayout(array $configuration): ?array
+    {
+        $changed = false;
+
+        foreach ($configuration as $locale => $configurationData) {
+
+            if (!array_key_exists('mailLayoutData', $configurationData)) {
+                continue;
+            }
+
+            if ($configurationData['mailLayoutData'] === null) {
+                continue;
+            }
+
+            if (is_array($configurationData['mailLayoutData'])) {
+                continue;
+            }
+
+            $mailLayoutData = $configurationData['mailLayoutData'];
+
+            $changed = true;
+            $transformedTextLayout = preg_replace_callback($this->getPlaceholderRegex(), [$this, 'parseSquareBracketsTag'], $mailLayoutData);
+
+            $textAwareLayout = [
+                'text' => $transformedTextLayout,
+                'html' => ''
+            ];
+
+            $configuration[$locale]['mailLayoutData'] = $textAwareLayout;
+        }
+
+        if ($changed === false) {
+            return null;
+        }
+
+        return $configuration;
+    }
+
+    protected function parseSquareBracketsTag(array $tag): ?string
+    {
+        $type = $tag[1];
+        $config = $this->parseSquareBracketsAttributes($tag[2]);
+
+        $cleanConfig = [];
+        foreach ($config as $key => $value) {
+            if ($value === 'true' || $value === 'false') {
+                $value = $value === 'true';
+            }
+
+            $cleanConfig[$key] = $value;
+        }
+
+        if (array_key_exists('sub-type', $cleanConfig) && in_array($cleanConfig['sub-type'], ['fieldset', 'repeater'], true)) {
+            return sprintf('[%s NOT MIGRATED]', strtoupper($cleanConfig['sub-type']));
+        }
+
+        $fieldSubType = $type === 'fb_field' && array_key_exists('sub-type', $cleanConfig) ? $cleanConfig['sub-type'] : 'null';
+        $fieldLabel = $fieldSubType === 'null' ? $type : $fieldSubType;
+        $renderType = $type === 'fb_field' ? ' data-render_type="V"' : '';
+        $additionalParameter = '';
+
+        foreach ($cleanConfig as $configName => $configValue) {
+
+            if (in_array($configName, ['sub-type', 'show_label'], true)) {
+                continue;
+            }
+
+            $additionalParameter .= sprintf(' data-%s="%s"', $configName, $configValue);
+        }
+
+        $prefix = '';
+
+        if (
+            $type === 'fb_field' && (
+                (array_key_exists('show_label', $cleanConfig) && $cleanConfig['show_label'] === true) ||
+                !array_key_exists('show_label', $cleanConfig)
+            )
+        ) {
+            $prefix = sprintf('<fb-field data-type="fb_field" data-sub_type="%s" data-render_type="L">%s</fb-field>', $fieldSubType, $fieldLabel);
+        }
+
+        return sprintf('%s<fb-field data-type="%s" data-sub_type="%s"%s%s>%s</fb-field>', $prefix, $type, $fieldSubType, $additionalParameter, $renderType, $fieldLabel);
+    }
+
+    protected function parseSquareBracketsAttributes(string $text): array
+    {
+        $attributes = [];
+        $pattern = $this->getSquareBracketsAttributeRegex();
+        $text = preg_replace('/[\x{00a0}\x{200b}]+/u', ' ', $text);
+
+        if (preg_match_all($pattern, $text, $match, PREG_SET_ORDER)) {
+            foreach ($match as $m) {
+                if (!empty($m[1])) {
+                    $attributes[strtolower($m[1])] = stripcslashes($m[2]);
+                } elseif (!empty($m[3])) {
+                    $attributes[strtolower($m[3])] = stripcslashes($m[4]);
+                } elseif (!empty($m[5])) {
+                    $attributes[strtolower($m[5])] = stripcslashes($m[6]);
+                } elseif (isset($m[7]) && strlen($m[7])) {
+                    $attributes[] = stripcslashes($m[7]);
+                } elseif (isset($m[8])) {
+                    $attributes[] = stripcslashes($m[8]);
+                }
+            }
+            foreach ($attributes as &$value) {
+                if (str_contains($value, '<')) {
+                    if (preg_match('/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value) !== 1) {
+                        $value = '';
+                    }
+                }
+            }
+        } else {
+            $attributes = [ltrim($text)];
+        }
+
+        return $attributes;
+    }
+
+    protected function getSquareBracketsAttributeRegex(): string
+    {
+        return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+    }
+
+    protected function getPlaceholderRegex(): string
+    {
+        $allowedRex = implode('|', ['fb_field', 'date']);
+
+        return '/\\[\\[(' . $allowedRex . ')(.*?)\\]\\]/';
+    }
+}
diff --git a/src/FormBuilderBundle/Model/FieldDefinitionInterface.php b/src/Model/FieldDefinitionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FieldDefinitionInterface.php
rename to src/Model/FieldDefinitionInterface.php
diff --git a/src/FormBuilderBundle/Model/FormDefinition.php b/src/Model/FormDefinition.php
similarity index 95%
rename from src/FormBuilderBundle/Model/FormDefinition.php
rename to src/Model/FormDefinition.php
index f92dc5f1..6be04c67 100644
--- a/src/FormBuilderBundle/Model/FormDefinition.php
+++ b/src/Model/FormDefinition.php
@@ -96,22 +96,6 @@ public function getCreatedBy(): int
         return (int) $this->createdBy;
     }
 
-    /**
-     * @deprecated since 4.0 and will be removed with 5.0
-     */
-    public function setMailLayout(?array $mailLayout = null): void
-    {
-        $this->mailLayout = $mailLayout;
-    }
-
-    /**
-     * @deprecated since 4.0 and will be removed with 5.0
-     */
-    public function getMailLayout(): ?array
-    {
-        return $this->mailLayout;
-    }
-
     public function hasOutputWorkflows(): bool
     {
         return !$this->outputWorkflows->isEmpty();
diff --git a/src/FormBuilderBundle/Model/FormDefinitionInterface.php b/src/Model/FormDefinitionInterface.php
similarity index 90%
rename from src/FormBuilderBundle/Model/FormDefinitionInterface.php
rename to src/Model/FormDefinitionInterface.php
index c1c60bfc..a81a8fc1 100644
--- a/src/FormBuilderBundle/Model/FormDefinitionInterface.php
+++ b/src/Model/FormDefinitionInterface.php
@@ -42,16 +42,6 @@ public function setCreatedBy(int $userId): void;
 
     public function getCreatedBy(): int;
 
-    /**
-     * @deprecated since 4.0 and will be removed with 5.0
-     */
-    public function setMailLayout(?array $mailLayout = null): void;
-
-    /**
-     * @deprecated since 4.0 and will be removed with 5.0
-     */
-    public function getMailLayout(): ?array;
-
     public function hasOutputWorkflows(): bool;
 
     public function hasOutputWorkflow(OutputWorkflowInterface $outputWorkflow): bool;
diff --git a/src/FormBuilderBundle/Model/FormFieldContainerDefinition.php b/src/Model/FormFieldContainerDefinition.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldContainerDefinition.php
rename to src/Model/FormFieldContainerDefinition.php
diff --git a/src/FormBuilderBundle/Model/FormFieldContainerDefinitionInterface.php b/src/Model/FormFieldContainerDefinitionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldContainerDefinitionInterface.php
rename to src/Model/FormFieldContainerDefinitionInterface.php
diff --git a/src/FormBuilderBundle/Model/FormFieldDefinition.php b/src/Model/FormFieldDefinition.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldDefinition.php
rename to src/Model/FormFieldDefinition.php
diff --git a/src/FormBuilderBundle/Model/FormFieldDefinitionInterface.php b/src/Model/FormFieldDefinitionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldDefinitionInterface.php
rename to src/Model/FormFieldDefinitionInterface.php
diff --git a/src/FormBuilderBundle/Model/FormFieldDynamicDefinition.php b/src/Model/FormFieldDynamicDefinition.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldDynamicDefinition.php
rename to src/Model/FormFieldDynamicDefinition.php
diff --git a/src/FormBuilderBundle/Model/FormFieldDynamicDefinitionInterface.php b/src/Model/FormFieldDynamicDefinitionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormFieldDynamicDefinitionInterface.php
rename to src/Model/FormFieldDynamicDefinitionInterface.php
diff --git a/src/FormBuilderBundle/Model/FormStorageData.php b/src/Model/FormStorageData.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FormStorageData.php
rename to src/Model/FormStorageData.php
diff --git a/src/FormBuilderBundle/Model/Fragment/EntityToArrayAwareInterface.php b/src/Model/Fragment/EntityToArrayAwareInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/Fragment/EntityToArrayAwareInterface.php
rename to src/Model/Fragment/EntityToArrayAwareInterface.php
diff --git a/src/FormBuilderBundle/Model/Fragment/SubFieldsAwareInterface.php b/src/Model/Fragment/SubFieldsAwareInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/Fragment/SubFieldsAwareInterface.php
rename to src/Model/Fragment/SubFieldsAwareInterface.php
diff --git a/src/FormBuilderBundle/Model/FunnelActionDefinition.php b/src/Model/FunnelActionDefinition.php
similarity index 100%
rename from src/FormBuilderBundle/Model/FunnelActionDefinition.php
rename to src/Model/FunnelActionDefinition.php
diff --git a/src/FormBuilderBundle/Model/FunnelActionElement.php b/src/Model/FunnelActionElement.php
similarity index 80%
rename from src/FormBuilderBundle/Model/FunnelActionElement.php
rename to src/Model/FunnelActionElement.php
index 2f4b03e6..e1b01cbf 100644
--- a/src/FormBuilderBundle/Model/FunnelActionElement.php
+++ b/src/Model/FunnelActionElement.php
@@ -8,15 +8,10 @@ class FunnelActionElement
     protected mixed $subject = null;
     protected bool $isDisabled = false;
 
-    protected FunnelActionDefinition $funnelActionDefinition;
-    protected array $coreConfiguration;
-
     public function __construct(
-        FunnelActionDefinition $funnelActionDefinition,
-        array $coreConfiguration
+        protected FunnelActionDefinition $funnelActionDefinition,
+        protected array $coreConfiguration
     ) {
-        $this->funnelActionDefinition = $funnelActionDefinition;
-        $this->coreConfiguration = $coreConfiguration;
     }
 
     public function setPath(string $path): void
diff --git a/src/FormBuilderBundle/Model/OutputWorkflow.php b/src/Model/OutputWorkflow.php
similarity index 100%
rename from src/FormBuilderBundle/Model/OutputWorkflow.php
rename to src/Model/OutputWorkflow.php
diff --git a/src/FormBuilderBundle/Model/OutputWorkflowChannel.php b/src/Model/OutputWorkflowChannel.php
similarity index 100%
rename from src/FormBuilderBundle/Model/OutputWorkflowChannel.php
rename to src/Model/OutputWorkflowChannel.php
diff --git a/src/FormBuilderBundle/Model/OutputWorkflowChannelInterface.php b/src/Model/OutputWorkflowChannelInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/OutputWorkflowChannelInterface.php
rename to src/Model/OutputWorkflowChannelInterface.php
diff --git a/src/FormBuilderBundle/Model/OutputWorkflowInterface.php b/src/Model/OutputWorkflowInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Model/OutputWorkflowInterface.php
rename to src/Model/OutputWorkflowInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiData.php b/src/OutputWorkflow/Channel/Api/ApiData.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiData.php
rename to src/OutputWorkflow/Channel/Api/ApiData.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannel.php b/src/OutputWorkflow/Channel/Api/ApiOutputChannel.php
similarity index 90%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannel.php
rename to src/OutputWorkflow/Channel/Api/ApiOutputChannel.php
index 8bd9f11b..9d20498f 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannel.php
+++ b/src/OutputWorkflow/Channel/Api/ApiOutputChannel.php
@@ -8,11 +8,8 @@
 
 class ApiOutputChannel implements ChannelInterface
 {
-    protected ApiOutputChannelWorker $apiOutputChannelWorker;
-
-    public function __construct(ApiOutputChannelWorker $apiOutputChannelWorker)
+    public function __construct(protected ApiOutputChannelWorker $apiOutputChannelWorker)
     {
-        $this->apiOutputChannelWorker = $apiOutputChannelWorker;
     }
 
     public function getFormType(): string
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php b/src/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
similarity index 92%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
rename to src/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
index 7b7bf221..3b8d9a7d 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
+++ b/src/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
@@ -15,21 +15,12 @@
 
 class ApiOutputChannelWorker
 {
-    protected FormValuesOutputApplierInterface $formValuesOutputApplier;
-    protected ApiProviderRegistry $apiProviderRegistry;
-    protected FieldTransformerRegistry $fieldTransformerRegistry;
-    protected EventDispatcherInterface $eventDispatcher;
-
     public function __construct(
-        FormValuesOutputApplierInterface $formValuesOutputApplier,
-        ApiProviderRegistry $apiProviderRegistry,
-        FieldTransformerRegistry $fieldTransformerRegistry,
-        EventDispatcherInterface $eventDispatcher
+        protected FormValuesOutputApplierInterface $formValuesOutputApplier,
+        protected ApiProviderRegistry $apiProviderRegistry,
+        protected FieldTransformerRegistry $fieldTransformerRegistry,
+        protected EventDispatcherInterface $eventDispatcher
     ) {
-        $this->formValuesOutputApplier = $formValuesOutputApplier;
-        $this->apiProviderRegistry = $apiProviderRegistry;
-        $this->fieldTransformerRegistry = $fieldTransformerRegistry;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     public function process(SubmissionEvent $submissionEvent, string $workflowName, array $channelConfiguration): void
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiProviderInterface.php b/src/OutputWorkflow/Channel/Api/ApiProviderInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Api/ApiProviderInterface.php
rename to src/OutputWorkflow/Channel/Api/ApiProviderInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/ChannelInterface.php b/src/OutputWorkflow/Channel/ChannelInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/ChannelInterface.php
rename to src/OutputWorkflow/Channel/ChannelInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/ChannelResponseAwareInterface.php b/src/OutputWorkflow/Channel/ChannelResponseAwareInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/ChannelResponseAwareInterface.php
rename to src/OutputWorkflow/Channel/ChannelResponseAwareInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannel.php b/src/OutputWorkflow/Channel/Email/EmailOutputChannel.php
similarity index 85%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannel.php
rename to src/OutputWorkflow/Channel/Email/EmailOutputChannel.php
index 40323ff2..ab3edcb1 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannel.php
+++ b/src/OutputWorkflow/Channel/Email/EmailOutputChannel.php
@@ -9,13 +9,10 @@
 
 class EmailOutputChannel implements ChannelInterface
 {
-    protected EmailOutputChannelWorker $channelWorker;
-    protected LocaleDataMapper $localeDataMapper;
-
-    public function __construct(EmailOutputChannelWorker $channelWorker, LocaleDataMapper $localeDataMapper)
-    {
-        $this->channelWorker = $channelWorker;
-        $this->localeDataMapper = $localeDataMapper;
+    public function __construct(
+        protected EmailOutputChannelWorker $channelWorker,
+        protected LocaleDataMapper $localeDataMapper
+    ) {
     }
 
     public function getFormType(): string
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php b/src/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
similarity index 89%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
rename to src/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
index 3aa4a328..89751a12 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
+++ b/src/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
@@ -17,18 +17,11 @@
 
 class EmailOutputChannelWorker
 {
-    protected Configuration $configuration;
-    protected MailParser $mailParser;
-    protected EventDispatcherInterface $eventDispatcher;
-
     public function __construct(
-        Configuration $configuration,
-        MailParser $mailParser,
-        EventDispatcherInterface $eventDispatcher
+        protected Configuration $configuration,
+        protected MailParser $mailParser,
+        protected EventDispatcherInterface $eventDispatcher
     ) {
-        $this->configuration = $configuration;
-        $this->mailParser = $mailParser;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -89,7 +82,7 @@ public function process(FormInterface $form, array $channelConfiguration, array
      */
     protected function sendPlainTextOnly(Mail $mail): void
     {
-        $mail->setSubject($mail->getSubjectRendered());
+        $mail->subject($mail->getSubjectRendered());
         $bodyTextRendered = $mail->getBodyTextRendered();
 
         if ($bodyTextRendered) {
@@ -118,7 +111,9 @@ protected function dispatchGuardEvent(FormDataInterface $formData, Mail $subject
 
         if ($channelSubjectGuardEvent->shouldStopChannel()) {
             throw new GuardChannelException($channelSubjectGuardEvent->getFailMessage());
-        } elseif ($channelSubjectGuardEvent->shouldStopOutputWorkflow()) {
+        }
+
+        if ($channelSubjectGuardEvent->shouldStopOutputWorkflow()) {
             throw new GuardOutputWorkflowException($channelSubjectGuardEvent->getFailMessage());
         }
 
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/Parser/MailParser.php b/src/OutputWorkflow/Channel/Email/Parser/MailParser.php
similarity index 93%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Email/Parser/MailParser.php
rename to src/OutputWorkflow/Channel/Email/Parser/MailParser.php
index acc2ea29..857662ff 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Email/Parser/MailParser.php
+++ b/src/OutputWorkflow/Channel/Email/Parser/MailParser.php
@@ -47,8 +47,8 @@ public function create(Email $mailTemplate, FormInterface $form, array $channelC
         $formData = $form->getData();
 
         if ($disableDefaultMailBody === false) {
-            $mailLayout = $this->getMailLayout($channelConfiguration);
-            $this->setMailBodyPlaceholder($mail, $form, $fieldValues, $mailLayout);
+            $mailLayout = $this->getMailLayout($channelConfiguration, $forcePlainText);
+            $this->setMailBodyPlaceholder($mail, $form, $fieldValues, $mailLayout, $forcePlainText ? 'text' : 'html');
         }
 
         $attachments = [];
@@ -129,15 +129,15 @@ protected function setMailPlaceholders(Mail $mail, array $fieldValues): void
         }
     }
 
-    protected function setMailBodyPlaceholder(Mail $mail, FormInterface $form, array $fieldValues, ?string $mailLayout = null): void
+    protected function setMailBodyPlaceholder(Mail $mail, FormInterface $form, array $fieldValues, ?string $mailLayout, string $layoutType): void
     {
         if ($mailLayout === null) {
             $body = $this->templating->render(
-                '@FormBuilder/email/form-data.html.twig',
+                '@FormBuilder/email/form_data.html.twig',
                 ['fields' => $fieldValues]
             );
         } else {
-            $body = $this->placeholderParser->replacePlaceholderWithOutputData($mailLayout, $form, $fieldValues);
+            $body = $this->placeholderParser->replacePlaceholderWithOutputData($mailLayout, $form, $fieldValues, $layoutType);
         }
 
         $mail->setParam('body', $body);
@@ -257,12 +257,14 @@ protected function findPlaceholderValues(array $fieldValues, string $prefix = ''
         return $values;
     }
 
-    protected function getMailLayout(array $channelConfiguration): ?string
+    protected function getMailLayout(array $channelConfiguration, bool $forcePlainText): ?string
     {
-        if (!empty($channelConfiguration['mailLayoutData'])) {
-            return $channelConfiguration['mailLayoutData'];
+        $data = null;
+
+        if (array_key_exists('mailLayoutData', $channelConfiguration) && is_array($channelConfiguration['mailLayoutData'])) {
+            $data = $forcePlainText ? $channelConfiguration['mailLayoutData']['text'] : $channelConfiguration['mailLayoutData']['html'];
         }
 
-        return null;
+        return $data === '' ? null : $data;
     }
 }
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php b/src/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
similarity index 93%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
rename to src/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
index 8a9a1ed8..ca38b706 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
+++ b/src/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
@@ -9,11 +9,8 @@
 
 class ChannelAction implements FunnelActionInterface
 {
-    protected UrlGeneratorInterface $router;
-
-    public function __construct(UrlGeneratorInterface $router)
+    public function __construct(protected UrlGeneratorInterface $router)
     {
-        $this->router = $router;
     }
 
     public function getName(): string
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/DisabledAction.php b/src/OutputWorkflow/Channel/Funnel/Action/DisabledAction.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/DisabledAction.php
rename to src/OutputWorkflow/Channel/Funnel/Action/DisabledAction.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/FunnelActionElementStack.php b/src/OutputWorkflow/Channel/Funnel/Action/FunnelActionElementStack.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/FunnelActionElementStack.php
rename to src/OutputWorkflow/Channel/Funnel/Action/FunnelActionElementStack.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/FunnelActionInterface.php b/src/OutputWorkflow/Channel/Funnel/Action/FunnelActionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/FunnelActionInterface.php
rename to src/OutputWorkflow/Channel/Funnel/Action/FunnelActionInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/ReturnToFormAction.php b/src/OutputWorkflow/Channel/Funnel/Action/ReturnToFormAction.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Action/ReturnToFormAction.php
rename to src/OutputWorkflow/Channel/Funnel/Action/ReturnToFormAction.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/FunnelOutputChannel.php b/src/OutputWorkflow/Channel/Funnel/FunnelOutputChannel.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/FunnelOutputChannel.php
rename to src/OutputWorkflow/Channel/Funnel/FunnelOutputChannel.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayer.php b/src/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayer.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayer.php
rename to src/OutputWorkflow/Channel/Funnel/Layer/DynamicLayoutLayer.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php b/src/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php
similarity index 72%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php
rename to src/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php
index 5c0b917f..a3ab4bb7 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php
+++ b/src/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerData.php
@@ -9,18 +9,12 @@ class FunnelLayerData
 {
     protected string $view;
     protected array $arguments = [];
-    protected Request $request;
-    protected SubmissionEvent $submissionEvent;
-    protected array $funnelLayerConfiguration;
 
     public function __construct(
-        Request $request,
-        SubmissionEvent $submissionEvent,
-        array $funnelLayerConfiguration
+        protected Request $request,
+        protected SubmissionEvent $submissionEvent,
+        protected array $funnelLayerConfiguration
     ) {
-        $this->request = $request;
-        $this->submissionEvent = $submissionEvent;
-        $this->funnelLayerConfiguration = $funnelLayerConfiguration;
     }
 
     public function getRequest(): Request
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerInterface.php b/src/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerInterface.php
rename to src/OutputWorkflow/Channel/Funnel/Layer/FunnelLayerInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/VirtualActionDefinitions.php b/src/OutputWorkflow/Channel/Funnel/Layer/VirtualActionDefinitions.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/Layer/VirtualActionDefinitions.php
rename to src/OutputWorkflow/Channel/Funnel/Layer/VirtualActionDefinitions.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/FunnelAwareChannelInterface.php b/src/OutputWorkflow/Channel/FunnelAwareChannelInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/FunnelAwareChannelInterface.php
rename to src/OutputWorkflow/Channel/FunnelAwareChannelInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/AbstractObjectResolver.php b/src/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
similarity index 98%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
rename to src/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
index 51392322..7bed9d71 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
+++ b/src/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
@@ -17,6 +17,7 @@
 use FormBuilderBundle\Transformer\Target\TargetAwareOutputTransformer;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 abstract class AbstractObjectResolver
 {
@@ -31,6 +32,7 @@ abstract class AbstractObjectResolver
     protected ?string $dynamicObjectResolverClass = null;
 
     public function __construct(
+        protected TranslatorInterface $translator,
         protected FormValuesOutputApplierInterface $formValuesOutputApplier,
         protected EventDispatcherInterface $eventDispatcher,
         protected FactoryInterface $modelFactory,
@@ -295,7 +297,7 @@ protected function appendToFieldCollection(DataObject\Concrete $object, string $
                 continue;
             }
 
-            $validator = new FieldCollectionValidationHelper($validationData);
+            $validator = new FieldCollectionValidationHelper($this->translator, $validationData);
             $validator->validate($object, $objectFieldCollections, $fieldCollection);
 
             $objectFieldCollections->add($fieldCollection);
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/ExistingObjectResolver.php b/src/OutputWorkflow/Channel/Object/ExistingObjectResolver.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Object/ExistingObjectResolver.php
rename to src/OutputWorkflow/Channel/Object/ExistingObjectResolver.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php b/src/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php
similarity index 90%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php
rename to src/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php
index 3b26a6df..d14df583 100644
--- a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php
+++ b/src/OutputWorkflow/Channel/Object/Helper/FieldCollectionValidationHelper.php
@@ -3,18 +3,15 @@
 namespace FormBuilderBundle\OutputWorkflow\Channel\Object\Helper;
 
 use FormBuilderBundle\Exception\OutputWorkflow\GuardOutputWorkflowException;
-use Pimcore\Translation\Translator;
 use Pimcore\Model\DataObject;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FieldCollectionValidationHelper
 {
-    protected Translator $translator;
-    protected array $validationConfiguration;
-
-    public function __construct(array $validationConfiguration)
-    {
-        $this->translator = \Pimcore::getContainer()->get('translator');
-        $this->validationConfiguration = $validationConfiguration;
+    public function __construct(
+        protected TranslatorInterface $translator,
+        protected array $validationConfiguration
+    ) {
     }
 
     /**
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/NewObjectResolver.php b/src/OutputWorkflow/Channel/Object/NewObjectResolver.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Object/NewObjectResolver.php
rename to src/OutputWorkflow/Channel/Object/NewObjectResolver.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/Channel/Object/ObjectOutputChannel.php b/src/OutputWorkflow/Channel/Object/ObjectOutputChannel.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/Channel/Object/ObjectOutputChannel.php
rename to src/OutputWorkflow/Channel/Object/ObjectOutputChannel.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/DynamicObjectResolver/DynamicObjectResolverInterface.php b/src/OutputWorkflow/DynamicObjectResolver/DynamicObjectResolverInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/DynamicObjectResolver/DynamicObjectResolverInterface.php
rename to src/OutputWorkflow/DynamicObjectResolver/DynamicObjectResolverInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/DynamicObjectResolver/ObjectByRuntimeDataResolver.php b/src/OutputWorkflow/DynamicObjectResolver/ObjectByRuntimeDataResolver.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/DynamicObjectResolver/ObjectByRuntimeDataResolver.php
rename to src/OutputWorkflow/DynamicObjectResolver/ObjectByRuntimeDataResolver.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/FieldTransformerInterface.php b/src/OutputWorkflow/FieldTransformerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/FieldTransformerInterface.php
rename to src/OutputWorkflow/FieldTransformerInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/FormSubmissionFinisher.php b/src/OutputWorkflow/FormSubmissionFinisher.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/FormSubmissionFinisher.php
rename to src/OutputWorkflow/FormSubmissionFinisher.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/FormSubmissionFinisherInterface.php b/src/OutputWorkflow/FormSubmissionFinisherInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/FormSubmissionFinisherInterface.php
rename to src/OutputWorkflow/FormSubmissionFinisherInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/FunnelData.php b/src/OutputWorkflow/FunnelData.php
similarity index 55%
rename from src/FormBuilderBundle/OutputWorkflow/FunnelData.php
rename to src/OutputWorkflow/FunnelData.php
index 8868ee51..96500bb1 100644
--- a/src/FormBuilderBundle/OutputWorkflow/FunnelData.php
+++ b/src/OutputWorkflow/FunnelData.php
@@ -7,24 +7,13 @@
 
 class FunnelData
 {
-    protected Request $request;
-    protected FormStorageData $formStorageData;
-    protected string $funnelId;
-    protected string $channelId;
-    protected string $storageToken;
-
     public function __construct(
-        Request $request,
-        FormStorageData $formStorageData,
-        string $funnelId,
-        string $channelId,
-        string $storageToken
+        protected Request $request,
+        protected FormStorageData $formStorageData,
+        protected string $funnelId,
+        protected string $channelId,
+        protected string $storageToken
     ) {
-        $this->request = $request;
-        $this->formStorageData = $formStorageData;
-        $this->funnelId = $funnelId;
-        $this->channelId = $channelId;
-        $this->storageToken = $storageToken;
     }
 
     public function getRequest(): Request
diff --git a/src/FormBuilderBundle/OutputWorkflow/FunnelWorker.php b/src/OutputWorkflow/FunnelWorker.php
similarity index 89%
rename from src/FormBuilderBundle/OutputWorkflow/FunnelWorker.php
rename to src/OutputWorkflow/FunnelWorker.php
index bdbaf4cc..bcee8e4a 100644
--- a/src/FormBuilderBundle/OutputWorkflow/FunnelWorker.php
+++ b/src/OutputWorkflow/FunnelWorker.php
@@ -25,30 +25,15 @@
 
 class FunnelWorker implements FunnelWorkerInterface
 {
-    protected Configuration $configuration;
-    protected FormValuesInputApplierInterface $formValuesInputApplier;
-    protected StorageProviderRegistry $storageProviderRegistry;
-    protected OutputWorkflowChannelRegistry $channelRegistry;
-    protected FrontendFormBuilder $frontendFormBuilder;
-    protected FunnelActionElementAssembler $funnelActionElementAssembler;
-    protected FunnelDataResolver $funnelDataResolver;
-
     public function __construct(
-        Configuration $configuration,
-        FormValuesInputApplierInterface $formValuesInputApplier,
-        StorageProviderRegistry $storageProviderRegistry,
-        OutputWorkflowChannelRegistry $channelRegistry,
-        FrontendFormBuilder $frontendFormBuilder,
-        FunnelActionElementAssembler $funnelActionElementAssembler,
-        FunnelDataResolver $funnelDataResolver,
+        protected Configuration $configuration,
+        protected FormValuesInputApplierInterface $formValuesInputApplier,
+        protected StorageProviderRegistry $storageProviderRegistry,
+        protected OutputWorkflowChannelRegistry $channelRegistry,
+        protected FrontendFormBuilder $frontendFormBuilder,
+        protected FunnelActionElementAssembler $funnelActionElementAssembler,
+        protected FunnelDataResolver $funnelDataResolver,
     ) {
-        $this->configuration = $configuration;
-        $this->formValuesInputApplier = $formValuesInputApplier;
-        $this->storageProviderRegistry = $storageProviderRegistry;
-        $this->channelRegistry = $channelRegistry;
-        $this->frontendFormBuilder = $frontendFormBuilder;
-        $this->funnelActionElementAssembler = $funnelActionElementAssembler;
-        $this->funnelDataResolver = $funnelDataResolver;
     }
 
     /**
diff --git a/src/FormBuilderBundle/OutputWorkflow/FunnelWorkerData.php b/src/OutputWorkflow/FunnelWorkerData.php
similarity index 72%
rename from src/FormBuilderBundle/OutputWorkflow/FunnelWorkerData.php
rename to src/OutputWorkflow/FunnelWorkerData.php
index 94824648..ef4fc2bf 100644
--- a/src/FormBuilderBundle/OutputWorkflow/FunnelWorkerData.php
+++ b/src/OutputWorkflow/FunnelWorkerData.php
@@ -15,25 +15,15 @@
  */
 class FunnelWorkerData
 {
-    protected FunnelData $funnelData;
-    protected SubmissionEvent $submissionEvent;
-    protected OutputWorkflowInterface $outputWorkflow;
-    protected OutputWorkflowChannelInterface $channel;
-    protected ChannelInterface $channelProcessor;
     protected ?FunnelActionElementStack $funnelActionElementStack = null;
 
     public function __construct(
-        FunnelData $funnelData,
-        SubmissionEvent $submissionEvent,
-        OutputWorkflowInterface $outputWorkflow,
-        OutputWorkflowChannelInterface $channel,
-        ChannelInterface $channelProcessor
+        protected FunnelData $funnelData,
+        protected SubmissionEvent $submissionEvent,
+        protected OutputWorkflowInterface $outputWorkflow,
+        protected OutputWorkflowChannelInterface $channel,
+        protected ChannelInterface $channelProcessor
     ) {
-        $this->funnelData = $funnelData;
-        $this->submissionEvent = $submissionEvent;
-        $this->outputWorkflow = $outputWorkflow;
-        $this->channel = $channel;
-        $this->channelProcessor = $channelProcessor;
     }
 
     public function getSubmissionEvent(): SubmissionEvent
diff --git a/src/FormBuilderBundle/OutputWorkflow/FunnelWorkerInterface.php b/src/OutputWorkflow/FunnelWorkerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/FunnelWorkerInterface.php
rename to src/OutputWorkflow/FunnelWorkerInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowDispatcher.php b/src/OutputWorkflow/OutputWorkflowDispatcher.php
similarity index 89%
rename from src/FormBuilderBundle/OutputWorkflow/OutputWorkflowDispatcher.php
rename to src/OutputWorkflow/OutputWorkflowDispatcher.php
index c3294432..334fca72 100644
--- a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowDispatcher.php
+++ b/src/OutputWorkflow/OutputWorkflowDispatcher.php
@@ -14,18 +14,11 @@
 
 class OutputWorkflowDispatcher implements OutputWorkflowDispatcherInterface
 {
-    protected OutputWorkflowChannelRegistry $channelRegistry;
-    protected FunnelWorkerInterface $funnelWorker;
-    protected SignalSubscribeHandler $signalSubscribeHandler;
-
     public function __construct(
-        OutputWorkflowChannelRegistry $channelRegistry,
-        FunnelWorkerInterface $funnelWorker,
-        SignalSubscribeHandler $signalSubscribeHandler
+        protected OutputWorkflowChannelRegistry $channelRegistry,
+        protected FunnelWorkerInterface $funnelWorker,
+        protected SignalSubscribeHandler $signalSubscribeHandler
     ) {
-        $this->channelRegistry = $channelRegistry;
-        $this->funnelWorker = $funnelWorker;
-        $this->signalSubscribeHandler = $signalSubscribeHandler;
     }
 
     public function dispatch(OutputWorkflowInterface $outputWorkflow, SubmissionEvent $submissionEvent): void
diff --git a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowDispatcherInterface.php b/src/OutputWorkflow/OutputWorkflowDispatcherInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/OutputWorkflowDispatcherInterface.php
rename to src/OutputWorkflow/OutputWorkflowDispatcherInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowResolver.php b/src/OutputWorkflow/OutputWorkflowResolver.php
similarity index 95%
rename from src/FormBuilderBundle/OutputWorkflow/OutputWorkflowResolver.php
rename to src/OutputWorkflow/OutputWorkflowResolver.php
index 06640088..b96af2c2 100644
--- a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowResolver.php
+++ b/src/OutputWorkflow/OutputWorkflowResolver.php
@@ -11,11 +11,8 @@
 
 class OutputWorkflowResolver implements OutputWorkflowResolverInterface
 {
-    protected Dispatcher $dispatcher;
-
-    public function __construct(Dispatcher $dispatcher)
+    public function __construct(protected Dispatcher $dispatcher)
     {
-        $this->dispatcher = $dispatcher;
     }
 
     public function resolve(SubmissionEvent $submissionEvent): ?OutputWorkflowInterface
diff --git a/src/FormBuilderBundle/OutputWorkflow/OutputWorkflowResolverInterface.php b/src/OutputWorkflow/OutputWorkflowResolverInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/OutputWorkflowResolverInterface.php
rename to src/OutputWorkflow/OutputWorkflowResolverInterface.php
diff --git a/src/FormBuilderBundle/OutputWorkflow/SuccessManagementWorker.php b/src/OutputWorkflow/SuccessManagementWorker.php
similarity index 88%
rename from src/FormBuilderBundle/OutputWorkflow/SuccessManagementWorker.php
rename to src/OutputWorkflow/SuccessManagementWorker.php
index bab4c479..14678c2d 100644
--- a/src/FormBuilderBundle/OutputWorkflow/SuccessManagementWorker.php
+++ b/src/OutputWorkflow/SuccessManagementWorker.php
@@ -12,28 +12,17 @@
 use Pimcore\Model\Document;
 use Pimcore\Model\Document\Snippet;
 use Pimcore\Templating\Renderer\IncludeRenderer;
-use Pimcore\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SuccessManagementWorker implements SuccessManagementWorkerInterface
 {
-    protected LocaleDataMapper $localeDataMapper;
-    protected FlashBagManagerInterface $flashBagManager;
-    protected IncludeRenderer $includeRenderer;
-    protected Dispatcher $dispatcher;
-    protected Translator $translator;
-
     public function __construct(
-        LocaleDataMapper $localeDataMapper,
-        FlashBagManagerInterface $flashBagManager,
-        IncludeRenderer $includeRenderer,
-        Dispatcher $dispatcher,
-        Translator $translator
+        protected LocaleDataMapper $localeDataMapper,
+        protected FlashBagManagerInterface $flashBagManager,
+        protected IncludeRenderer $includeRenderer,
+        protected Dispatcher $dispatcher,
+        protected TranslatorInterface $translator
     ) {
-        $this->localeDataMapper = $localeDataMapper;
-        $this->flashBagManager = $flashBagManager;
-        $this->includeRenderer = $includeRenderer;
-        $this->dispatcher = $dispatcher;
-        $this->translator = $translator;
     }
 
     public function process(SubmissionEvent $submissionEvent, array $successManagementConfiguration): void
diff --git a/src/FormBuilderBundle/OutputWorkflow/SuccessManagementWorkerInterface.php b/src/OutputWorkflow/SuccessManagementWorkerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/OutputWorkflow/SuccessManagementWorkerInterface.php
rename to src/OutputWorkflow/SuccessManagementWorkerInterface.php
diff --git a/src/FormBuilderBundle/Registry/ApiProviderRegistry.php b/src/Registry/ApiProviderRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/ApiProviderRegistry.php
rename to src/Registry/ApiProviderRegistry.php
diff --git a/src/FormBuilderBundle/Registry/ChoiceBuilderRegistry.php b/src/Registry/ChoiceBuilderRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/ChoiceBuilderRegistry.php
rename to src/Registry/ChoiceBuilderRegistry.php
diff --git a/src/FormBuilderBundle/Registry/ConditionalLogicRegistry.php b/src/Registry/ConditionalLogicRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/ConditionalLogicRegistry.php
rename to src/Registry/ConditionalLogicRegistry.php
diff --git a/src/FormBuilderBundle/Registry/DataInjectionRegistry.php b/src/Registry/DataInjectionRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/DataInjectionRegistry.php
rename to src/Registry/DataInjectionRegistry.php
diff --git a/src/FormBuilderBundle/Registry/DispatcherRegistry.php b/src/Registry/DispatcherRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/DispatcherRegistry.php
rename to src/Registry/DispatcherRegistry.php
diff --git a/src/FormBuilderBundle/Registry/DynamicMultiFileAdapterRegistry.php b/src/Registry/DynamicMultiFileAdapterRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/DynamicMultiFileAdapterRegistry.php
rename to src/Registry/DynamicMultiFileAdapterRegistry.php
diff --git a/src/FormBuilderBundle/Registry/DynamicObjectResolverRegistry.php b/src/Registry/DynamicObjectResolverRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/DynamicObjectResolverRegistry.php
rename to src/Registry/DynamicObjectResolverRegistry.php
diff --git a/src/FormBuilderBundle/Registry/FieldTransformerRegistry.php b/src/Registry/FieldTransformerRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/FieldTransformerRegistry.php
rename to src/Registry/FieldTransformerRegistry.php
diff --git a/src/FormBuilderBundle/Registry/FunnelActionRegistry.php b/src/Registry/FunnelActionRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/FunnelActionRegistry.php
rename to src/Registry/FunnelActionRegistry.php
diff --git a/src/FormBuilderBundle/Registry/FunnelLayerRegistry.php b/src/Registry/FunnelLayerRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/FunnelLayerRegistry.php
rename to src/Registry/FunnelLayerRegistry.php
diff --git a/src/FormBuilderBundle/Registry/InputTransformerRegistry.php b/src/Registry/InputTransformerRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/InputTransformerRegistry.php
rename to src/Registry/InputTransformerRegistry.php
diff --git a/src/FormBuilderBundle/Registry/MailEditorWidgetRegistry.php b/src/Registry/MailEditorWidgetRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/MailEditorWidgetRegistry.php
rename to src/Registry/MailEditorWidgetRegistry.php
diff --git a/src/FormBuilderBundle/Registry/OptionsTransformerRegistry.php b/src/Registry/OptionsTransformerRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/OptionsTransformerRegistry.php
rename to src/Registry/OptionsTransformerRegistry.php
diff --git a/src/FormBuilderBundle/Registry/OutputTransformerRegistry.php b/src/Registry/OutputTransformerRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/OutputTransformerRegistry.php
rename to src/Registry/OutputTransformerRegistry.php
diff --git a/src/FormBuilderBundle/Registry/OutputWorkflowChannelRegistry.php b/src/Registry/OutputWorkflowChannelRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/OutputWorkflowChannelRegistry.php
rename to src/Registry/OutputWorkflowChannelRegistry.php
diff --git a/src/FormBuilderBundle/Registry/RuntimeDataProviderRegistry.php b/src/Registry/RuntimeDataProviderRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/RuntimeDataProviderRegistry.php
rename to src/Registry/RuntimeDataProviderRegistry.php
diff --git a/src/FormBuilderBundle/Registry/StorageProviderRegistry.php b/src/Registry/StorageProviderRegistry.php
similarity index 100%
rename from src/FormBuilderBundle/Registry/StorageProviderRegistry.php
rename to src/Registry/StorageProviderRegistry.php
diff --git a/src/FormBuilderBundle/Repository/FormDefinitionRepository.php b/src/Repository/FormDefinitionRepository.php
similarity index 100%
rename from src/FormBuilderBundle/Repository/FormDefinitionRepository.php
rename to src/Repository/FormDefinitionRepository.php
diff --git a/src/FormBuilderBundle/Repository/FormDefinitionRepositoryInterface.php b/src/Repository/FormDefinitionRepositoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Repository/FormDefinitionRepositoryInterface.php
rename to src/Repository/FormDefinitionRepositoryInterface.php
diff --git a/src/FormBuilderBundle/Repository/OutputWorkflowRepository.php b/src/Repository/OutputWorkflowRepository.php
similarity index 100%
rename from src/FormBuilderBundle/Repository/OutputWorkflowRepository.php
rename to src/Repository/OutputWorkflowRepository.php
diff --git a/src/FormBuilderBundle/Repository/OutputWorkflowRepositoryInterface.php b/src/Repository/OutputWorkflowRepositoryInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Repository/OutputWorkflowRepositoryInterface.php
rename to src/Repository/OutputWorkflowRepositoryInterface.php
diff --git a/src/FormBuilderBundle/Resolver/FormOptionsResolver.php b/src/Resolver/FormOptionsResolver.php
similarity index 100%
rename from src/FormBuilderBundle/Resolver/FormOptionsResolver.php
rename to src/Resolver/FormOptionsResolver.php
diff --git a/src/FormBuilderBundle/Resolver/FunnelDataResolver.php b/src/Resolver/FunnelDataResolver.php
similarity index 100%
rename from src/FormBuilderBundle/Resolver/FunnelDataResolver.php
rename to src/Resolver/FunnelDataResolver.php
diff --git a/src/FormBuilderBundle/Session/FlashBagManager.php b/src/Session/FlashBagManager.php
similarity index 100%
rename from src/FormBuilderBundle/Session/FlashBagManager.php
rename to src/Session/FlashBagManager.php
diff --git a/src/FormBuilderBundle/Session/FlashBagManagerInterface.php b/src/Session/FlashBagManagerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Session/FlashBagManagerInterface.php
rename to src/Session/FlashBagManagerInterface.php
diff --git a/src/FormBuilderBundle/Storage/SessionStorageProvider.php b/src/Storage/SessionStorageProvider.php
similarity index 91%
rename from src/FormBuilderBundle/Storage/SessionStorageProvider.php
rename to src/Storage/SessionStorageProvider.php
index 0be9adf7..0ab9964e 100644
--- a/src/FormBuilderBundle/Storage/SessionStorageProvider.php
+++ b/src/Storage/SessionStorageProvider.php
@@ -9,11 +9,8 @@
 
 class SessionStorageProvider implements StorageProviderInterface
 {
-    protected SerializerInterface $serializer;
-
-    public function __construct(SerializerInterface $serializer)
+    public function __construct(protected SerializerInterface $serializer)
     {
-        $this->serializer = $serializer;
     }
 
     public function store(Request $request, FormStorageData $formStorageData): string
diff --git a/src/FormBuilderBundle/Storage/StorageProviderInterface.php b/src/Storage/StorageProviderInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Storage/StorageProviderInterface.php
rename to src/Storage/StorageProviderInterface.php
diff --git a/src/FormBuilderBundle/Stream/AttachmentStream.php b/src/Stream/AttachmentStream.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/AttachmentStream.php
rename to src/Stream/AttachmentStream.php
diff --git a/src/FormBuilderBundle/Stream/AttachmentStreamInterface.php b/src/Stream/AttachmentStreamInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/AttachmentStreamInterface.php
rename to src/Stream/AttachmentStreamInterface.php
diff --git a/src/FormBuilderBundle/Stream/File.php b/src/Stream/File.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/File.php
rename to src/Stream/File.php
diff --git a/src/FormBuilderBundle/Stream/FileStack.php b/src/Stream/FileStack.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/FileStack.php
rename to src/Stream/FileStack.php
diff --git a/src/FormBuilderBundle/Stream/FileStream.php b/src/Stream/FileStream.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/FileStream.php
rename to src/Stream/FileStream.php
diff --git a/src/FormBuilderBundle/Stream/FileStreamInterface.php b/src/Stream/FileStreamInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Stream/FileStreamInterface.php
rename to src/Stream/FileStreamInterface.php
diff --git a/src/FormBuilderBundle/Tool/FormDependencyLocator.php b/src/Tool/FormDependencyLocator.php
similarity index 98%
rename from src/FormBuilderBundle/Tool/FormDependencyLocator.php
rename to src/Tool/FormDependencyLocator.php
index 85df41ce..9b31a53d 100644
--- a/src/FormBuilderBundle/Tool/FormDependencyLocator.php
+++ b/src/Tool/FormDependencyLocator.php
@@ -2,8 +2,8 @@
 
 namespace FormBuilderBundle\Tool;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Exception;
-use Pimcore\Db\Connection;
 use Pimcore\Model\Document;
 
 class FormDependencyLocator
diff --git a/src/FormBuilderBundle/Tool/ImportExportProcessor.php b/src/Tool/ImportExportProcessor.php
similarity index 92%
rename from src/FormBuilderBundle/Tool/ImportExportProcessor.php
rename to src/Tool/ImportExportProcessor.php
index f81f6a99..3cd527c8 100644
--- a/src/FormBuilderBundle/Tool/ImportExportProcessor.php
+++ b/src/Tool/ImportExportProcessor.php
@@ -2,29 +2,22 @@
 
 namespace FormBuilderBundle\Tool;
 
+use Doctrine\DBAL\Connection;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Manager\OutputWorkflowManager;
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\Model\OutputWorkflowChannel;
 use FormBuilderBundle\Model\OutputWorkflowInterface;
-use Pimcore\Db\ConnectionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Yaml\Yaml;
 
 class ImportExportProcessor
 {
-    protected ConnectionInterface $connection;
-    protected FormDefinitionManager $formDefinitionManager;
-    protected OutputWorkflowManager $outputWorkflowManager;
-
     public function __construct(
-        ConnectionInterface $connection,
-        FormDefinitionManager $formDefinitionManager,
-        OutputWorkflowManager $outputWorkflowManager
+        protected Connection $connection,
+        protected FormDefinitionManager $formDefinitionManager,
+        protected OutputWorkflowManager $outputWorkflowManager
     ) {
-        $this->connection = $connection;
-        $this->formDefinitionManager = $formDefinitionManager;
-        $this->outputWorkflowManager = $outputWorkflowManager;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Tool/Install.php b/src/Tool/Install.php
similarity index 93%
rename from src/FormBuilderBundle/Tool/Install.php
rename to src/Tool/Install.php
index e2bbad17..ab9b8a2b 100644
--- a/src/FormBuilderBundle/Tool/Install.php
+++ b/src/Tool/Install.php
@@ -2,7 +2,6 @@
 
 namespace FormBuilderBundle\Tool;
 
-use Pimcore\Db\Connection;
 use Pimcore\Extension\Bundle\Installer\Exception\InstallationException;
 use Pimcore\Extension\Bundle\Installer\SettingsStoreAwareInstaller;
 use Pimcore\Model\Asset;
@@ -56,9 +55,8 @@ protected function installTranslations(): void
 
     protected function installDbStructure(): void
     {
-        /** @var Connection $db */
         $db = \Pimcore\Db::get();
-        $db->query(file_get_contents($this->getInstallSourcesPath() . '/sql/install.sql'));
+        $db->executeQuery(file_get_contents($this->getInstallSourcesPath() . '/sql/install.sql'));
     }
 
     /**
@@ -136,7 +134,7 @@ protected function installDocumentTypes(): void
             $type->setValues([
                 'name'       => $elementName,
                 'controller' => 'FormBuilderBundle\Controller\EmailController::emailAction',
-                'template'   => 'FormBuilderBundle:Email:email.html.twig',
+                'template'   => '@FormBuilder/email/email.html.twig',
                 'type'       => 'email',
                 'priority'   => 0
             ]);
@@ -148,6 +146,6 @@ protected function installDocumentTypes(): void
 
     protected function getInstallSourcesPath(): string
     {
-        return __DIR__ . '/../Resources/install';
+        return __DIR__ . '/../../config/install';
     }
 }
diff --git a/src/FormBuilderBundle/Tool/LocaleDataMapper.php b/src/Tool/LocaleDataMapper.php
similarity index 100%
rename from src/FormBuilderBundle/Tool/LocaleDataMapper.php
rename to src/Tool/LocaleDataMapper.php
diff --git a/src/FormBuilderBundle/Tool/ReCaptcha/Response.php b/src/Tool/ReCaptcha/Response.php
similarity index 100%
rename from src/FormBuilderBundle/Tool/ReCaptcha/Response.php
rename to src/Tool/ReCaptcha/Response.php
diff --git a/src/FormBuilderBundle/Tool/ReCaptchaProcessor.php b/src/Tool/ReCaptchaProcessor.php
similarity index 81%
rename from src/FormBuilderBundle/Tool/ReCaptchaProcessor.php
rename to src/Tool/ReCaptchaProcessor.php
index 4fd50ef3..8d6962c6 100644
--- a/src/FormBuilderBundle/Tool/ReCaptchaProcessor.php
+++ b/src/Tool/ReCaptchaProcessor.php
@@ -9,14 +9,12 @@
 
 class ReCaptchaProcessor implements ReCaptchaProcessorInterface
 {
-    protected Configuration $configuration;
     protected string $url = 'https://www.google.com/recaptcha/api/siteverify';
-    protected RequestStack $requestStack;
 
-    public function __construct(Configuration $configuration, RequestStack $requestStack)
-    {
-        $this->configuration = $configuration;
-        $this->requestStack = $requestStack;
+    public function __construct(
+        protected Configuration $configuration,
+        protected RequestStack $requestStack
+    ) {
     }
 
     public function verify(mixed $value): Response
diff --git a/src/FormBuilderBundle/Tool/ReCaptchaProcessorInterface.php b/src/Tool/ReCaptchaProcessorInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Tool/ReCaptchaProcessorInterface.php
rename to src/Tool/ReCaptchaProcessorInterface.php
diff --git a/src/FormBuilderBundle/Transformer/ChoicesMetaTransformer.php b/src/Transformer/ChoicesMetaTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/ChoicesMetaTransformer.php
rename to src/Transformer/ChoicesMetaTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/ChoicesTransformer.php b/src/Transformer/ChoicesTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/ChoicesTransformer.php
rename to src/Transformer/ChoicesTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/DefaultValueTransformer.php b/src/Transformer/DefaultValueTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/DefaultValueTransformer.php
rename to src/Transformer/DefaultValueTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/DynamicOptionsTransformerInterface.php b/src/Transformer/DynamicOptionsTransformerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/DynamicOptionsTransformerInterface.php
rename to src/Transformer/DynamicOptionsTransformerInterface.php
diff --git a/src/FormBuilderBundle/Transformer/HrefTransformer.php b/src/Transformer/HrefTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/HrefTransformer.php
rename to src/Transformer/HrefTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Input/InputTransformerInterface.php b/src/Transformer/Input/InputTransformerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Input/InputTransformerInterface.php
rename to src/Transformer/Input/InputTransformerInterface.php
diff --git a/src/FormBuilderBundle/Transformer/OptionsTransformerInterface.php b/src/Transformer/OptionsTransformerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/OptionsTransformerInterface.php
rename to src/Transformer/OptionsTransformerInterface.php
diff --git a/src/FormBuilderBundle/Transformer/Output/CheckboxObjectTransformer.php b/src/Transformer/Output/CheckboxObjectTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/CheckboxObjectTransformer.php
rename to src/Transformer/Output/CheckboxObjectTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Output/ChoiceDataObjectTransformer.php b/src/Transformer/Output/ChoiceDataObjectTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/ChoiceDataObjectTransformer.php
rename to src/Transformer/Output/ChoiceDataObjectTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Output/CountryDataObjectTransformer.php b/src/Transformer/Output/CountryDataObjectTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/CountryDataObjectTransformer.php
rename to src/Transformer/Output/CountryDataObjectTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Output/DateDataObjectTransformer.php b/src/Transformer/Output/DateDataObjectTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/DateDataObjectTransformer.php
rename to src/Transformer/Output/DateDataObjectTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Output/DynamicMultiFileTransformer.php b/src/Transformer/Output/DynamicMultiFileTransformer.php
similarity index 89%
rename from src/FormBuilderBundle/Transformer/Output/DynamicMultiFileTransformer.php
rename to src/Transformer/Output/DynamicMultiFileTransformer.php
index 81d3a76f..cf9d5f3b 100644
--- a/src/FormBuilderBundle/Transformer/Output/DynamicMultiFileTransformer.php
+++ b/src/Transformer/Output/DynamicMultiFileTransformer.php
@@ -6,19 +6,16 @@
 use FormBuilderBundle\Model\FieldDefinitionInterface;
 use FormBuilderBundle\Stream\AttachmentStreamInterface;
 use Pimcore\Model\Asset;
-use Pimcore\Translation\Translator;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DynamicMultiFileTransformer implements OutputTransformerInterface
 {
-    protected Translator $translator;
-    protected AttachmentStreamInterface $attachmentStream;
-
-    public function __construct(Translator $translator, AttachmentStreamInterface $attachmentStream)
-    {
-        $this->translator = $translator;
-        $this->attachmentStream = $attachmentStream;
+    public function __construct(
+        protected TranslatorInterface $translator,
+        protected AttachmentStreamInterface $attachmentStream
+    ) {
     }
 
     public function getValue(FieldDefinitionInterface $fieldDefinition, FormInterface $formField, mixed $rawValue, ?string $locale): mixed
diff --git a/src/FormBuilderBundle/Transformer/Output/FallbackTransformer.php b/src/Transformer/Output/FallbackTransformer.php
similarity index 97%
rename from src/FormBuilderBundle/Transformer/Output/FallbackTransformer.php
rename to src/Transformer/Output/FallbackTransformer.php
index b36efcc5..4aa9ec4f 100644
--- a/src/FormBuilderBundle/Transformer/Output/FallbackTransformer.php
+++ b/src/Transformer/Output/FallbackTransformer.php
@@ -3,7 +3,6 @@
 namespace FormBuilderBundle\Transformer\Output;
 
 use FormBuilderBundle\Model\FieldDefinitionInterface;
-use Pimcore\Translation\Translator;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 use FormBuilderBundle\Model\FormFieldDynamicDefinitionInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -12,14 +11,12 @@
 use Symfony\Component\Form\Extension\Core\Type\TimeType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Intl\Countries;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FallbackTransformer implements OutputTransformerInterface
 {
-    protected Translator $translator;
-
-    public function __construct(Translator $translator)
+    public function __construct(protected TranslatorInterface $translator)
     {
-        $this->translator = $translator;
     }
 
     public function getValue(FieldDefinitionInterface $fieldDefinition, FormInterface $formField, $rawValue, ?string $locale): mixed
diff --git a/src/FormBuilderBundle/Transformer/Output/OutputTransformerInterface.php b/src/Transformer/Output/OutputTransformerInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/OutputTransformerInterface.php
rename to src/Transformer/Output/OutputTransformerInterface.php
diff --git a/src/FormBuilderBundle/Transformer/Output/Traits/ChoiceTargetTransformerTrait.php b/src/Transformer/Output/Traits/ChoiceTargetTransformerTrait.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Output/Traits/ChoiceTargetTransformerTrait.php
rename to src/Transformer/Output/Traits/ChoiceTargetTransformerTrait.php
diff --git a/src/FormBuilderBundle/Transformer/Target/TargetAwareData.php b/src/Transformer/Target/TargetAwareData.php
similarity index 54%
rename from src/FormBuilderBundle/Transformer/Target/TargetAwareData.php
rename to src/Transformer/Target/TargetAwareData.php
index 2b128793..990bf098 100644
--- a/src/FormBuilderBundle/Transformer/Target/TargetAwareData.php
+++ b/src/Transformer/Target/TargetAwareData.php
@@ -7,19 +7,13 @@
 
 class TargetAwareData
 {
-    protected FieldDefinitionInterface $fieldDefinition;
-    protected FormInterface $formField;
-    protected mixed $target;
-    protected mixed $rawValue;
-    protected ?string $locale;
-
-    public function __construct(mixed $target, FieldDefinitionInterface $fieldDefinition, FormInterface $formField, mixed $rawValue, ?string $locale)
-    {
-        $this->target = $target;
-        $this->fieldDefinition = $fieldDefinition;
-        $this->formField = $formField;
-        $this->rawValue = $rawValue;
-        $this->locale = $locale;
+    public function __construct(
+        protected mixed $target,
+        protected FieldDefinitionInterface $fieldDefinition,
+        protected FormInterface $formField,
+        protected mixed $rawValue,
+        protected ?string $locale
+    ) {
     }
 
     public function getTarget(): mixed
diff --git a/src/FormBuilderBundle/Transformer/Target/TargetAwareOutputTransformer.php b/src/Transformer/Target/TargetAwareOutputTransformer.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Target/TargetAwareOutputTransformer.php
rename to src/Transformer/Target/TargetAwareOutputTransformer.php
diff --git a/src/FormBuilderBundle/Transformer/Target/TargetAwareValue.php b/src/Transformer/Target/TargetAwareValue.php
similarity index 100%
rename from src/FormBuilderBundle/Transformer/Target/TargetAwareValue.php
rename to src/Transformer/Target/TargetAwareValue.php
diff --git a/src/FormBuilderBundle/Twig/Extension/FlashMessageExtension.php b/src/Twig/Extension/FlashMessageExtension.php
similarity index 88%
rename from src/FormBuilderBundle/Twig/Extension/FlashMessageExtension.php
rename to src/Twig/Extension/FlashMessageExtension.php
index 629febf1..6f7f6834 100644
--- a/src/FormBuilderBundle/Twig/Extension/FlashMessageExtension.php
+++ b/src/Twig/Extension/FlashMessageExtension.php
@@ -8,11 +8,8 @@
 
 class FlashMessageExtension extends AbstractExtension
 {
-    protected FlashBagManagerInterface $flashBagManager;
-
-    public function __construct(FlashBagManagerInterface $flashBagManager)
+    public function __construct(protected FlashBagManagerInterface $flashBagManager)
     {
-        $this->flashBagManager = $flashBagManager;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Twig/Extension/StaticFormExtension.php b/src/Twig/Extension/StaticFormExtension.php
similarity index 91%
rename from src/FormBuilderBundle/Twig/Extension/StaticFormExtension.php
rename to src/Twig/Extension/StaticFormExtension.php
index 2a4ff25a..257b74c2 100644
--- a/src/FormBuilderBundle/Twig/Extension/StaticFormExtension.php
+++ b/src/Twig/Extension/StaticFormExtension.php
@@ -10,11 +10,8 @@
 
 class StaticFormExtension extends AbstractExtension
 {
-    protected FormAssembler $formAssembler;
-
-    public function __construct(FormAssembler $formAssembler)
+    public function __construct(protected FormAssembler $formAssembler)
     {
-        $this->formAssembler = $formAssembler;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Dispatcher.php b/src/Validation/ConditionalLogic/Dispatcher/Dispatcher.php
similarity index 89%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Dispatcher.php
rename to src/Validation/ConditionalLogic/Dispatcher/Dispatcher.php
index af54274a..5f96e75c 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Dispatcher.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Dispatcher.php
@@ -10,14 +10,12 @@
 
 class Dispatcher
 {
-    protected ConditionalLogicProcessor $conditionalLogicProcessor;
-    protected DispatcherRegistry $dispatcherRegistry;
     protected array $optionsResolver = [];
 
-    public function __construct(DispatcherRegistry $dispatcherRegistry, ConditionalLogicProcessor $conditionalLogicProcessor)
-    {
-        $this->dispatcherRegistry = $dispatcherRegistry;
-        $this->conditionalLogicProcessor = $conditionalLogicProcessor;
+    public function __construct(
+        protected DispatcherRegistry $dispatcherRegistry,
+        protected ConditionalLogicProcessor $conditionalLogicProcessor
+    ) {
     }
 
     /**
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
similarity index 94%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
index 1016a2ba..5e744a26 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
@@ -8,24 +8,20 @@
 use FormBuilderBundle\Validation\ConditionalLogic\Factory\DataFactory;
 use FormBuilderBundle\Validation\ConditionalLogic\ReturnStack\FieldReturnStack;
 use FormBuilderBundle\Validation\ConditionalLogic\ReturnStack\ReturnStackInterface;
-use Pimcore\Translation\Translator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class Constraints implements ModuleInterface
 {
-    protected Translator $translator;
-    protected DataFactory $dataFactory;
     protected FormFieldDefinitionInterface $field;
     protected array $formData;
     protected array $availableConstraints;
     protected array $appliedConditions;
 
     public function __construct(
-        Translator $translator,
-        DataFactory $dataFactory
+        protected TranslatorInterface $translator,
+        protected DataFactory $dataFactory
     ) {
-        $this->translator = $translator;
-        $this->dataFactory = $dataFactory;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
@@ -98,7 +94,7 @@ private function checkConditionalLogicConstraints(array $defaultFieldConstraints
                     $defaultFieldConstraints = [];
                 } else {
                     foreach ($returnStack->getData() as $constraint) {
-                        $defaultFieldConstraints = array_filter($defaultFieldConstraints, function ($val) use ($constraint) {
+                        $defaultFieldConstraints = array_filter($defaultFieldConstraints, static function ($val) use ($constraint) {
                             return $val['type'] !== $constraint;
                         });
                     }
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/ConstraintsData.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/ConstraintsData.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/ConstraintsData.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Data/ConstraintsData.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/DataInterface.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/DataInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/DataInterface.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Data/DataInterface.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/FormTypeClassesData.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/FormTypeClassesData.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/FormTypeClassesData.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Data/FormTypeClassesData.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
similarity index 92%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
index 8a99a379..1ab9ec14 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/SuccessMessageData.php
@@ -5,7 +5,7 @@
 use FormBuilderBundle\Tool\LocaleDataMapper;
 use Pimcore\Model\Document;
 use Pimcore\Model\Document\Snippet;
-use Pimcore\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SuccessMessageData implements DataInterface
 {
@@ -14,16 +14,12 @@ class SuccessMessageData implements DataInterface
     public const IDENTIFIER_REDIRECT = 'redirect';
     public const IDENTIFIER_REDIRECT_EXTERNAL = 'redirect_external';
 
-    protected LocaleDataMapper $localeDataMapper;
-    protected Translator $translator;
     protected array $data = [];
 
     public function __construct(
-        LocaleDataMapper $localeDataMapper,
-        Translator $translator
+        protected LocaleDataMapper $localeDataMapper,
+        protected TranslatorInterface $translator
     ) {
-        $this->localeDataMapper = $localeDataMapper;
-        $this->translator = $translator;
     }
 
     public function setData(array $data): void
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SwitchOutputWorkflowData.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Data/SwitchOutputWorkflowData.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/Data/SwitchOutputWorkflowData.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/Data/SwitchOutputWorkflowData.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php b/src/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php
similarity index 95%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php
index c8acc274..dff58a8c 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Module/FormTypeClasses.php
@@ -12,14 +12,12 @@
 
 class FormTypeClasses implements ModuleInterface
 {
-    protected DataFactory $dataFactory;
     protected array $formData;
     protected FieldDefinitionInterface $field;
     protected array $appliedConditions;
 
-    public function __construct(DataFactory $dataFactory)
+    public function __construct(protected DataFactory $dataFactory)
     {
-        $this->dataFactory = $dataFactory;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/ModuleInterface.php b/src/Validation/ConditionalLogic/Dispatcher/Module/ModuleInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/ModuleInterface.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/ModuleInterface.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php b/src/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php
similarity index 94%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php
index 47f32a03..e60e0098 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Module/SuccessMessage.php
@@ -11,14 +11,12 @@
 
 class SuccessMessage implements ModuleInterface
 {
-    protected DataFactory $dataFactory;
     protected array $formData;
     protected array $appliedConditions;
     protected array $availableConstraints;
 
-    public function __construct(DataFactory $dataFactory)
+    public function __construct(protected DataFactory $dataFactory)
     {
-        $this->dataFactory = $dataFactory;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php b/src/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php
similarity index 94%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php
rename to src/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php
index 2741195e..84f91653 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php
+++ b/src/Validation/ConditionalLogic/Dispatcher/Module/SwitchOutputWorkflow.php
@@ -11,14 +11,12 @@
 
 class SwitchOutputWorkflow implements ModuleInterface
 {
-    protected DataFactory $dataFactory;
     protected array $formData;
     protected array $appliedConditions;
     protected array $availableConstraints;
 
-    public function __construct(DataFactory $dataFactory)
+    public function __construct(protected DataFactory $dataFactory)
     {
-        $this->dataFactory = $dataFactory;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Factory/DataFactory.php b/src/Validation/ConditionalLogic/Factory/DataFactory.php
similarity index 77%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Factory/DataFactory.php
rename to src/Validation/ConditionalLogic/Factory/DataFactory.php
index fa9a02ad..7e5f2cb5 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Factory/DataFactory.php
+++ b/src/Validation/ConditionalLogic/Factory/DataFactory.php
@@ -6,11 +6,8 @@
 
 class DataFactory
 {
-    protected iterable $dataHandler;
-
-    public function __construct(iterable $dataHandler)
+    public function __construct(protected iterable $dataHandler)
     {
-        $this->dataHandler = $dataHandler;
     }
 
     public function generate(string $serviceId): ?DataInterface
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php b/src/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
similarity index 94%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
rename to src/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
index c2a40679..d4fbab8a 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
+++ b/src/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
@@ -9,11 +9,8 @@
 
 class ConditionalLogicProcessor
 {
-    protected ConditionalLogicRegistry $conditionalLogicRegistry;
-
-    public function __construct(ConditionalLogicRegistry $conditionalLogicRegistry)
+    public function __construct(protected ConditionalLogicRegistry $conditionalLogicRegistry)
     {
-        $this->conditionalLogicRegistry = $conditionalLogicRegistry;
     }
 
     /**
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php b/src/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
similarity index 80%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
rename to src/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
index 9e1a47fb..02428687 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
+++ b/src/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
@@ -4,21 +4,16 @@
 
 class FieldReturnStack implements ReturnStackInterface
 {
-    public string $actionType;
-    public mixed $data;
-
     /**
      * @throws \Exception
      */
-    public function __construct(string $actionType = null, array $data = [])
-    {
-        $this->actionType = $actionType;
-        $this->data = $data;
-
+    public function __construct(
+        protected string $actionType,
+        protected mixed $data
+    ) {
         if (!$this->isAssoc($this->data)) {
             throw new \Exception('FieldReturnStack: Wrong data structure: data keys must contain form field names!');
         }
-
     }
 
     public function getActionType(): string
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/ReturnStackInterface.php b/src/Validation/ConditionalLogic/ReturnStack/ReturnStackInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/ReturnStackInterface.php
rename to src/Validation/ConditionalLogic/ReturnStack/ReturnStackInterface.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php b/src/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
similarity index 60%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
rename to src/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
index 7d191b45..ee3dc649 100644
--- a/src/FormBuilderBundle/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
+++ b/src/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
@@ -4,13 +4,10 @@
 
 class SimpleReturnStack implements ReturnStackInterface
 {
-    public string $actionType;
-    public mixed $data;
-
-    public function __construct(string $actionType, array $data = [])
-    {
-        $this->actionType = $actionType;
-        $this->data = $data;
+    public function __construct(
+        protected string $actionType,
+        protected mixed $data
+    ) {
     }
 
     public function getActionType(): string
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ActionInterface.php b/src/Validation/ConditionalLogic/Rule/Action/ActionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ActionInterface.php
rename to src/Validation/ConditionalLogic/Rule/Action/ActionInterface.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ConstraintsAddAction.php b/src/Validation/ConditionalLogic/Rule/Action/ConstraintsAddAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ConstraintsAddAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/ConstraintsAddAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ConstraintsRemoveAction.php b/src/Validation/ConditionalLogic/Rule/Action/ConstraintsRemoveAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ConstraintsRemoveAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/ConstraintsRemoveAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/SuccessMessageAction.php b/src/Validation/ConditionalLogic/Rule/Action/SuccessMessageAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/SuccessMessageAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/SuccessMessageAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/SwitchOutputWorkflowAction.php b/src/Validation/ConditionalLogic/Rule/Action/SwitchOutputWorkflowAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/SwitchOutputWorkflowAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/SwitchOutputWorkflowAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ToggleClassAction.php b/src/Validation/ConditionalLogic/Rule/Action/ToggleClassAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ToggleClassAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/ToggleClassAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ToggleElementAction.php b/src/Validation/ConditionalLogic/Rule/Action/ToggleElementAction.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Action/ToggleElementAction.php
rename to src/Validation/ConditionalLogic/Rule/Action/ToggleElementAction.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/ConditionInterface.php b/src/Validation/ConditionalLogic/Rule/Condition/ConditionInterface.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/ConditionInterface.php
rename to src/Validation/ConditionalLogic/Rule/Condition/ConditionInterface.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/ElementValueCondition.php b/src/Validation/ConditionalLogic/Rule/Condition/ElementValueCondition.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/ElementValueCondition.php
rename to src/Validation/ConditionalLogic/Rule/Condition/ElementValueCondition.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/OutputWorkflowCondition.php b/src/Validation/ConditionalLogic/Rule/Condition/OutputWorkflowCondition.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Condition/OutputWorkflowCondition.php
rename to src/Validation/ConditionalLogic/Rule/Condition/OutputWorkflowCondition.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Traits/ActionTrait.php b/src/Validation/ConditionalLogic/Rule/Traits/ActionTrait.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Traits/ActionTrait.php
rename to src/Validation/ConditionalLogic/Rule/Traits/ActionTrait.php
diff --git a/src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Traits/ConditionTrait.php b/src/Validation/ConditionalLogic/Rule/Traits/ConditionTrait.php
similarity index 100%
rename from src/FormBuilderBundle/Validation/ConditionalLogic/Rule/Traits/ConditionTrait.php
rename to src/Validation/ConditionalLogic/Rule/Traits/ConditionTrait.php
diff --git a/src/FormBuilderBundle/Validator/Constraints/DynamicMultiFileNotBlank.php b/src/Validator/Constraints/DynamicMultiFileNotBlank.php
similarity index 100%
rename from src/FormBuilderBundle/Validator/Constraints/DynamicMultiFileNotBlank.php
rename to src/Validator/Constraints/DynamicMultiFileNotBlank.php
diff --git a/src/FormBuilderBundle/Validator/Constraints/DynamicMultiFileNotBlankValidator.php b/src/Validator/Constraints/DynamicMultiFileNotBlankValidator.php
similarity index 100%
rename from src/FormBuilderBundle/Validator/Constraints/DynamicMultiFileNotBlankValidator.php
rename to src/Validator/Constraints/DynamicMultiFileNotBlankValidator.php
diff --git a/src/FormBuilderBundle/Validator/Constraints/Recaptcha3.php b/src/Validator/Constraints/Recaptcha3.php
similarity index 100%
rename from src/FormBuilderBundle/Validator/Constraints/Recaptcha3.php
rename to src/Validator/Constraints/Recaptcha3.php
diff --git a/src/FormBuilderBundle/Validator/Constraints/Recaptcha3Validator.php b/src/Validator/Constraints/Recaptcha3Validator.php
similarity index 80%
rename from src/FormBuilderBundle/Validator/Constraints/Recaptcha3Validator.php
rename to src/Validator/Constraints/Recaptcha3Validator.php
index 60142cab..9b6b6f32 100644
--- a/src/FormBuilderBundle/Validator/Constraints/Recaptcha3Validator.php
+++ b/src/Validator/Constraints/Recaptcha3Validator.php
@@ -9,11 +9,8 @@
 
 final class Recaptcha3Validator extends ConstraintValidator
 {
-    protected ReCaptchaProcessorInterface $reCaptchaProcessor;
-
-    public function __construct(ReCaptchaProcessorInterface $reCaptchaProcessor)
+    public function __construct(protected ReCaptchaProcessorInterface $reCaptchaProcessor)
     {
-        $this->reCaptchaProcessor = $reCaptchaProcessor;
     }
 
     public function validate(mixed $value, Constraint $constraint): void
@@ -41,8 +38,6 @@ private function validateCaptcha(string $value): bool
             return false;
         }
 
-        $response = $this->reCaptchaProcessor->verify($value);
-
-        return $response->isSuccess();
+        return $this->reCaptchaProcessor->verify($value)->isSuccess();
     }
 }
diff --git a/src/FormBuilderBundle/Resources/views/common/redirect-flash-message.html.twig b/templates/common/redirect_flash_message.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/common/redirect-flash-message.html.twig
rename to templates/common/redirect_flash_message.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/email/email.html.twig b/templates/email/email.html.twig
similarity index 92%
rename from src/FormBuilderBundle/Resources/views/email/email.html.twig
rename to templates/email/email.html.twig
index 26a943ef..13db071e 100644
--- a/src/FormBuilderBundle/Resources/views/email/email.html.twig
+++ b/templates/email/email.html.twig
@@ -30,9 +30,9 @@
 
         <table class="row">
             <tr>
-                <th class="large-12 small-12 columns first last">
+                <td class="large-12 small-12 columns first last">
                     {{ pimcore_wysiwyg('text', {width: '500'}) }}
-                </th>
+                </td>
             </tr>
         </table>
 
@@ -40,13 +40,13 @@
         {% if document.getProperty('mail_disable_default_mail_body') != true %}
             <table class="row">
                 <tr>
-                    <th class="large-12 small-12 columns first last">
+                    <td class="large-12 small-12 columns first last">
                         {% if editmode != true %}
                             {% if body is defined %}{{ body|raw }}{% endif %}
                         {% else %}
                             <p class="formbuilder-placeholder-body">{{ 'form_builder.email.form_will_placed_here'|trans({},'admin') }}</p>
                         {% endif %}
-                    </th>
+                    </td>
                 </tr>
             </table>
         {% endif %}
diff --git a/src/FormBuilderBundle/Resources/views/email/form-data.html.twig b/templates/email/form_data.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/email/form-data.html.twig
rename to templates/email/form_data.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/data/data_bootstrap_4.html.twig b/templates/form/data/data_bootstrap_4.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/data/data_bootstrap_4.html.twig
rename to templates/form/data/data_bootstrap_4.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/default.html.twig b/templates/form/default.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/default.html.twig
rename to templates/form/default.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/elements/dynamic-multi-file/form.html.twig b/templates/form/elements/dynamic_multi_file/form.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/elements/dynamic-multi-file/form.html.twig
rename to templates/form/elements/dynamic_multi_file/form.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/elements/dynamic-multi-file/form-drop-zone.html.twig b/templates/form/elements/dynamic_multi_file/form_drop_zone.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/elements/dynamic-multi-file/form-drop-zone.html.twig
rename to templates/form/elements/dynamic_multi_file/form_drop_zone.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/form.html.twig b/templates/form/form.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/form.html.twig
rename to templates/form/form.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/presets/demo.html.twig b/templates/form/presets/demo.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/presets/demo.html.twig
rename to templates/form/presets/demo.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/bootstrap_3_horizontal_layout.html.twig b/templates/form/theme/bootstrap_3_horizontal_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/bootstrap_3_horizontal_layout.html.twig
rename to templates/form/theme/bootstrap_3_horizontal_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/bootstrap_3_layout.html.twig b/templates/form/theme/bootstrap_3_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/bootstrap_3_layout.html.twig
rename to templates/form/theme/bootstrap_3_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/bootstrap_4_horizontal_layout.html.twig b/templates/form/theme/bootstrap_4_horizontal_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/bootstrap_4_horizontal_layout.html.twig
rename to templates/form/theme/bootstrap_4_horizontal_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/bootstrap_4_layout.html.twig b/templates/form/theme/bootstrap_4_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/bootstrap_4_layout.html.twig
rename to templates/form/theme/bootstrap_4_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/form_div_layout.html.twig b/templates/form/theme/form_div_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/form_div_layout.html.twig
rename to templates/form/theme/form_div_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_3_horizontal_layout.html.twig b/templates/form/theme/macro/bootstrap_3_horizontal_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_3_horizontal_layout.html.twig
rename to templates/form/theme/macro/bootstrap_3_horizontal_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_3_layout.html.twig b/templates/form/theme/macro/bootstrap_3_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_3_layout.html.twig
rename to templates/form/theme/macro/bootstrap_3_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_4_horizontal_layout.html.twig b/templates/form/theme/macro/bootstrap_4_horizontal_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_4_horizontal_layout.html.twig
rename to templates/form/theme/macro/bootstrap_4_horizontal_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_4_layout.html.twig b/templates/form/theme/macro/bootstrap_4_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/macro/bootstrap_4_layout.html.twig
rename to templates/form/theme/macro/bootstrap_4_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/macro/form_div_layout.html.twig b/templates/form/theme/macro/form_div_layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/macro/form_div_layout.html.twig
rename to templates/form/theme/macro/form_div_layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/type/container.html.twig b/templates/form/theme/type/container.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/type/container.html.twig
rename to templates/form/theme/type/container.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/type/dynamic_multi_file.html.twig b/templates/form/theme/type/dynamic_multi_file.html.twig
similarity index 92%
rename from src/FormBuilderBundle/Resources/views/form/theme/type/dynamic_multi_file.html.twig
rename to templates/form/theme/type/dynamic_multi_file.html.twig
index 73892136..50b2b3b9 100644
--- a/src/FormBuilderBundle/Resources/views/form/theme/type/dynamic_multi_file.html.twig
+++ b/templates/form/theme/type/dynamic_multi_file.html.twig
@@ -10,7 +10,7 @@
             <div class="qq-upload-container"></div>
             <div class="qq-uploader-wrapper" style="display:none;">
                 <div class="qq-uploader-selector qq-uploader" qq-drop-area-text="{{ 'form_builder.dynamic_multi_file.drop_files_here'|trans }}">
-                    {% include '@FormBuilder/form/elements/dynamic-multi-file/form.html.twig' %}
+                    {% include '@FormBuilder/form/elements/dynamic_multi_file/form.html.twig' %}
                 </div>
             </div>
             {% for child in form -%}
@@ -30,7 +30,7 @@
         <div {{ block('attributes') }}>
             <div class="dropzone-container"></div>
             <div class="dropzone-template" style="display: none;">
-                {% include '@FormBuilder/form/elements/dynamic-multi-file/form-drop-zone.html.twig' %}
+                {% include '@FormBuilder/form/elements/dynamic_multi_file/form_drop_zone.html.twig' %}
             </div>
             {% for child in form -%}
                 {% if not child.rendered %}
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/type/html_tag.html.twig b/templates/form/theme/type/html_tag.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/type/html_tag.html.twig
rename to templates/form/theme/type/html_tag.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/form/theme/type/snippet.html.twig b/templates/form/theme/type/snippet.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/form/theme/type/snippet.html.twig
rename to templates/form/theme/type/snippet.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/funnel/base.html.twig b/templates/funnel/base.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/funnel/base.html.twig
rename to templates/funnel/base.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/funnel/error.html.twig b/templates/funnel/error.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/funnel/error.html.twig
rename to templates/funnel/error.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/funnel/layer/simple_layout_layer.html.twig b/templates/funnel/layer/simple_layout_layer.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/funnel/layer/simple_layout_layer.html.twig
rename to templates/funnel/layer/simple_layout_layer.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/layout.html.twig b/templates/layout.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/layout.html.twig
rename to templates/layout.html.twig
diff --git a/src/FormBuilderBundle/Resources/views/layout_funnel.html.twig b/templates/layout_funnel.html.twig
similarity index 100%
rename from src/FormBuilderBundle/Resources/views/layout_funnel.html.twig
rename to templates/layout_funnel.html.twig
diff --git a/tests/Acceptance.suite.dist.yml b/tests/Acceptance.suite.dist.yml
new file mode 100644
index 00000000..91d4d2c0
--- /dev/null
+++ b/tests/Acceptance.suite.dist.yml
@@ -0,0 +1,21 @@
+actor: AcceptanceTester
+error_level: '%PIMCORE_PHP_ERROR_REPORTING%'
+bootstrap: _bootstrap.php
+modules:
+    config:
+        \Dachcom\Codeception\Support\Helper\Browser\WebDriver:
+            host: '%WEBDRIVER_HOST%'
+            url: '%WEBDRIVER_URL%'
+            browser: chrome
+            port: 4444
+            restart: true
+    enabled:
+        - \Dachcom\Codeception\Support\Helper\PimcoreCore:
+            part: SERVICES
+            connect_db: true
+            rebootable_client: true
+        - \Dachcom\Codeception\Support\Helper\PimcoreBundleCore:
+            run_installer: true
+        - \Dachcom\Codeception\Support\Helper\Browser\WebDriver
+        - \Dachcom\Codeception\Support\Helper\PimcoreUser
+        - \DachcomBundle\Test\Support\Helper\PimcoreBackend
\ No newline at end of file
diff --git a/tests/acceptance/ConditionalLogic/Action/AbstractActionCest.php b/tests/Acceptance/ConditionalLogic/Action/AbstractActionCest.php
similarity index 96%
rename from tests/acceptance/ConditionalLogic/Action/AbstractActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/AbstractActionCest.php
index c0c21fce..5cc1b361 100644
--- a/tests/acceptance/ConditionalLogic/Action/AbstractActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/AbstractActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 use Pimcore\Model\Document\Email;
 
 abstract class AbstractActionCest
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php
index abf73b6a..fb4b356a 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementAddValidationActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 /**
  * We only test not_blank validators since we're only testing javascript behaviour here.
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php
similarity index 95%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php
index e9ba92a1..32259d32 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementChangeValueActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 use Facebook\WebDriver\WebDriverElement;
 
 /**
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php
similarity index 98%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php
index 16d07cc2..74665768 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementFireJsEventActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 use Facebook\WebDriver\WebDriverElement;
 
 /**
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php
similarity index 98%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php
index 7883e967..30a5825d 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementRemoveValidationActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 /**
  * We only test not_blank validators since we're only testing javascript behaviour here.
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php
similarity index 98%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php
index c672ba1f..e4839850 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleAvailabilityActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 use Facebook\WebDriver\WebDriverElement;
 
 /**
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php
index 5adbb6e4..dc733e1f 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleClassActionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 /**
  * Action "toggleClass". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php
index 0dec3cbb..4cf9ddab 100644
--- a/tests/acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Element/ElementToggleVisibilityActionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Element;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Element;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 /**
  * Action "toggleElement". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php b/tests/Acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php
rename to tests/Acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php
index 9c5d450f..df71e8ad 100644
--- a/tests/acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Action/Form/FormChangeSuccessMessageActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Action\Form;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Action\Form;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractActionCest;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractActionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 /**
  * Action "changeSuccessMessage"
diff --git a/tests/acceptance/ConditionalLogic/Condition/AbstractConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/AbstractConditionCest.php
similarity index 95%
rename from tests/acceptance/ConditionalLogic/Condition/AbstractConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/AbstractConditionCest.php
index 7ebe901d..a48d72c7 100644
--- a/tests/acceptance/ConditionalLogic/Condition/AbstractConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/AbstractConditionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 abstract class AbstractConditionCest
 {
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php
similarity index 98%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php
index 41c35e81..3bfb008d 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueContainsConditionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  *  * Condition "contains". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php
index fb5a4d10..c29cf57d 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsCheckedConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 /**
  * Condition "is_checked". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php
index 0078edfb..eb50dcca 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsEmptyValueConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_empty_value". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php
index 2ab2875e..4b889ef7 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsGreaterConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_greater". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php
index dc1f6628..bdf1dc43 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsLessConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_less". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php
index 0c25b20b..6663f8f3 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotCheckedConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_not_checked". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php
index 76c1d1a7..fae61b78 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsNotValueConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_not_value". Must work on:
diff --git a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php
similarity index 97%
rename from tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php
rename to tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php
index 92cced87..92f8addf 100644
--- a/tests/acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php
+++ b/tests/Acceptance/ConditionalLogic/Condition/ElementValue/ElementValueIsValueConditionCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ConditionalLogic\Condition\ElementValue;
+namespace DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\ElementValue;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\acceptance\ConditionalLogic\Condition\AbstractConditionCest;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Acceptance\ConditionalLogic\Condition\AbstractConditionCest;
 
 /**
  * Condition "is_value". Must work on:
diff --git a/tests/acceptance/Constraints/DropZoneConstraintsCest.php b/tests/Acceptance/Constraints/DropZoneConstraintsCest.php
similarity index 93%
rename from tests/acceptance/Constraints/DropZoneConstraintsCest.php
rename to tests/Acceptance/Constraints/DropZoneConstraintsCest.php
index 1c6acde7..59992e2e 100644
--- a/tests/acceptance/Constraints/DropZoneConstraintsCest.php
+++ b/tests/Acceptance/Constraints/DropZoneConstraintsCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Constraints;
+namespace DachcomBundle\Test\Acceptance\Constraints;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class DropZoneConstraintsCest
 {
diff --git a/tests/acceptance/Constraints/FineUploaderConstraintsCest.php b/tests/Acceptance/Constraints/FineUploaderConstraintsCest.php
similarity index 92%
rename from tests/acceptance/Constraints/FineUploaderConstraintsCest.php
rename to tests/Acceptance/Constraints/FineUploaderConstraintsCest.php
index 9de8c153..4d7b774f 100644
--- a/tests/acceptance/Constraints/FineUploaderConstraintsCest.php
+++ b/tests/Acceptance/Constraints/FineUploaderConstraintsCest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Constraints;
+namespace DachcomBundle\Test\Acceptance\Constraints;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class FineUploaderConstraintsCest
 {
     public function testEmptyFileUploadFormWithNotBlankConstraint(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = (new TestFormBuilder('dachcom_test'))
             ->setUseAjax(true)
@@ -34,7 +34,7 @@ public function testEmptyFileUploadFormWithNotBlankConstraint(AcceptanceTester $
 
     public function testPopulatedFileUploadFormWithNotBlankConstraint(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = (new TestFormBuilder('dachcom_test'))
             ->setUseAjax(true)
diff --git a/tests/acceptance/Container/ContainerRepeaterCest.php b/tests/Acceptance/Container/ContainerRepeaterCest.php
similarity index 98%
rename from tests/acceptance/Container/ContainerRepeaterCest.php
rename to tests/Acceptance/Container/ContainerRepeaterCest.php
index ad428cf6..7c21e427 100644
--- a/tests/acceptance/Container/ContainerRepeaterCest.php
+++ b/tests/Acceptance/Container/ContainerRepeaterCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Container;
+namespace DachcomBundle\Test\Acceptance\Container;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class ContainerRepeaterCest
 {
diff --git a/tests/acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php b/tests/Acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php
similarity index 97%
rename from tests/acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php
rename to tests/Acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php
index fbb149e8..f2a50362 100644
--- a/tests/acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php
+++ b/tests/Acceptance/EmailProperties/MailSuccessFullySentPropertyCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\EmailProperties;
+namespace DachcomBundle\Test\Acceptance\EmailProperties;
 
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 use Pimcore\Model\Document\Snippet;
 
 class MailSuccessFullySentPropertyCest
diff --git a/tests/acceptance/ExtJs/AbstractExtJs.php b/tests/Acceptance/ExtJs/AbstractExtJs.php
similarity index 99%
rename from tests/acceptance/ExtJs/AbstractExtJs.php
rename to tests/Acceptance/ExtJs/AbstractExtJs.php
index cf00a299..a24c4bec 100644
--- a/tests/acceptance/ExtJs/AbstractExtJs.php
+++ b/tests/Acceptance/ExtJs/AbstractExtJs.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 abstract class AbstractExtJs
 {
diff --git a/tests/acceptance/ExtJs/ConditionalLogicCest.php b/tests/Acceptance/ExtJs/ConditionalLogicCest.php
similarity index 90%
rename from tests/acceptance/ExtJs/ConditionalLogicCest.php
rename to tests/Acceptance/ExtJs/ConditionalLogicCest.php
index b56813f6..ae714149 100644
--- a/tests/acceptance/ExtJs/ConditionalLogicCest.php
+++ b/tests/Acceptance/ExtJs/ConditionalLogicCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class ConditionalLogicCest extends AbstractExtJs
 {
diff --git a/tests/acceptance/ExtJs/ContextMenuCest.php b/tests/Acceptance/ExtJs/ContextMenuCest.php
similarity index 98%
rename from tests/acceptance/ExtJs/ContextMenuCest.php
rename to tests/Acceptance/ExtJs/ContextMenuCest.php
index 4143097b..1a28e826 100644
--- a/tests/acceptance/ExtJs/ContextMenuCest.php
+++ b/tests/Acceptance/ExtJs/ContextMenuCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class ContextMenuCest extends AbstractExtJs
 {
diff --git a/tests/acceptance/ExtJs/FieldAttributesCest.php b/tests/Acceptance/ExtJs/FieldAttributesCest.php
similarity index 97%
rename from tests/acceptance/ExtJs/FieldAttributesCest.php
rename to tests/Acceptance/ExtJs/FieldAttributesCest.php
index 0e56f1fa..277e3ab2 100644
--- a/tests/acceptance/ExtJs/FieldAttributesCest.php
+++ b/tests/Acceptance/ExtJs/FieldAttributesCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class FieldAttributesCest extends AbstractExtJs
 {
diff --git a/tests/acceptance/ExtJs/FieldValidationCest.php b/tests/Acceptance/ExtJs/FieldValidationCest.php
similarity index 94%
rename from tests/acceptance/ExtJs/FieldValidationCest.php
rename to tests/Acceptance/ExtJs/FieldValidationCest.php
index 55a6857e..0d23b432 100644
--- a/tests/acceptance/ExtJs/FieldValidationCest.php
+++ b/tests/Acceptance/ExtJs/FieldValidationCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class FieldValidationCest extends AbstractExtJs
 {
diff --git a/tests/acceptance/ExtJs/ImportExportCest.php b/tests/Acceptance/ExtJs/ImportExportCest.php
similarity index 94%
rename from tests/acceptance/ExtJs/ImportExportCest.php
rename to tests/Acceptance/ExtJs/ImportExportCest.php
index a2072ed4..34a4c132 100644
--- a/tests/acceptance/ExtJs/ImportExportCest.php
+++ b/tests/Acceptance/ExtJs/ImportExportCest.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class ImportExportCest extends AbstractExtJs
 {
@@ -20,7 +20,7 @@ public function testFormExportImport(AcceptanceTester $I): void
         $I->click('Save', $this->getFormPanelSelector($formId));
         $I->waitForText('Form successfully saved', 10);
 
-        $formExportName = 'form_export_1.yml';
+        $formExportName = 'form_export_1.yaml';
 
         $I->click('Export', $this->getFormPanelSelector($formId));
         $I->wait(3);
diff --git a/tests/acceptance/ExtJs/SaveFormCest.php b/tests/Acceptance/ExtJs/SaveFormCest.php
similarity index 90%
rename from tests/acceptance/ExtJs/SaveFormCest.php
rename to tests/Acceptance/ExtJs/SaveFormCest.php
index 5ff27978..111e3d22 100644
--- a/tests/acceptance/ExtJs/SaveFormCest.php
+++ b/tests/Acceptance/ExtJs/SaveFormCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\ExtJs;
+namespace DachcomBundle\Test\Acceptance\ExtJs;
 
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class SaveFormCest extends AbstractExtJs
 {
diff --git a/tests/acceptance/Form/DropZoneJsCest.php b/tests/Acceptance/Form/DropZoneJsCest.php
similarity index 98%
rename from tests/acceptance/Form/DropZoneJsCest.php
rename to tests/Acceptance/Form/DropZoneJsCest.php
index d11fa84b..31a0939e 100644
--- a/tests/acceptance/Form/DropZoneJsCest.php
+++ b/tests/Acceptance/Form/DropZoneJsCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Form;
+namespace DachcomBundle\Test\Acceptance\Form;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class DropZoneJsCest
 {
diff --git a/tests/acceptance/Form/FineUploaderCest.php b/tests/Acceptance/Form/FineUploaderCest.php
similarity index 98%
rename from tests/acceptance/Form/FineUploaderCest.php
rename to tests/Acceptance/Form/FineUploaderCest.php
index 979762cb..c4d2fee9 100644
--- a/tests/acceptance/Form/FineUploaderCest.php
+++ b/tests/Acceptance/Form/FineUploaderCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Form;
+namespace DachcomBundle\Test\Acceptance\Form;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class FineUploaderCest
 {
@@ -11,7 +11,7 @@ class FineUploaderCest
 
     public function testUploadFormWithOneFile(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -46,7 +46,7 @@ public function testUploadFormWithOneFile(AcceptanceTester $I): void
 
     public function testUploadFormWithOneLargeFile(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -81,7 +81,7 @@ public function testUploadFormWithOneLargeFile(AcceptanceTester $I): void
 
     public function testUploadFormWithMultipleFile(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -122,7 +122,7 @@ public function testUploadFormWithMultipleFile(AcceptanceTester $I): void
 
     public function testUploadFormWithLimitedAllowedExtensionsMustPass(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -166,7 +166,7 @@ public function testUploadFormWithLimitedAllowedExtensionsMustPass(AcceptanceTes
 
     public function testUploadFormWithLimitedAllowedExtensionsMustFail(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -207,7 +207,7 @@ public function testUploadFormWithLimitedAllowedExtensionsMustFail(AcceptanceTes
 
     public function testUploadFormWithLimitedItemsLimitMustPass(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -250,7 +250,7 @@ public function testUploadFormWithLimitedItemsLimitMustPass(AcceptanceTester $I)
 
     public function testUploadFormWithLimitedItemsLimitMustFail(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -295,7 +295,7 @@ public function testUploadFormWithLimitedItemsLimitMustFail(AcceptanceTester $I)
 
     public function testUploadFormWithLimitedFileSizeMustPass(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -338,7 +338,7 @@ public function testUploadFormWithLimitedFileSizeMustPass(AcceptanceTester $I):
 
     public function testUploadFormWithLimitedFileSizeMustFail(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
@@ -378,7 +378,7 @@ public function testUploadFormWithLimitedFileSizeMustFail(AcceptanceTester $I):
 
     public function testUploadFormWithFilesAsAttachment(AcceptanceTester $I): void
     {
-        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yml');
+        $I->haveABootedSymfonyConfiguration('config_fineuploaderjs.yaml');
 
         $testFormBuilder = $this->generateSimpleForm(true);
 
diff --git a/tests/acceptance/Form/SimpleFormWithDivLayoutCest.php b/tests/Acceptance/Form/SimpleFormWithDivLayoutCest.php
similarity index 85%
rename from tests/acceptance/Form/SimpleFormWithDivLayoutCest.php
rename to tests/Acceptance/Form/SimpleFormWithDivLayoutCest.php
index 10d71d67..42d15c4b 100644
--- a/tests/acceptance/Form/SimpleFormWithDivLayoutCest.php
+++ b/tests/Acceptance/Form/SimpleFormWithDivLayoutCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\acceptance\Form;
+namespace DachcomBundle\Test\Acceptance\Form;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\AcceptanceTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\AcceptanceTester;
 
 class SimpleFormWithDivLayoutCest
 {
diff --git a/tests/acceptance/_bootstrap.php b/tests/Acceptance/_bootstrap.php
similarity index 100%
rename from tests/acceptance/_bootstrap.php
rename to tests/Acceptance/_bootstrap.php
diff --git a/tests/Functional.suite.dist.yml b/tests/Functional.suite.dist.yml
new file mode 100644
index 00000000..ae85970b
--- /dev/null
+++ b/tests/Functional.suite.dist.yml
@@ -0,0 +1,18 @@
+actor: FunctionalTester
+error_level: '%PIMCORE_PHP_ERROR_REPORTING%'
+bootstrap: _bootstrap.php
+modules:
+    enabled:
+        - \Dachcom\Codeception\Support\Helper\PimcoreCore:
+              connect_db: true
+              rebootable_client: true
+        - \Dachcom\Codeception\Support\Helper\PimcoreBundleCore:
+            run_installer: true
+        - \Dachcom\Codeception\Support\Helper\Browser\PhpBrowser:
+            depends: \Dachcom\Codeception\Support\Helper\PimcoreCore
+        - \Dachcom\Codeception\Support\Helper\PimcoreAdminJson:
+            depends: \Dachcom\Codeception\Support\Helper\PimcoreCore
+        - \Dachcom\Codeception\Support\Helper\PimcoreAdminCsv:
+            depends: \Dachcom\Codeception\Support\Helper\PimcoreCore
+        - \Dachcom\Codeception\Support\Helper\PimcoreUser
+        - \DachcomBundle\Test\Support\Helper\PimcoreBackend
\ No newline at end of file
diff --git a/tests/functional/Attributes/FieldAttributesCest.php b/tests/Functional/Attributes/FieldAttributesCest.php
similarity index 96%
rename from tests/functional/Attributes/FieldAttributesCest.php
rename to tests/Functional/Attributes/FieldAttributesCest.php
index d650d093..ba3102f4 100644
--- a/tests/functional/Attributes/FieldAttributesCest.php
+++ b/tests/Functional/Attributes/FieldAttributesCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Attributes;
+namespace DachcomBundle\Test\Functional\Attributes;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class FieldAttributesCest
 {
diff --git a/tests/functional/Attributes/FormAttributesCest.php b/tests/Functional/Attributes/FormAttributesCest.php
similarity index 84%
rename from tests/functional/Attributes/FormAttributesCest.php
rename to tests/Functional/Attributes/FormAttributesCest.php
index 4cc20e10..eaec303f 100644
--- a/tests/functional/Attributes/FormAttributesCest.php
+++ b/tests/Functional/Attributes/FormAttributesCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Attributes;
+namespace DachcomBundle\Test\Functional\Attributes;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class FormAttributesCest
 {
diff --git a/tests/functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php b/tests/Functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php
similarity index 92%
rename from tests/functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php
rename to tests/Functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php
index 642c83f0..6b1171f3 100644
--- a/tests/functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php
+++ b/tests/Functional/ConditionalLogic/Action/Form/FormSwitchOutputWorkflowActionCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\ConditionalLogic\Action\Form;
+namespace DachcomBundle\Test\Functional\ConditionalLogic\Action\Form;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class FormSwitchOutputWorkflowActionCest
 {
diff --git a/tests/functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php b/tests/Functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php
similarity index 96%
rename from tests/functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php
rename to tests/Functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php
index 544fdc9b..cdd1bf51 100644
--- a/tests/functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php
+++ b/tests/Functional/ConfigurationFlags/UseCustomRadioCheckboxCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\ConfigurationFlags;
+namespace DachcomBundle\Test\Functional\ConfigurationFlags;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class UseCustomRadioCheckboxCest
 {
@@ -53,7 +53,7 @@ public function testUseCustomCheckboxEnabled(FunctionalTester $I)
      */
     public function testUseCustomCheckboxDisabled(FunctionalTester $I)
     {
-        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yml');
+        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yaml');
 
         $document = $I->haveAPageDocument('form-test');
         $adminEmail = $I->haveAEmailDocumentForAdmin();
@@ -133,7 +133,7 @@ public function testUseCustomRadioEnabled(FunctionalTester $I)
      */
     public function testUseCustomRadioDisabled(FunctionalTester $I)
     {
-        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yml');
+        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yaml');
 
         $document = $I->haveAPageDocument('form-test');
         $adminEmail = $I->haveAEmailDocumentForAdmin();
diff --git a/tests/functional/ConfigurationFlags/UseHoneyPotFieldCest.php b/tests/Functional/ConfigurationFlags/UseHoneyPotFieldCest.php
similarity index 89%
rename from tests/functional/ConfigurationFlags/UseHoneyPotFieldCest.php
rename to tests/Functional/ConfigurationFlags/UseHoneyPotFieldCest.php
index a93eb405..b3e1e489 100644
--- a/tests/functional/ConfigurationFlags/UseHoneyPotFieldCest.php
+++ b/tests/Functional/ConfigurationFlags/UseHoneyPotFieldCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\ConfigurationFlags;
+namespace DachcomBundle\Test\Functional\ConfigurationFlags;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class UseHoneyPotFieldCest
 {
@@ -39,7 +39,7 @@ public function testHoneyPotFieldEnabled(FunctionalTester $I)
      */
     public function testHoneyPotFieldDisabled(FunctionalTester $I)
     {
-        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yml');
+        $I->haveABootedSymfonyConfiguration('config_configuration_flags.yaml');
 
         $document = $I->haveAPageDocument('form-test');
 
diff --git a/tests/functional/Constraints/AbstractConstraintCest.php b/tests/Functional/Constraints/AbstractConstraintCest.php
similarity index 98%
rename from tests/functional/Constraints/AbstractConstraintCest.php
rename to tests/Functional/Constraints/AbstractConstraintCest.php
index d46e4c9b..77a95e3c 100644
--- a/tests/functional/Constraints/AbstractConstraintCest.php
+++ b/tests/Functional/Constraints/AbstractConstraintCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 abstract class AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/BicConstraintCest.php b/tests/Functional/Constraints/BicConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/BicConstraintCest.php
rename to tests/Functional/Constraints/BicConstraintCest.php
index 5d926d17..070de06c 100644
--- a/tests/functional/Constraints/BicConstraintCest.php
+++ b/tests/Functional/Constraints/BicConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class BicConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/CardSchemeConstraintCest.php b/tests/Functional/Constraints/CardSchemeConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/CardSchemeConstraintCest.php
rename to tests/Functional/Constraints/CardSchemeConstraintCest.php
index 70889d95..3e1935f8 100644
--- a/tests/functional/Constraints/CardSchemeConstraintCest.php
+++ b/tests/Functional/Constraints/CardSchemeConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class CardSchemeConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/DateConstraintCest.php b/tests/Functional/Constraints/DateConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/DateConstraintCest.php
rename to tests/Functional/Constraints/DateConstraintCest.php
index 6d97d4b2..6d7b45b8 100644
--- a/tests/functional/Constraints/DateConstraintCest.php
+++ b/tests/Functional/Constraints/DateConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DateConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/DateTimeConstraintCest.php b/tests/Functional/Constraints/DateTimeConstraintCest.php
similarity index 96%
rename from tests/functional/Constraints/DateTimeConstraintCest.php
rename to tests/Functional/Constraints/DateTimeConstraintCest.php
index e435979f..a1a3646b 100644
--- a/tests/functional/Constraints/DateTimeConstraintCest.php
+++ b/tests/Functional/Constraints/DateTimeConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DateTimeConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/EmailConstraintCest.php b/tests/Functional/Constraints/EmailConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/EmailConstraintCest.php
rename to tests/Functional/Constraints/EmailConstraintCest.php
index c3a7aae6..2e1da229 100644
--- a/tests/functional/Constraints/EmailConstraintCest.php
+++ b/tests/Functional/Constraints/EmailConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class EmailConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/IbanConstraintCest.php b/tests/Functional/Constraints/IbanConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/IbanConstraintCest.php
rename to tests/Functional/Constraints/IbanConstraintCest.php
index 49873617..6f0050db 100644
--- a/tests/functional/Constraints/IbanConstraintCest.php
+++ b/tests/Functional/Constraints/IbanConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class IbanConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/IpConstraintCest.php b/tests/Functional/Constraints/IpConstraintCest.php
similarity index 94%
rename from tests/functional/Constraints/IpConstraintCest.php
rename to tests/Functional/Constraints/IpConstraintCest.php
index 6a26c891..87e881cf 100644
--- a/tests/functional/Constraints/IpConstraintCest.php
+++ b/tests/Functional/Constraints/IpConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class IpConstraintCest extends AbstractConstraintCest
 {
@@ -48,7 +48,7 @@ public function testIpConstraintWithVersion6AndAllFieldsInvalid(FunctionalTester
     {
         list($testFormBuilder, $form) = $this->setupForm($I, [['ip', ['version' => 6]]]);
 
-        $this->fillForm($I, ['text_0' => '192.168.108.105']);
+        $this->fillForm($I, ['text_0' => '12001:0db8:85a3:0000:0000:8a2e:0370:7334']);
 
         $I->click($testFormBuilder->getFormFieldSelector(1, 'submit'));
 
diff --git a/tests/functional/Constraints/LengthConstraintCest.php b/tests/Functional/Constraints/LengthConstraintCest.php
similarity index 98%
rename from tests/functional/Constraints/LengthConstraintCest.php
rename to tests/Functional/Constraints/LengthConstraintCest.php
index 9f3d77e5..261b0db7 100644
--- a/tests/functional/Constraints/LengthConstraintCest.php
+++ b/tests/Functional/Constraints/LengthConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class LengthConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/NotBlankConstraintCest.php b/tests/Functional/Constraints/NotBlankConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/NotBlankConstraintCest.php
rename to tests/Functional/Constraints/NotBlankConstraintCest.php
index 0a159f14..cd9fb2b6 100644
--- a/tests/functional/Constraints/NotBlankConstraintCest.php
+++ b/tests/Functional/Constraints/NotBlankConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class NotBlankConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/RangeConstraintCest.php b/tests/Functional/Constraints/RangeConstraintCest.php
similarity index 98%
rename from tests/functional/Constraints/RangeConstraintCest.php
rename to tests/Functional/Constraints/RangeConstraintCest.php
index 09d41d72..b3bbaba0 100644
--- a/tests/functional/Constraints/RangeConstraintCest.php
+++ b/tests/Functional/Constraints/RangeConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 use Symfony\Component\HttpKernel\Kernel;
 
 class RangeConstraintCest extends AbstractConstraintCest
diff --git a/tests/functional/Constraints/RegexConstraintCest.php b/tests/Functional/Constraints/RegexConstraintCest.php
similarity index 96%
rename from tests/functional/Constraints/RegexConstraintCest.php
rename to tests/Functional/Constraints/RegexConstraintCest.php
index 6cf919b8..4d9d25be 100644
--- a/tests/functional/Constraints/RegexConstraintCest.php
+++ b/tests/Functional/Constraints/RegexConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class RegexConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/TimeConstraintCest.php b/tests/Functional/Constraints/TimeConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/TimeConstraintCest.php
rename to tests/Functional/Constraints/TimeConstraintCest.php
index 4a0d0272..0b23471d 100644
--- a/tests/functional/Constraints/TimeConstraintCest.php
+++ b/tests/Functional/Constraints/TimeConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class TimeConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Constraints/UrlConstraintCest.php b/tests/Functional/Constraints/UrlConstraintCest.php
similarity index 95%
rename from tests/functional/Constraints/UrlConstraintCest.php
rename to tests/Functional/Constraints/UrlConstraintCest.php
index 95df3c97..7f928285 100644
--- a/tests/functional/Constraints/UrlConstraintCest.php
+++ b/tests/Functional/Constraints/UrlConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class UrlConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Controller/AUrlConstraintCest.php b/tests/Functional/Controller/AUrlConstraintCest.php
similarity index 90%
rename from tests/functional/Controller/AUrlConstraintCest.php
rename to tests/Functional/Controller/AUrlConstraintCest.php
index c393c3bf..eb68f32b 100644
--- a/tests/functional/Controller/AUrlConstraintCest.php
+++ b/tests/Functional/Controller/AUrlConstraintCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Constraints;
+namespace DachcomBundle\Test\Functional\Constraints;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class AUrlConstraintCest extends AbstractConstraintCest
 {
diff --git a/tests/functional/Controller/Admin/ExportControllerCest.php b/tests/Functional/Controller/Admin/ExportControllerCest.php
similarity index 95%
rename from tests/functional/Controller/Admin/ExportControllerCest.php
rename to tests/Functional/Controller/Admin/ExportControllerCest.php
index 751069cf..66ce99ac 100644
--- a/tests/functional/Controller/Admin/ExportControllerCest.php
+++ b/tests/Functional/Controller/Admin/ExportControllerCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Controller\Admin;
+namespace DachcomBundle\Test\Functional\Controller\Admin;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
-use DachcomBundle\Test\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\Helper\Traits;
 
 class ExportControllerCest
 {
diff --git a/tests/functional/Controller/Admin/SettingsControllerCest.php b/tests/Functional/Controller/Admin/SettingsControllerCest.php
similarity index 97%
rename from tests/functional/Controller/Admin/SettingsControllerCest.php
rename to tests/Functional/Controller/Admin/SettingsControllerCest.php
index 1ceffd4c..45e5e7ab 100644
--- a/tests/functional/Controller/Admin/SettingsControllerCest.php
+++ b/tests/Functional/Controller/Admin/SettingsControllerCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Controller\Admin;
+namespace DachcomBundle\Test\Functional\Controller\Admin;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 class SettingsControllerCest
 {
diff --git a/tests/functional/EmailProperties/PlaceholderReplacementCest.php b/tests/Functional/EmailProperties/PlaceholderReplacementCest.php
similarity index 97%
rename from tests/functional/EmailProperties/PlaceholderReplacementCest.php
rename to tests/Functional/EmailProperties/PlaceholderReplacementCest.php
index 0886c15e..f8e1974f 100644
--- a/tests/functional/EmailProperties/PlaceholderReplacementCest.php
+++ b/tests/Functional/EmailProperties/PlaceholderReplacementCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\EmailProperties;
+namespace DachcomBundle\Test\Functional\EmailProperties;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class PlaceholderReplacementCest
 {
diff --git a/tests/functional/Fields/AbstractFieldCest.php b/tests/Functional/Fields/AbstractFieldCest.php
similarity index 91%
rename from tests/functional/Fields/AbstractFieldCest.php
rename to tests/Functional/Fields/AbstractFieldCest.php
index b5b0d20f..67f8ed95 100644
--- a/tests/functional/Fields/AbstractFieldCest.php
+++ b/tests/Functional/Fields/AbstractFieldCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 abstract class AbstractFieldCest
 {
diff --git a/tests/functional/Fields/BirthdayFieldCest.php b/tests/Functional/Fields/BirthdayFieldCest.php
similarity index 97%
rename from tests/functional/Fields/BirthdayFieldCest.php
rename to tests/Functional/Fields/BirthdayFieldCest.php
index dc72f4e8..d5c1d97b 100644
--- a/tests/functional/Fields/BirthdayFieldCest.php
+++ b/tests/Functional/Fields/BirthdayFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class BirthdayFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/CheckboxFieldCest.php b/tests/Functional/Fields/CheckboxFieldCest.php
similarity index 97%
rename from tests/functional/Fields/CheckboxFieldCest.php
rename to tests/Functional/Fields/CheckboxFieldCest.php
index 29c4f6f2..949d3f4e 100644
--- a/tests/functional/Fields/CheckboxFieldCest.php
+++ b/tests/Functional/Fields/CheckboxFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class CheckboxFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/ChoiceFieldCest.php b/tests/Functional/Fields/ChoiceFieldCest.php
similarity index 98%
rename from tests/functional/Fields/ChoiceFieldCest.php
rename to tests/Functional/Fields/ChoiceFieldCest.php
index 92820581..4e61cc55 100644
--- a/tests/functional/Fields/ChoiceFieldCest.php
+++ b/tests/Functional/Fields/ChoiceFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class ChoiceFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/ContainerFieldsetCest.php b/tests/Functional/Fields/ContainerFieldsetCest.php
similarity index 97%
rename from tests/functional/Fields/ContainerFieldsetCest.php
rename to tests/Functional/Fields/ContainerFieldsetCest.php
index 710812e0..95cd74fd 100644
--- a/tests/functional/Fields/ContainerFieldsetCest.php
+++ b/tests/Functional/Fields/ContainerFieldsetCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class ContainerFieldsetCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/ContainerRepeaterCest.php b/tests/Functional/Fields/ContainerRepeaterCest.php
similarity index 98%
rename from tests/functional/Fields/ContainerRepeaterCest.php
rename to tests/Functional/Fields/ContainerRepeaterCest.php
index bab1c325..cd40070e 100644
--- a/tests/functional/Fields/ContainerRepeaterCest.php
+++ b/tests/Functional/Fields/ContainerRepeaterCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class ContainerRepeaterCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/CountryFieldCest.php b/tests/Functional/Fields/CountryFieldCest.php
similarity index 98%
rename from tests/functional/Fields/CountryFieldCest.php
rename to tests/Functional/Fields/CountryFieldCest.php
index 3fbd7475..eb7a4828 100644
--- a/tests/functional/Fields/CountryFieldCest.php
+++ b/tests/Functional/Fields/CountryFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class CountryFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/DateFieldCest.php b/tests/Functional/Fields/DateFieldCest.php
similarity index 97%
rename from tests/functional/Fields/DateFieldCest.php
rename to tests/Functional/Fields/DateFieldCest.php
index e6f39426..f9e00f4c 100644
--- a/tests/functional/Fields/DateFieldCest.php
+++ b/tests/Functional/Fields/DateFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DateFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/DateTimeFieldCest.php b/tests/Functional/Fields/DateTimeFieldCest.php
similarity index 98%
rename from tests/functional/Fields/DateTimeFieldCest.php
rename to tests/Functional/Fields/DateTimeFieldCest.php
index 7abfbc29..72c10dc5 100644
--- a/tests/functional/Fields/DateTimeFieldCest.php
+++ b/tests/Functional/Fields/DateTimeFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DateTimeFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/DynamicChoiceFieldAdvancedCest.php b/tests/Functional/Fields/DynamicChoiceFieldAdvancedCest.php
similarity index 89%
rename from tests/functional/Fields/DynamicChoiceFieldAdvancedCest.php
rename to tests/Functional/Fields/DynamicChoiceFieldAdvancedCest.php
index 8ded2dde..1959a005 100644
--- a/tests/functional/Fields/DynamicChoiceFieldAdvancedCest.php
+++ b/tests/Functional/Fields/DynamicChoiceFieldAdvancedCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\Services\TestAdvancedDynamicChoices;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Services\TestAdvancedDynamicChoices;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DynamicChoiceFieldAdvancedCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/DynamicChoiceFieldCest.php b/tests/Functional/Fields/DynamicChoiceFieldCest.php
similarity index 97%
rename from tests/functional/Fields/DynamicChoiceFieldCest.php
rename to tests/Functional/Fields/DynamicChoiceFieldCest.php
index 610356ff..f69d5621 100644
--- a/tests/functional/Fields/DynamicChoiceFieldCest.php
+++ b/tests/Functional/Fields/DynamicChoiceFieldCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\Services\TestSimpleDynamicChoices;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Services\TestSimpleDynamicChoices;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class DynamicChoiceFieldCest extends AbstractFieldCest
 {
@@ -165,7 +165,7 @@ public function testDynamicChoiceFieldOptionalsWithEmailLabel(FunctionalTester $
 
         list($adminEmail, $testFormBuilder, $form) = $this->setupField($I, $options, $optionals);
 
-        $I->selectOption('select#formbuilder_1_dynamic_choice_field', 2);
+        $I->selectOption('select#formbuilder_1_dynamic_choice_field', '2');
         $I->click($testFormBuilder->getFormFieldSelector(1, 'submit'));
 
         $I->seeInRenderedEmailBody($adminEmail, 'Dynamic Choice Email Selection');
@@ -185,7 +185,7 @@ public function testDynamicChoiceFieldSubmission(FunctionalTester $I)
 
         list($adminEmail, $testFormBuilder, $form) = $this->setupField($I, $options);
 
-        $I->selectOption('select#formbuilder_1_dynamic_choice_field', 1);
+        $I->selectOption('select#formbuilder_1_dynamic_choice_field', '1');
         $I->click($testFormBuilder->getFormFieldSelector(1, 'submit'));
 
         $I->seePropertiesInEmail($adminEmail, ['dynamic_choice_field' => 'Entity 1']);
diff --git a/tests/functional/Fields/HiddenFieldCest.php b/tests/Functional/Fields/HiddenFieldCest.php
similarity index 95%
rename from tests/functional/Fields/HiddenFieldCest.php
rename to tests/Functional/Fields/HiddenFieldCest.php
index 5718a466..86d90883 100644
--- a/tests/functional/Fields/HiddenFieldCest.php
+++ b/tests/Functional/Fields/HiddenFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class HiddenFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/HtmlTagFieldCest.php b/tests/Functional/Fields/HtmlTagFieldCest.php
similarity index 91%
rename from tests/functional/Fields/HtmlTagFieldCest.php
rename to tests/Functional/Fields/HtmlTagFieldCest.php
index 61cd107b..a40c9dd7 100644
--- a/tests/functional/Fields/HtmlTagFieldCest.php
+++ b/tests/Functional/Fields/HtmlTagFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class HtmlTagFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/IntegerFieldCest.php b/tests/Functional/Fields/IntegerFieldCest.php
similarity index 96%
rename from tests/functional/Fields/IntegerFieldCest.php
rename to tests/Functional/Fields/IntegerFieldCest.php
index e55b3179..8ee16c28 100644
--- a/tests/functional/Fields/IntegerFieldCest.php
+++ b/tests/Functional/Fields/IntegerFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class IntegerFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/SnippetFieldCest.php b/tests/Functional/Fields/SnippetFieldCest.php
similarity index 94%
rename from tests/functional/Fields/SnippetFieldCest.php
rename to tests/Functional/Fields/SnippetFieldCest.php
index f5272916..8ad8afd8 100644
--- a/tests/functional/Fields/SnippetFieldCest.php
+++ b/tests/Functional/Fields/SnippetFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class SnippetFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/TextAreaFieldCest.php b/tests/Functional/Fields/TextAreaFieldCest.php
similarity index 96%
rename from tests/functional/Fields/TextAreaFieldCest.php
rename to tests/Functional/Fields/TextAreaFieldCest.php
index 0df5e978..278535e5 100644
--- a/tests/functional/Fields/TextAreaFieldCest.php
+++ b/tests/Functional/Fields/TextAreaFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class TextAreaFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/TextFieldCest.php b/tests/Functional/Fields/TextFieldCest.php
similarity index 96%
rename from tests/functional/Fields/TextFieldCest.php
rename to tests/Functional/Fields/TextFieldCest.php
index 0ae1b959..81b00a6b 100644
--- a/tests/functional/Fields/TextFieldCest.php
+++ b/tests/Functional/Fields/TextFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class TextFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/Fields/TimeFieldCest.php b/tests/Functional/Fields/TimeFieldCest.php
similarity index 97%
rename from tests/functional/Fields/TimeFieldCest.php
rename to tests/Functional/Fields/TimeFieldCest.php
index 7523b08f..a84fad66 100644
--- a/tests/functional/Fields/TimeFieldCest.php
+++ b/tests/Functional/Fields/TimeFieldCest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Fields;
+namespace DachcomBundle\Test\Functional\Fields;
 
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class TimeFieldCest extends AbstractFieldCest
 {
diff --git a/tests/functional/MailSubmissionTypes/SubmissionTypesCest.php b/tests/Functional/MailSubmissionTypes/SubmissionTypesCest.php
similarity index 94%
rename from tests/functional/MailSubmissionTypes/SubmissionTypesCest.php
rename to tests/Functional/MailSubmissionTypes/SubmissionTypesCest.php
index 352556c7..2c3f22b9 100644
--- a/tests/functional/MailSubmissionTypes/SubmissionTypesCest.php
+++ b/tests/Functional/MailSubmissionTypes/SubmissionTypesCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\MailSubmissionTypes;
+namespace DachcomBundle\Test\Functional\MailSubmissionTypes;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class SubmissionTypesCest
 {
diff --git a/tests/functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php b/tests/Functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php
similarity index 93%
rename from tests/functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php
rename to tests/Functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php
index 450b4e63..45a9d360 100644
--- a/tests/functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php
+++ b/tests/Functional/OutputWorkflows/Channel/MailDisableDefaultMailBodyPropertyCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\OutputWorkflows\Channel;
+namespace DachcomBundle\Test\Functional\OutputWorkflows\Channel;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class MailDisableDefaultMailBodyPropertyCest
 {
diff --git a/tests/functional/OutputWorkflows/Channel/MailForcePlainTextCest.php b/tests/Functional/OutputWorkflows/Channel/MailForcePlainTextCest.php
similarity index 89%
rename from tests/functional/OutputWorkflows/Channel/MailForcePlainTextCest.php
rename to tests/Functional/OutputWorkflows/Channel/MailForcePlainTextCest.php
index bf2458f7..221efe63 100644
--- a/tests/functional/OutputWorkflows/Channel/MailForcePlainTextCest.php
+++ b/tests/Functional/OutputWorkflows/Channel/MailForcePlainTextCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\OutputWorkflows\Channel;
+namespace DachcomBundle\Test\Functional\OutputWorkflows\Channel;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class MailForcePlainTextCest
 {
diff --git a/tests/functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php b/tests/Functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php
similarity index 88%
rename from tests/functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php
rename to tests/Functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php
index 89bcb4eb..72e962b4 100644
--- a/tests/functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php
+++ b/tests/Functional/OutputWorkflows/Channel/MailIgnoreFieldsPropertyCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\OutputWorkflows\Channel;
+namespace DachcomBundle\Test\Functional\OutputWorkflows\Channel;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class MailIgnoreFieldsPropertyCest
 {
diff --git a/tests/functional/Preset/FormWithPresetsCest.php b/tests/Functional/Preset/FormWithPresetsCest.php
similarity index 84%
rename from tests/functional/Preset/FormWithPresetsCest.php
rename to tests/Functional/Preset/FormWithPresetsCest.php
index e3cf4f8b..11a58bfa 100644
--- a/tests/functional/Preset/FormWithPresetsCest.php
+++ b/tests/Functional/Preset/FormWithPresetsCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\Preset;
+namespace DachcomBundle\Test\Functional\Preset;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
 
 class FormWithPresetsCest
 {
@@ -14,7 +14,7 @@ class FormWithPresetsCest
      */
     public function testAdminFormWithPresets(FunctionalTester $I)
     {
-        $I->haveABootedSymfonyConfiguration('config_presets.yml');
+        $I->haveABootedSymfonyConfiguration('config_presets.yaml');
 
         $user = $I->haveAUser('dachcom_test');
         $document = $I->haveAPageDocument('form-test');
diff --git a/tests/functional/RenderingTypes/RenderingTypesCest.php b/tests/Functional/RenderingTypes/RenderingTypesCest.php
similarity index 95%
rename from tests/functional/RenderingTypes/RenderingTypesCest.php
rename to tests/Functional/RenderingTypes/RenderingTypesCest.php
index 4a2ebfea..af1d1b6e 100644
--- a/tests/functional/RenderingTypes/RenderingTypesCest.php
+++ b/tests/Functional/RenderingTypes/RenderingTypesCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\RenderingTypes;
+namespace DachcomBundle\Test\Functional\RenderingTypes;
 
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
 
 class RenderingTypesCest
 {
diff --git a/tests/functional/SimpleForm/SimpleFormCest.php b/tests/Functional/SimpleForm/SimpleFormCest.php
similarity index 98%
rename from tests/functional/SimpleForm/SimpleFormCest.php
rename to tests/Functional/SimpleForm/SimpleFormCest.php
index 5c7d2fb7..c82f65a5 100644
--- a/tests/functional/SimpleForm/SimpleFormCest.php
+++ b/tests/Functional/SimpleForm/SimpleFormCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\SimpleForm;
+namespace DachcomBundle\Test\Functional\SimpleForm;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class SimpleFormCest
 {
diff --git a/tests/functional/SimpleForm/SimpleFormEditWindowCest.php b/tests/Functional/SimpleForm/SimpleFormEditWindowCest.php
similarity index 94%
rename from tests/functional/SimpleForm/SimpleFormEditWindowCest.php
rename to tests/Functional/SimpleForm/SimpleFormEditWindowCest.php
index 16b09699..448c50a3 100644
--- a/tests/functional/SimpleForm/SimpleFormEditWindowCest.php
+++ b/tests/Functional/SimpleForm/SimpleFormEditWindowCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\functional\SimpleForm;
+namespace DachcomBundle\Test\Functional\SimpleForm;
 
-use DachcomBundle\Test\Helper\Traits;
-use DachcomBundle\Test\FunctionalTester;
+use DachcomBundle\Test\Support\Helper\Traits;
+use DachcomBundle\Test\Support\FunctionalTester;
 
 class SimpleFormEditWindowCest
 {
@@ -96,7 +96,7 @@ public function testConfigFieldFormMailOutputWorkflowSelector(FunctionalTester $
         ];
 
         $I->seeElement('template#template__pimcore_editable_bundleTestArea_1_outputWorkflow');
-        $I->seeAEditableConfiguration('outputWorkflow', 'select', 'Output Workflow', $options, null, 'script');
+        $I->seeAEditableConfiguration('outputWorkflow', 'select', 'Output Workflow', $options, '', 'script');
     }
 
     /**
diff --git a/tests/functional/_bootstrap.php b/tests/Functional/_bootstrap.php
similarity index 100%
rename from tests/functional/_bootstrap.php
rename to tests/Functional/_bootstrap.php
diff --git a/tests/Support/AcceptanceTester.php b/tests/Support/AcceptanceTester.php
new file mode 100644
index 00000000..8c034363
--- /dev/null
+++ b/tests/Support/AcceptanceTester.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DachcomBundle\Test\Support;
+
+class AcceptanceTester extends \Dachcom\Codeception\Support\AcceptanceTester
+{
+    use _generated\AcceptanceTesterActions;
+}
diff --git a/tests/Support/FunctionalTester.php b/tests/Support/FunctionalTester.php
new file mode 100644
index 00000000..80598b83
--- /dev/null
+++ b/tests/Support/FunctionalTester.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DachcomBundle\Test\Support;
+
+class FunctionalTester extends \Dachcom\Codeception\Support\FunctionalTester
+{
+    use _generated\FunctionalTesterActions;
+}
diff --git a/tests/_support/Helper/PimcoreBackend.php b/tests/Support/Helper/PimcoreBackend.php
similarity index 97%
rename from tests/_support/Helper/PimcoreBackend.php
rename to tests/Support/Helper/PimcoreBackend.php
index 28063b13..fc082c17 100644
--- a/tests/_support/Helper/PimcoreBackend.php
+++ b/tests/Support/Helper/PimcoreBackend.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace DachcomBundle\Test\Helper;
+namespace DachcomBundle\Test\Support\Helper;
 
 use Codeception\Exception\ModuleException;
 use Codeception\TestInterface;
 use Codeception\Util\Debug;
-use Dachcom\Codeception\Util\EditableHelper;
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use Dachcom\Codeception\Support\Util\EditableHelper;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Manager\OutputWorkflowManager;
 use FormBuilderBundle\Model\FormDefinition;
@@ -20,7 +20,7 @@
 use Pimcore\Model\Document\Page;
 use Symfony\Component\Uid\Uuid;
 
-class PimcoreBackend extends \Dachcom\Codeception\Helper\PimcoreBackend
+class PimcoreBackend extends \Dachcom\Codeception\Support\Helper\PimcoreBackend
 {
     public function _after(TestInterface $test)
     {
diff --git a/tests/_support/Helper/Traits/FunctionalFormTrait.php b/tests/Support/Helper/Traits/FunctionalFormTrait.php
similarity index 87%
rename from tests/_support/Helper/Traits/FunctionalFormTrait.php
rename to tests/Support/Helper/Traits/FunctionalFormTrait.php
index 79a2ee6a..1f63216c 100644
--- a/tests/_support/Helper/Traits/FunctionalFormTrait.php
+++ b/tests/Support/Helper/Traits/FunctionalFormTrait.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace DachcomBundle\Test\Helper\Traits;
+namespace DachcomBundle\Test\Support\Helper\Traits;
 
 use Codeception\Actor;
-use DachcomBundle\Test\AcceptanceTester;
-use DachcomBundle\Test\FunctionalTester;
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Util\TestFormBuilder;
+use DachcomBundle\Test\Support\AcceptanceTester;
+use DachcomBundle\Test\Support\FunctionalTester;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Util\TestFormBuilder;
 
 trait FunctionalFormTrait
 {
diff --git a/tests/_support/Services/TestAdvancedDynamicChoices.php b/tests/Support/Services/TestAdvancedDynamicChoices.php
similarity index 97%
rename from tests/_support/Services/TestAdvancedDynamicChoices.php
rename to tests/Support/Services/TestAdvancedDynamicChoices.php
index c582bb25..e9272e35 100644
--- a/tests/_support/Services/TestAdvancedDynamicChoices.php
+++ b/tests/Support/Services/TestAdvancedDynamicChoices.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DachcomBundle\Test\Services;
+namespace DachcomBundle\Test\Support\Services;
 
 use FormBuilderBundle\Form\AdvancedChoiceBuilderInterface;
 use Symfony\Component\Form\CallbackTransformer;
diff --git a/tests/_support/Services/TestSimpleDynamicChoices.php b/tests/Support/Services/TestSimpleDynamicChoices.php
similarity index 97%
rename from tests/_support/Services/TestSimpleDynamicChoices.php
rename to tests/Support/Services/TestSimpleDynamicChoices.php
index a15dc44e..0a95bb2e 100644
--- a/tests/_support/Services/TestSimpleDynamicChoices.php
+++ b/tests/Support/Services/TestSimpleDynamicChoices.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DachcomBundle\Test\Services;
+namespace DachcomBundle\Test\Support\Services;
 
 use FormBuilderBundle\Form\ChoiceBuilderInterface;
 use Symfony\Component\Form\CallbackTransformer;
diff --git a/tests/_support/Test/DachcomBundleTestCase.php b/tests/Support/Test/DachcomBundleTestCase.php
similarity index 55%
rename from tests/_support/Test/DachcomBundleTestCase.php
rename to tests/Support/Test/DachcomBundleTestCase.php
index ba7ee6aa..8cc35a2d 100644
--- a/tests/_support/Test/DachcomBundleTestCase.php
+++ b/tests/Support/Test/DachcomBundleTestCase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\Test;
+namespace DachcomBundle\Test\Support\Test;
 
-use Dachcom\Codeception\Test\BundleTestCase;
-use DachcomBundle\Test\Util\FormHelper;
+use Dachcom\Codeception\Support\Test\BundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
 
 abstract class DachcomBundleTestCase extends BundleTestCase
 {
diff --git a/tests/Support/UnitTester.php b/tests/Support/UnitTester.php
new file mode 100644
index 00000000..630659a4
--- /dev/null
+++ b/tests/Support/UnitTester.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DachcomBundle\Test\Support;
+
+class UnitTester extends  \Dachcom\Codeception\Support\UnitTester
+{
+    use _generated\UnitTesterActions;
+}
diff --git a/tests/_support/Util/FormHelper.php b/tests/Support/Util/FormHelper.php
similarity index 98%
rename from tests/_support/Util/FormHelper.php
rename to tests/Support/Util/FormHelper.php
index fe9d67ea..2c11b233 100644
--- a/tests/_support/Util/FormHelper.php
+++ b/tests/Support/Util/FormHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DachcomBundle\Test\Util;
+namespace DachcomBundle\Test\Support\Util;
 
 use Codeception\Util\Debug;
 use Pimcore\Db;
diff --git a/tests/_support/Util/TestFormBuilder.php b/tests/Support/Util/TestFormBuilder.php
similarity index 99%
rename from tests/_support/Util/TestFormBuilder.php
rename to tests/Support/Util/TestFormBuilder.php
index 5db02ad7..18423c32 100644
--- a/tests/_support/Util/TestFormBuilder.php
+++ b/tests/Support/Util/TestFormBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DachcomBundle\Test\Util;
+namespace DachcomBundle\Test\Support\Util;
 
 class TestFormBuilder
 {
diff --git a/tests/Unit.suite.dist.yml b/tests/Unit.suite.dist.yml
new file mode 100644
index 00000000..91d58357
--- /dev/null
+++ b/tests/Unit.suite.dist.yml
@@ -0,0 +1,10 @@
+actor: UnitTester
+error_level: '%PIMCORE_PHP_ERROR_REPORTING%'
+bootstrap: _bootstrap.php
+modules:
+    enabled:
+        - \Dachcom\Codeception\Support\Helper\PimcoreCore:
+            connect_db: true
+        - \Dachcom\Codeception\Support\Helper\PimcoreBundleCore:
+            run_installer: true
+        - \Dachcom\Codeception\Support\Helper\Unit
\ No newline at end of file
diff --git a/tests/unit/Config/ActiveElementsTest.php b/tests/Unit/Config/ActiveElementsTest.php
similarity index 81%
rename from tests/unit/Config/ActiveElementsTest.php
rename to tests/Unit/Config/ActiveElementsTest.php
index 75e55889..86c78bf0 100644
--- a/tests/unit/Config/ActiveElementsTest.php
+++ b/tests/Unit/Config/ActiveElementsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Config;
+namespace DachcomBundle\Test\Unit\Config;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Configuration\Configuration;
 
 class ActiveElementsTest extends DachcomBundleTestCase
diff --git a/tests/unit/Config/TemplateTest.php b/tests/Unit/Config/TemplateTest.php
similarity index 96%
rename from tests/unit/Config/TemplateTest.php
rename to tests/Unit/Config/TemplateTest.php
index 1c75a10a..4ef814c7 100644
--- a/tests/unit/Config/TemplateTest.php
+++ b/tests/Unit/Config/TemplateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Config;
+namespace DachcomBundle\Test\Unit\Config;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Configuration\Configuration;
 
 class TemplateTest extends DachcomBundleTestCase
diff --git a/tests/unit/Form/FormFactoryWithNoDataTest.php b/tests/Unit/Form/FormFactoryWithNoDataTest.php
similarity index 93%
rename from tests/unit/Form/FormFactoryWithNoDataTest.php
rename to tests/Unit/Form/FormFactoryWithNoDataTest.php
index 198351ce..2794a649 100644
--- a/tests/unit/Form/FormFactoryWithNoDataTest.php
+++ b/tests/Unit/Form/FormFactoryWithNoDataTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Form;
+namespace DachcomBundle\Test\Unit\Form;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Factory\FormDefinitionFactoryInterface;
 use FormBuilderBundle\Model\FormDefinitionInterface;
 use FormBuilderBundle\Model\FormFieldContainerDefinitionInterface;
diff --git a/tests/unit/Form/FormManagerTest.php b/tests/Unit/Form/FormManagerTest.php
similarity index 94%
rename from tests/unit/Form/FormManagerTest.php
rename to tests/Unit/Form/FormManagerTest.php
index 84dba138..8d393f36 100644
--- a/tests/unit/Form/FormManagerTest.php
+++ b/tests/Unit/Form/FormManagerTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Form;
+namespace DachcomBundle\Test\Unit\Form;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
-use DachcomBundle\Test\Util\FormHelper;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Model\FormDefinitionInterface;
 
diff --git a/tests/unit/Form/FormManagerWithDataTest.php b/tests/Unit/Form/FormManagerWithDataTest.php
similarity index 90%
rename from tests/unit/Form/FormManagerWithDataTest.php
rename to tests/Unit/Form/FormManagerWithDataTest.php
index ca6a4396..9c9fb4aa 100644
--- a/tests/unit/Form/FormManagerWithDataTest.php
+++ b/tests/Unit/Form/FormManagerWithDataTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Form;
+namespace DachcomBundle\Test\Unit\Form;
 
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Model\FormDefinitionInterface;
 
diff --git a/tests/Unit/MailEditor/PlaceholderParserTest.php b/tests/Unit/MailEditor/PlaceholderParserTest.php
new file mode 100644
index 00000000..5149eb2d
--- /dev/null
+++ b/tests/Unit/MailEditor/PlaceholderParserTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace DachcomBundle\Test\Unit\MailEditor;
+
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
+use FormBuilderBundle\MailEditor\Parser\PlaceholderParser;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormConfigBuilder;
+
+class PlaceholderParserTest extends DachcomBundleTestCase
+{
+    public function testNewFormFieldContainerRepeaterField(): void
+    {
+        $placeholder = $this->getContainer()->get(PlaceholderParser::class);
+
+        $config = new FormConfigBuilder('name', '\stdClass',  new EventDispatcher());
+        $form = new Form($config);
+
+        $data = $placeholder->replacePlaceholderWithOutputData($this->getTestString(), $form, $this->getTestFields(), 'text');
+
+        $this->assertEquals($this->getExpectedString(), $data);
+    }
+
+    private function getTestFields(): array
+    {
+        return [
+            'last_name'  => [
+                'value' => 'The Tester',
+                'label' => 'Last Name'
+            ],
+            'first_name' => [
+                'value' => 'Frank',
+                'label' => 'First Name'
+            ]
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    private function getTestString(): string
+    {
+        return '<fb-field data-type="fb_field" data-sub_type="last_name" data-render_type="L">last_name</fb-field><fb-field data-type="fb_field" data-sub_type="last_name" data-render_type="V">last_name</fb-field><br />
+                <fb-field data-type="fb_field" data-sub_type="first_name" data-render_type="L">first_name</fb-field><fb-field data-type="fb_field" data-sub_type="first_name" show_label="true" data-render_type="V">first_name</fb-field><br />
+                ===<br />
+                Date: <fb-field data-type="date" data-sub_type="null" format="d.m.Y">date</fb-field>';
+    }
+
+    /**
+     * @return string
+     */
+    private function getExpectedString(): string
+    {
+        return sprintf('Last Name: The Tester%1$s
+                First Name: Frank%1$s
+                ===%1$s
+                Date: %2$s', "\n", date('d.m.Y'));
+    }
+
+}
diff --git a/tests/unit/SimpleForm/FormFieldContainerStorageTest.php b/tests/Unit/SimpleForm/FormFieldContainerStorageTest.php
similarity index 95%
rename from tests/unit/SimpleForm/FormFieldContainerStorageTest.php
rename to tests/Unit/SimpleForm/FormFieldContainerStorageTest.php
index cde6c637..f9ef5ba5 100644
--- a/tests/unit/SimpleForm/FormFieldContainerStorageTest.php
+++ b/tests/Unit/SimpleForm/FormFieldContainerStorageTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\unit\SimpleForm;
+namespace DachcomBundle\Test\Unit\SimpleForm;
 
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Model\FormFieldContainerDefinitionInterface;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
diff --git a/tests/unit/SimpleForm/FormFieldStorageTest.php b/tests/Unit/SimpleForm/FormFieldStorageTest.php
similarity index 98%
rename from tests/unit/SimpleForm/FormFieldStorageTest.php
rename to tests/Unit/SimpleForm/FormFieldStorageTest.php
index babc9274..2e117c07 100644
--- a/tests/unit/SimpleForm/FormFieldStorageTest.php
+++ b/tests/Unit/SimpleForm/FormFieldStorageTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\unit\SimpleForm;
+namespace DachcomBundle\Test\Unit\SimpleForm;
 
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 
diff --git a/tests/unit/SimpleForm/FormStorageTest.php b/tests/Unit/SimpleForm/FormStorageTest.php
similarity index 97%
rename from tests/unit/SimpleForm/FormStorageTest.php
rename to tests/Unit/SimpleForm/FormStorageTest.php
index 39fbce59..014fea6b 100644
--- a/tests/unit/SimpleForm/FormStorageTest.php
+++ b/tests/Unit/SimpleForm/FormStorageTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DachcomBundle\Test\unit\SimpleForm;
+namespace DachcomBundle\Test\Unit\SimpleForm;
 
-use DachcomBundle\Test\Util\FormHelper;
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Util\FormHelper;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Manager\FormDefinitionManager;
 
 class FormStorageTest extends DachcomBundleTestCase
diff --git a/tests/unit/Transformer/ChoicesTransformTest.php b/tests/Unit/Transformer/ChoicesTransformTest.php
similarity index 97%
rename from tests/unit/Transformer/ChoicesTransformTest.php
rename to tests/Unit/Transformer/ChoicesTransformTest.php
index 48d5c996..b802449b 100644
--- a/tests/unit/Transformer/ChoicesTransformTest.php
+++ b/tests/Unit/Transformer/ChoicesTransformTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Transformer;
+namespace DachcomBundle\Test\Unit\Transformer;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Registry\OptionsTransformerRegistry;
 use FormBuilderBundle\Transformer\ChoicesTransformer;
 
diff --git a/tests/unit/Transformer/DefaultValueTransformTest.php b/tests/Unit/Transformer/DefaultValueTransformTest.php
similarity index 96%
rename from tests/unit/Transformer/DefaultValueTransformTest.php
rename to tests/Unit/Transformer/DefaultValueTransformTest.php
index 74483b6c..0da59192 100644
--- a/tests/unit/Transformer/DefaultValueTransformTest.php
+++ b/tests/Unit/Transformer/DefaultValueTransformTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Transformer;
+namespace DachcomBundle\Test\Unit\Transformer;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Registry\OptionsTransformerRegistry;
 use FormBuilderBundle\Transformer\DefaultValueTransformer;
 use FormBuilderBundle\Transformer\HrefTransformer;
diff --git a/tests/unit/Transformer/HrefTransformTest.php b/tests/Unit/Transformer/HrefTransformTest.php
similarity index 95%
rename from tests/unit/Transformer/HrefTransformTest.php
rename to tests/Unit/Transformer/HrefTransformTest.php
index 6f4a0358..87db465c 100644
--- a/tests/unit/Transformer/HrefTransformTest.php
+++ b/tests/Unit/Transformer/HrefTransformTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Transformer;
+namespace DachcomBundle\Test\Unit\Transformer;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Registry\OptionsTransformerRegistry;
 use FormBuilderBundle\Transformer\HrefTransformer;
-use Pimcore\Tests\Util\TestHelper;
+use Pimcore\Tests\Support\Util\TestHelper;
 
 class HrefTransformTest extends DachcomBundleTestCase
 {
diff --git a/tests/unit/Transformer/MetaChoiceTransformTest.php b/tests/Unit/Transformer/MetaChoiceTransformTest.php
similarity index 98%
rename from tests/unit/Transformer/MetaChoiceTransformTest.php
rename to tests/Unit/Transformer/MetaChoiceTransformTest.php
index 1548bc1d..7171997f 100644
--- a/tests/unit/Transformer/MetaChoiceTransformTest.php
+++ b/tests/Unit/Transformer/MetaChoiceTransformTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DachcomBundle\Test\unit\Transformer;
+namespace DachcomBundle\Test\Unit\Transformer;
 
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
+use DachcomBundle\Test\Support\Test\DachcomBundleTestCase;
 use FormBuilderBundle\Registry\OptionsTransformerRegistry;
 use FormBuilderBundle\Transformer\ChoicesMetaTransformer;
-use Pimcore\Tests\Util\TestHelper;
+use Pimcore\Tests\Support\Util\TestHelper;
 
 class MetaChoiceTransformTest extends DachcomBundleTestCase
 {
diff --git a/tests/unit/_bootstrap.php b/tests/Unit/_bootstrap.php
similarity index 100%
rename from tests/unit/_bootstrap.php
rename to tests/Unit/_bootstrap.php
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index f4138acf..fc47a3e5 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,8 +1,3 @@
 <?php
 
-$frameworkPath = getenv('PIMCORE_CODECEPTION_FRAMEWORK');
-$bundleTestPath = getenv('TEST_BUNDLE_TEST_DIR');
-
-$bootstrap = sprintf('%s/src/_bootstrap.php', $frameworkPath);
-
-include_once $bootstrap;
+include_once sprintf('%s/src/_bootstrap.php', getenv('PIMCORE_CODECEPTION_FRAMEWORK'));
\ No newline at end of file
diff --git a/tests/_envs/github.yml b/tests/_envs/github.yml
index a0ad7339..dcaa9040 100644
--- a/tests/_envs/github.yml
+++ b/tests/_envs/github.yml
@@ -1,12 +1,13 @@
 modules:
     config:
-        \Dachcom\Codeception\Helper\Browser\WebDriver:
+        \Dachcom\Codeception\Support\Helper\Browser\WebDriver:
             browser: chrome
             port: 9515
             restart: true
             wait: 1
+            window_size: 1280x1024
             capabilities:
                 chromeOptions:
-                    args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
+                    args: ['--headless', '--disable-gpu']
                     prefs:
                         download.default_directory: '%TEST_BUNDLE_TEST_DIR%/_data/downloads'
\ No newline at end of file
diff --git a/tests/_envs/local.yml b/tests/_envs/local.yml
index 3eb4dfe2..605a31f5 100644
--- a/tests/_envs/local.yml
+++ b/tests/_envs/local.yml
@@ -1,10 +1,10 @@
 modules:
     config:
-        \Dachcom\Codeception\Helper\Browser\WebDriver:
+        \Dachcom\Codeception\Support\Helper\Browser\WebDriver:
             browser: chrome
             port: 4444
             restart: true
             wait: 1
             capabilities:
                 chromeOptions:
-                    args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
+                    args: ['--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
diff --git a/tests/_etc/config.yaml b/tests/_etc/config.yaml
new file mode 100644
index 00000000..a4c7cdc6
--- /dev/null
+++ b/tests/_etc/config.yaml
@@ -0,0 +1,17 @@
+bundles:
+    - { namespace: \Pimcore\Bundle\AdminBundle\PimcoreAdminBundle, priority: 60 }
+    - { namespace: \Pimcore\Bundle\SeoBundle\PimcoreSeoBundle, priority: 0, execute_installer: true }
+    - { namespace: \Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle, priority: 0, execute_installer: true }
+    - { namespace: \Pimcore\Bundle\XliffBundle\PimcoreXliffBundle, priority: 0, execute_installer: true }
+    - { namespace: \FormBuilderBundle\FormBuilderBundle }
+setup_files:
+    - { path: app/config.yaml, dest: ./config/ }
+    - { path: app/system_settings.yaml, dest: ./var/config/system_settings/ }
+    - { path: app/controller/DefaultController.php, dest: ./src/Controller/ }
+    - { path: app/views/default.html.twig, dest: ./templates/default/ }
+    - { path: app/views/javascript.html.twig, dest: ./templates/default/ }
+    - { path: app/views/dynamic-multi-file.html.twig, dest: ./templates/default/ }
+    - { path: app/views/snippet.html.twig, dest: ./templates/default/ }
+    - { path: app/views/twigRender.html.twig, dest: ./templates/default/ }
+additional_composer_packages:
+    - { package: pimcore/admin-ui-classic-bundle, version: ^1.0 }
\ No newline at end of file
diff --git a/tests/_etc/config.yml b/tests/_etc/config.yml
deleted file mode 100644
index 6b9e017d..00000000
--- a/tests/_etc/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-bundles:
-    - { namespace: \FormBuilderBundle\FormBuilderBundle }
-setup_files:
-    - { path: app/config.yml, dest: ./config/config.yaml }
-    - { path: app/system.yml, dest: ./var/config/system.yml }
-    - { path: app/controller/DefaultController.php, dest: ./src/Controller/DefaultController.php }
-    - { path: app/views/default.html.twig, dest: ./templates/default/default.html.twig }
-    - { path: app/views/javascript.html.twig, dest: ./templates/default/javascript.html.twig }
-    - { path: app/views/dynamic-multi-file.html.twig, dest: ./templates/default/dynamic-multi-file.html.twig }
-    - { path: app/views/snippet.html.twig, dest: ./templates/default/snippet.html.twig }
-    - { path: app/views/twigRender.html.twig, dest: ./templates/default/twigRender.html.twig }
diff --git a/tests/_etc/config/app/config.yml b/tests/_etc/config/app/config.yaml
similarity index 51%
rename from tests/_etc/config/app/config.yml
rename to tests/_etc/config/app/config.yaml
index b4b403d8..c9e62245 100755
--- a/tests/_etc/config/app/config.yml
+++ b/tests/_etc/config/app/config.yaml
@@ -18,14 +18,37 @@ doctrine:
                     enum: string
                     bit: boolean
 
+pimcore:
+    config_location:
+        image_thumbnails:
+            write_target:
+                type: 'settings-store'
+        video_thumbnails:
+            write_target:
+                type: 'settings-store'
+        document_types:
+            write_target:
+                type: 'settings-store'
+        predefined_properties:
+            write_target:
+                type: 'settings-store'
+        predefined_asset_metadata:
+            write_target:
+                type: 'settings-store'
+        perspectives:
+            write_target:
+                type: 'settings-store'
+        custom_views:
+            write_target:
+                type: 'settings-store'
+        object_custom_layouts:
+            write_target:
+                type: 'settings-store'
+
 pimcore_admin:
     admin_csp_header:
         enabled: false
 
-pimcore:
-    targeting:
-        enabled: false
-
 framework:
 
     session:
diff --git a/tests/_etc/config/app/system.yml b/tests/_etc/config/app/system.yml
deleted file mode 100755
index 2480015c..00000000
--- a/tests/_etc/config/app/system.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-pimcore:
-    general:
-        timezone: Europe/Berlin
-        language: en
-        valid_languages: 'en,de'
-        fallback_languages:
-            en: ''
-            de: ''
-        path_variable: ''
-        domain: 'localhost'
-        redirect_to_maindomain: false
-        default_language: en
-        disable_usage_statistics: true
-        debug_admin_translations: false
-        instance_identifier: ''
-    documents:
-        versions:
-            steps: 10
-            days: null
-        error_pages:
-            default: /404
-        allow_trailing_slash: 'no'
-        generate_preview: false
-    objects:
-        versions:
-            steps: 10
-            days: null
-    assets:
-        versions:
-            steps: 10
-            days: null
-        icc_rgb_profile: ''
-        icc_cmyk_profile: ''
-        hide_edit_image: false
-        disable_tree_preview: true
-    email:
-        debug:
-            email_addresses: opensource@dachcom.ch
-    services:
-        google:
-            client_id: ''
-            email: ''
-            simple_api_key: ''
-            browser_api_key: ''
-    full_page_cache:
-        exclude_cookie: ''
-        enabled: false
-        lifetime: null
-        exclude_patterns: ''
-    httpclient:
-        adapter: Socket
-        proxy_host: ''
-        proxy_port: ''
-        proxy_user: ''
-        proxy_pass: ''
-    applicationlog:
-        mail_notification:
-            send_log_summary: false
-            filter_priority: null
-            mail_receiver: ''
-        archive_treshold: '30'
-        archive_alternative_database: ''
-        delete_archive_threshold: '6'
-pimcore_admin:
-    branding:
-        color_login_screen: ''
-        color_admin_interface: ''
-        login_screen_custom_image: ''
-        login_screen_invert_colors: false
diff --git a/tests/_etc/config/app/system_settings.yaml b/tests/_etc/config/app/system_settings.yaml
new file mode 100755
index 00000000..f19aeebf
--- /dev/null
+++ b/tests/_etc/config/app/system_settings.yaml
@@ -0,0 +1,47 @@
+pimcore:
+    general:
+        timezone: Europe/Berlin
+        domain: 'localhost'
+        redirect_to_maindomain: false
+        disable_usage_statistics: true
+        debug_admin_translations: false
+        language: en
+        default_language: en
+        valid_languages:
+            - en
+            - de
+        fallback_languages:
+            en: ''
+            de: ''
+    documents:
+        allow_trailing_slash: 'no'
+        generate_preview: false
+        versions:
+            days: null
+            steps: 10
+        error_pages:
+            default: '/error'
+            localized:
+                en: ''
+                de: ''
+    objects:
+        versions:
+            days: null
+            steps: 10
+    assets:
+        versions:
+            days: null
+            steps: 10
+    email:
+        debug:
+            email_addresses: development@dachcom.ch
+pimcore_admin:
+    assets:
+        hide_edit_image: true
+        disable_tree_preview: true
+    branding:
+        login_screen_invert_colors: false
+        color_login_screen: ''
+        color_admin_interface: ''
+        color_admin_interface_background: ''
+        login_screen_custom_image: ''
diff --git a/tests/_etc/config/bundle/config_configuration_flags.yml b/tests/_etc/config/bundle/config_configuration_flags.yaml
similarity index 100%
rename from tests/_etc/config/bundle/config_configuration_flags.yml
rename to tests/_etc/config/bundle/config_configuration_flags.yaml
diff --git a/tests/_etc/config/bundle/config_default.yml b/tests/_etc/config/bundle/config_default.yaml
similarity index 87%
rename from tests/_etc/config/bundle/config_default.yml
rename to tests/_etc/config/bundle/config_default.yaml
index ff7c300d..2b3ae40e 100755
--- a/tests/_etc/config/bundle/config_default.yml
+++ b/tests/_etc/config/bundle/config_default.yaml
@@ -1,11 +1,11 @@
 services:
-    DachcomBundle\Test\Services\TestSimpleDynamicChoices:
+    DachcomBundle\Test\Support\Services\TestSimpleDynamicChoices:
         autowire: true
         public: false
         tags:
             - { name: form_builder.dynamic_choice_builder, label: 'Simple Test Selector' }
 
-    DachcomBundle\Test\Services\TestAdvancedDynamicChoices:
+    DachcomBundle\Test\Support\Services\TestAdvancedDynamicChoices:
         autowire: true
         public: false
         tags:
diff --git a/tests/_etc/config/bundle/config_fineuploaderjs.yml b/tests/_etc/config/bundle/config_fineuploaderjs.yaml
similarity index 100%
rename from tests/_etc/config/bundle/config_fineuploaderjs.yml
rename to tests/_etc/config/bundle/config_fineuploaderjs.yaml
diff --git a/tests/_etc/config/bundle/config_presets.yml b/tests/_etc/config/bundle/config_presets.yaml
similarity index 100%
rename from tests/_etc/config/bundle/config_presets.yml
rename to tests/_etc/config/bundle/config_presets.yaml
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
deleted file mode 100644
index 5df874f7..00000000
--- a/tests/_support/AcceptanceTester.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DachcomBundle\Test;
-
-class AcceptanceTester extends \Dachcom\Codeception\AcceptanceTester
-{
-    use _generated\AcceptanceTesterActions;
-}
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
deleted file mode 100644
index 6d89997f..00000000
--- a/tests/_support/FunctionalTester.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DachcomBundle\Test;
-
-class FunctionalTester extends \Dachcom\Codeception\FunctionalTester
-{
-    use _generated\FunctionalTesterActions;
-}
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
deleted file mode 100644
index 4206d058..00000000
--- a/tests/_support/UnitTester.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DachcomBundle\Test;
-
-class UnitTester extends  \Dachcom\Codeception\UnitTester
-{
-    use _generated\UnitTesterActions;
-}
diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml
deleted file mode 100644
index da782db7..00000000
--- a/tests/acceptance.suite.dist.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-actor: AcceptanceTester
-error_level: 'getenv("PIMCORE_PHP_ERROR_REPORTING")'
-modules:
-    config:
-        \Dachcom\Codeception\Helper\Browser\WebDriver:
-            host: '%WEBDRIVER_HOST%'
-            url: '%WEBDRIVER_URL%'
-            browser: chrome
-    enabled:
-        - \Dachcom\Codeception\Helper\PimcoreCore:
-            part: SERVICES
-            connect_db: true
-            rebootable_client: true
-        - \Dachcom\Codeception\Helper\PimcoreBundleCore:
-            run_installer: true
-        - \Dachcom\Codeception\Helper\Browser\WebDriver
-        - \Dachcom\Codeception\Helper\PimcoreUser
-        - \DachcomBundle\Test\Helper\PimcoreBackend
\ No newline at end of file
diff --git a/tests/functional.suite.dist.yml b/tests/functional.suite.dist.yml
deleted file mode 100644
index 783da5ab..00000000
--- a/tests/functional.suite.dist.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-actor: FunctionalTester
-error_level: 'getenv("PIMCORE_PHP_ERROR_REPORTING")'
-modules:
-    enabled:
-        - \Dachcom\Codeception\Helper\PimcoreCore:
-              connect_db: true
-              rebootable_client: true
-        - \Dachcom\Codeception\Helper\PimcoreBundleCore:
-            run_installer: true
-        - \Dachcom\Codeception\Helper\Browser\PhpBrowser:
-            depends: \Dachcom\Codeception\Helper\PimcoreCore
-        - \Dachcom\Codeception\Helper\PimcoreAdminJson:
-            depends: \Dachcom\Codeception\Helper\PimcoreCore
-        - \Dachcom\Codeception\Helper\PimcoreAdminCsv:
-            depends: \Dachcom\Codeception\Helper\PimcoreCore
-        - \Dachcom\Codeception\Helper\PimcoreUser
-        - \DachcomBundle\Test\Helper\PimcoreBackend
\ No newline at end of file
diff --git a/tests/unit.suite.dist.yml b/tests/unit.suite.dist.yml
deleted file mode 100644
index cffbe753..00000000
--- a/tests/unit.suite.dist.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-actor: UnitTester
-error_level: 'getenv("PIMCORE_PHP_ERROR_REPORTING")'
-modules:
-    enabled:
-        - \Dachcom\Codeception\Helper\PimcoreCore:
-            connect_db: true
-        - \Dachcom\Codeception\Helper\PimcoreBundleCore:
-            run_installer: true
-        - \Dachcom\Codeception\Helper\Unit
\ No newline at end of file
diff --git a/tests/unit/MailEditor/PlaceholderParserTest.php b/tests/unit/MailEditor/PlaceholderParserTest.php
deleted file mode 100644
index 5d15f9c2..00000000
--- a/tests/unit/MailEditor/PlaceholderParserTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace DachcomBundle\Test\unit\MailEditor;
-
-use DachcomBundle\Test\Test\DachcomBundleTestCase;
-use FormBuilderBundle\MailEditor\Parser\PlaceholderParser;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormConfigBuilder;
-
-class PlaceholderParserTest extends DachcomBundleTestCase
-{
-    /**
-     * @throws \Codeception\Exception\ModuleException
-     */
-    public function testNewFormFieldContainerRepeaterField()
-    {
-        $placeholder = $this->getContainer()->get(PlaceholderParser::class);
-
-        $config = new FormConfigBuilder('name', '\stdClass',  new EventDispatcher());
-        $form = new Form($config);
-
-        $data = $placeholder->replacePlaceholderWithOutputData($this->getTestString(), $form, $this->getTestFields());
-
-        $this->assertEquals($this->getExpectedString(), $data);
-    }
-
-    /**
-     * @return array
-     */
-    private function getTestFields()
-    {
-        return [
-            'last_name'  => [
-                'value' => 'The Tester',
-                'label' => 'Last Name'
-            ],
-            'first_name' => [
-                'value' => 'Frank',
-                'label' => 'First Name'
-            ]
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    private function getTestString()
-    {
-        return '[[fb_field sub-type="last_name"]]<br />
-                [[fb_field sub-type="first_name" show_label="true"]]<br />
-                ===<br />
-                Date: [[date format="d.m.Y"]]';
-    }
-
-    /**
-     * @return string
-     */
-    private function getExpectedString()
-    {
-        return sprintf('Last Name: The Tester<br />
-                First Name: Frank<br />
-                ===<br />
-                Date: %s', date('d.m.Y'));
-    }
-
-}
diff --git a/src/FormBuilderBundle/Resources/translations/admin.de.yml b/translations/admin.de.yml
similarity index 100%
rename from src/FormBuilderBundle/Resources/translations/admin.de.yml
rename to translations/admin.de.yml
diff --git a/src/FormBuilderBundle/Resources/translations/admin.en.yml b/translations/admin.en.yml
similarity index 100%
rename from src/FormBuilderBundle/Resources/translations/admin.en.yml
rename to translations/admin.en.yml