diff --git a/Configuration/Sets/Examples/config.yaml b/Configuration/Sets/Examples/config.yaml
new file mode 100644
index 0000000..d7c15ab
--- /dev/null
+++ b/Configuration/Sets/Examples/config.yaml
@@ -0,0 +1,2 @@
+name: t3docs/examples
+label: Example set
diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/Sets/Examples/constants.typoscript
similarity index 100%
rename from Configuration/TypoScript/constants.typoscript
rename to Configuration/Sets/Examples/constants.typoscript
diff --git a/Configuration/page.tsconfig b/Configuration/Sets/Examples/page.tsconfig
similarity index 100%
rename from Configuration/page.tsconfig
rename to Configuration/Sets/Examples/page.tsconfig
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/Sets/Examples/setup.typoscript
similarity index 100%
rename from Configuration/TypoScript/setup.typoscript
rename to Configuration/Sets/Examples/setup.typoscript
diff --git a/Configuration/Sets/ExamplesHMenu/config.yaml b/Configuration/Sets/ExamplesHMenu/config.yaml
new file mode 100644
index 0000000..0313dcd
--- /dev/null
+++ b/Configuration/Sets/ExamplesHMenu/config.yaml
@@ -0,0 +1,4 @@
+name: t3docs/examples-hmenu
+label: "Examples: HMENU special userfunc"
+dependencies:
+  - t3docs/examples
diff --git a/Configuration/TypoScript/HmenuSpecial/setup.typoscript b/Configuration/Sets/ExamplesHMenu/setup.typoscript
similarity index 100%
rename from Configuration/TypoScript/HmenuSpecial/setup.typoscript
rename to Configuration/Sets/ExamplesHMenu/setup.typoscript
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
deleted file mode 100644
index 1b1fb51..0000000
--- a/Configuration/TCA/Overrides/sys_template.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-defined('TYPO3') or die();
-
-// Declare static TypoScript files
-ExtensionManagementUtility::addStaticFile(
-    'examples',
-    'Configuration/TypoScript/',
-    'Examples TypoScript',
-);
-
-ExtensionManagementUtility::addStaticFile(
-    'examples',
-    'Configuration/TypoScript/HmenuSpecial/',
-    'Examples: HMENU special userfunc',
-);