diff --git a/Documentation/ContentMapping/Index.rst b/Documentation/ContentMapping/Index.rst
index 0335df7c..6107a1e6 100644
--- a/Documentation/ContentMapping/Index.rst
+++ b/Documentation/ContentMapping/Index.rst
@@ -203,6 +203,24 @@ The partial then looks like this:
 
 ..  include:: /CodeSnippets/Fluid/PartialContent.rst.txt
 
+.. _content-element-typoscript:
+
+Splitting up the TypoScript into files
+======================================
+
+At this point the file `packages/my_site_package/Configuration/Sets/SitePackage/setup.typoscript`
+has started to have several lines. When we start rendering the
+`Menues <https://docs.typo3.org/permalink/t3sitepackage:main-menu-creation>`_,
+make more sophisticated
+`Settings <https://docs.typo3.org/permalink/t3sitepackage:site-sets-configuration>`_
+etc the TypoScript configuration file is going to grow more.
+We therefore suggest, to use TypoScript imports
+and structure your TypoScript in different files that are then combined at this point.
+
+The rest of the Tutorial will assume that your files are in the directory
+:path:`packages/my_site_package/Configuration/Sets/SitePackage/TypoScript/` and imported
+as described in `TypoScript imports <https://docs.typo3.org/permalink/t3sitepackage:typoscript-configuration>`_.
+
 ..  _content-element-next-steps:
 
 Next steps
@@ -211,6 +229,7 @@ Next steps
 ..  toctree::
     :glob:
 
+    TypoScript
     Jumbotron
     SubpageLayout
     AddContent
diff --git a/Documentation/TypoScript/Index.rst b/Documentation/ContentMapping/TypoScript.rst
similarity index 96%
rename from Documentation/TypoScript/Index.rst
rename to Documentation/ContentMapping/TypoScript.rst
index 3f810a8a..9af31d73 100644
--- a/Documentation/TypoScript/Index.rst
+++ b/Documentation/ContentMapping/TypoScript.rst
@@ -3,9 +3,9 @@
 .. _file-setup-typoscript:
 .. _typoscript-configuration:
 
-================
-TypoScript setup
-================
+==================
+TypoScript imports
+==================
 
 In step :ref:`Minimal site package - The TYPO3 Fluid
 version <t3sitepackage:minimal-extension-fluid>` we placed all TypoScript into
@@ -72,7 +72,7 @@ Your :path:`Configuration` directory should now have the following structure:
 
         *   Sets
 
-            *   MySitePackage
+            *   SitePackage
 
                 *   TypoScript
 
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
index a009dd17..b2987a33 100644
--- a/Documentation/Index.rst
+++ b/Documentation/Index.rst
@@ -90,16 +90,6 @@ https://github.com/TYPO3-Documentation/site_package
         ..  card-footer:: :ref:`See how to use a backend layout <t3sitepackage:content-mapping>`
             :button-style: btn btn-secondary stretched-link
 
-    ..  card:: :ref:`TypoScript setup <t3sitepackage:typoscript-configuration>`
-
-        Theoretically you could put all TypoScript into one big file and it would work
-        fine. But you have better overview if you split it up in multiple files ordered
-        by purpose. We import all TypoScript files from a folder using wildcards
-        after this step.
-
-        ..  card-footer:: :ref:`Automatically import TypoScript files <t3sitepackage:typoscript-configuration>`
-            :button-style: btn btn-secondary stretched-link
-
     ..  card:: :ref:`Main menu <t3sitepackage:main-menu-creation>`
 
         We introduce the main menu, explain how we build up a menu
@@ -146,7 +136,6 @@ https://github.com/TYPO3-Documentation/site_package
     Assets/Index
     FluidTemplates/Index
     ContentMapping/Index
-    TypoScript/Index
     MainMenuCreation/Index
     SiteSets/Index
     ContentElementRendering/Index
diff --git a/Documentation/MainMenuCreation/Index.rst b/Documentation/MainMenuCreation/Index.rst
index 22a5607c..26a093be 100644
--- a/Documentation/MainMenuCreation/Index.rst
+++ b/Documentation/MainMenuCreation/Index.rst
@@ -23,7 +23,7 @@ The :ref:`data processor 'menu' <t3tsref:MenuProcessor>` can be configured to
 provide the data of all pages in your current site to your page template.
 
 We save the TypoScript configuration for the menu into file
-:file:`Configuration/Set/MySitePackage/TypoScript/Navigation/menu.typoscript`:
+:file:`Configuration/Set/SitePackage/TypoScript/Navigation/menu.typoscript`:
 
 ..  include:: /CodeSnippets/TypoScript/menu.rst.txt