diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 06349f2..c01f74c 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -144,6 +144,9 @@
     'Examples',
     'Error',
     'LLL:EXT:examples/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pierror',
+    null,
+    'plugin',
+    'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:pierror_wizard_description',
 );
 // Register the FAL example plugin
 ExtensionUtility::registerPlugin(
@@ -198,6 +201,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentcsv_title',
         'value' => 'examples_newcontentcsv',
         'icon' => 'mimetypes-x-content-table',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentcsv_description',
     ],
 );
 
@@ -227,6 +232,7 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentelement_title',
         'value' => 'examples_newcontentelement',
         'icon' => 'content-text',
+        'group' => 'default',
     ],
     'textmedia',
     'after',
@@ -260,6 +266,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_title',
         'value' => 'examples_dataprocdb',
         'icon' => 'mimetypes-x-content-table',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_description',
     ],
 );
 
@@ -280,6 +288,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocmenu_title',
         'value' => 'examples_dataprocmenu',
         'icon' => 'content-special-uploads',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocmenu_description',
     ],
 );
 
@@ -299,6 +309,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproclang_title',
         'value' => 'examples_dataproclang',
         'icon' => 'install-manage-language',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproclang_description',
     ],
 );
 
@@ -317,6 +329,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsite_title',
         'value' => 'examples_dataprocsite',
         'icon' => 'apps-pagetree-folder-root',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsite_description',
     ],
 );
 
@@ -336,6 +350,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsitelanguage_title',
         'value' => 'examples_dataprocsitelanguage',
         'icon' => 'content-message',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsitelanguage_description',
     ],
 );
 
@@ -355,6 +371,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsplit_title',
         'value' => 'examples_dataprocsplit',
         'icon' => 'content-timeline',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsplit_description',
     ],
 );
 
@@ -373,6 +391,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocfiles_title',
         'value' => 'examples_dataprocfiles',
         'icon' => 'content-image',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocfiles_description',
     ],
 );
 
@@ -393,6 +413,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocgallery_title',
         'value' => 'examples_dataprocgallery',
         'icon' => 'content-dashboard',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocgallery_description',
     ],
 );
 
@@ -414,6 +436,8 @@
         'label' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproccustom_title',
         'value' => 'examples_dataproccustom',
         'icon' => 'content-dashboard',
+        'group' => 'dataProcessingExamples',
+        'description' => 'LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproccustom_description',
     ],
 );
 
diff --git a/Configuration/TsConfig/Page/ContentElementWizard.tsconfig b/Configuration/TsConfig/Page/ContentElementWizard.tsconfig
index 8afee37..74202c0 100644
--- a/Configuration/TsConfig/Page/ContentElementWizard.tsconfig
+++ b/Configuration/TsConfig/Page/ContentElementWizard.tsconfig
@@ -1,110 +1,3 @@
-mod.wizards.newContentElement.wizardItems.plugins {
-   elements {
-      examples {
-         iconIdentifier = tx_examples-error-plugin
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:pierror_wizard_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:pierror_wizard_description
-         tt_content_defValues {
-            CType = list
-            list_type = examples_error
-         }
-      }
-   }
-}
-
 mod.wizards.newContentElement.wizardItems {
    dataProcessingExamples.header = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:dataProcessingExamples
-   dataProcessingExamples.elements {
-      examples_newcontentcsv {
-         iconIdentifier = mimetypes-x-content-table
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentcsv_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentcsv_description
-         tt_content_defValues {
-            CType = examples_newcontentcsv
-         }
-      }
-
-      examples_dataprocdb {
-         iconIdentifier = content-special-uploads
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocdb_description
-         tt_content_defValues {
-            CType = examples_dataprocdb
-         }
-      }
-
-      examples_dataproclang {
-         iconIdentifier = install-manage-language
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproclang_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproclang_description
-         tt_content_defValues {
-            CType = examples_dataproclang
-         }
-      }
-
-      examples_dataprocmenu {
-         iconIdentifier = content-menu-pages
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocmenu_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocmenu_description
-         tt_content_defValues {
-            CType = examples_dataprocmenu
-         }
-      }
-
-      examples_dataprocsite {
-         iconIdentifier = apps-pagetree-folder-root
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsite_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsite_description
-         tt_content_defValues {
-            CType = examples_dataprocsite
-         }
-      }
-
-      examples_dataprocsitelanguage {
-         iconIdentifier = content-message
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsitelanguage_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsitelanguage_description
-         tt_content_defValues {
-            CType = examples_dataprocsitelanguage
-         }
-      }
-
-      examples_dataprocsplit {
-         iconIdentifier = content-timeline
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsplit_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocsplit_description
-         tt_content_defValues {
-            CType = examples_dataprocsplit
-         }
-      }
-
-      examples_dataprocfiles {
-         iconIdentifier = content-image
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocfiles_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocfiles_description
-         tt_content_defValues {
-            CType = examples_dataprocfiles
-         }
-      }
-
-      examples_dataprocgallery {
-         iconIdentifier = content-dashboard
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocgallery_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataprocgallery_description
-         tt_content_defValues {
-            CType = examples_dataprocgallery
-         }
-      }
-
-      examples_dataproccustom {
-         iconIdentifier = content-dashboard
-         title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproccustom_title
-         description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_dataproccustom_description
-         tt_content_defValues {
-            CType = examples_dataproccustom
-         }
-      }
-   }
-
-   dataProcessingExamples.show = examples_newcontentcsv,examples_dataprocdb,examples_dataproclang, examples_dataprocmenu, examples_dataprocsite, examples_dataprocsitelanguage, examples_dataprocsplit, examples_dataprocfiles,examples_dataprocgallery,examples_dataproccustom
 }
diff --git a/Configuration/TsConfig/Page/CustomContentElements.tsconfig b/Configuration/TsConfig/Page/CustomContentElements.tsconfig
deleted file mode 100644
index 475417f..0000000
--- a/Configuration/TsConfig/Page/CustomContentElements.tsconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mod.wizards.newContentElement.wizardItems {
-   // add the content element to the tab "common"
-   common {
-      elements {
-         examples_newcontentelement {
-            iconIdentifier = content-text
-            title = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentelement_title
-            description = LLL:EXT:examples/Resources/Private/Language/locallang.xlf:examples_newcontentelement_description
-            tt_content_defValues {
-               CType = examples_newcontentelement
-            }
-         }
-      }
-      show := addToList(examples_newcontentelement)
-   }
-}