diff --git a/Configuration/PageTs/PageTs.tsconfig b/Configuration/PageTs/PageTs.tsconfig
index 976e10e..25f1828 100644
--- a/Configuration/PageTs/PageTs.tsconfig
+++ b/Configuration/PageTs/PageTs.tsconfig
@@ -1,11 +1 @@
-mod.wizards.newContentElement {
-    wizardItems {
-        common.elements.codeblock {
-            title = LLL:EXT:codeblock/Resources/Private/Language/locallang_db.xlf:tt_content.CType
-            description = LLL:EXT:codeblock/Resources/Private/Language/locallang_db.xlf:tt_content.wizard.description
-            tt_content_defValues.CType = codeblock
-            iconIdentifier = content-codeblock
-        }
-        common.show := addToList(codeblock)
-    }
-}
+@import 'EXT:codeblock/Configuration/Sets/codeblock/page.tsconfig'
\ No newline at end of file
diff --git a/Configuration/Sets/codeblock/config.yaml b/Configuration/Sets/codeblock/config.yaml
new file mode 100644
index 0000000..f428908
--- /dev/null
+++ b/Configuration/Sets/codeblock/config.yaml
@@ -0,0 +1,2 @@
+name: b13/codeblock
+label: b13 codeblock element configuration
diff --git a/Configuration/Sets/codeblock/page.tsconfig b/Configuration/Sets/codeblock/page.tsconfig
new file mode 100644
index 0000000..976e10e
--- /dev/null
+++ b/Configuration/Sets/codeblock/page.tsconfig
@@ -0,0 +1,11 @@
+mod.wizards.newContentElement {
+    wizardItems {
+        common.elements.codeblock {
+            title = LLL:EXT:codeblock/Resources/Private/Language/locallang_db.xlf:tt_content.CType
+            description = LLL:EXT:codeblock/Resources/Private/Language/locallang_db.xlf:tt_content.wizard.description
+            tt_content_defValues.CType = codeblock
+            iconIdentifier = content-codeblock
+        }
+        common.show := addToList(codeblock)
+    }
+}
diff --git a/Configuration/Sets/codeblock/setup.typoscript b/Configuration/Sets/codeblock/setup.typoscript
new file mode 100644
index 0000000..2a2d21a
--- /dev/null
+++ b/Configuration/Sets/codeblock/setup.typoscript
@@ -0,0 +1,12 @@
+tt_content.codeblock =< lib.contentElement
+tt_content.codeblock {
+    templateName = Codeblock
+
+    templateRootPaths.0 = EXT:codeblock/Resources/Private/Templates
+
+    dataProcessing.1567071612 = B13\Codeblock\DataProcessing\HighlightProcessor
+    dataProcessing.1567071612 {
+        field = bodytext
+        as = bodytext_formatted
+    }
+}
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index d51e477..91450f5 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -1,12 +1 @@
-tt_content.codeblock =< lib.contentElement
-tt_content.codeblock {
-    templateName = Codeblock
-    
-    templateRootPaths.0 = EXT:codeblock/Resources/Private/Templates
-
-    dataProcessing.1567071612 = B13\Codeblock\DataProcessing\HighlightProcessor
-    dataProcessing.1567071612 {
-        field = bodytext
-        as = bodytext_formatted
-    }
-}
+@import 'EXT:codeblock/Configuration/Sets/codeblock/setup.typoscript'
\ No newline at end of file